Add uv_mode to inspection data Change-Id: Ie2cd742c68e65d4c17c52d73d819a875452e20a0
diff --git a/av1/decoder/inspection.c b/av1/decoder/inspection.c index af1fee7..d3f97bf 100644 --- a/av1/decoder/inspection.c +++ b/av1/decoder/inspection.c
@@ -71,6 +71,8 @@ mi->ref_frame[1] = mbmi->ref_frame[1]; // Prediction Mode mi->mode = mbmi->mode; + // Prediction Mode for Chromatic planes + mi->uv_mode = mbmi->uv_mode; // Block Size mi->sb_type = mbmi->sb_type; // Skip Flag
diff --git a/av1/decoder/inspection.h b/av1/decoder/inspection.h index 8a0eaf2..ddc38f2 100644 --- a/av1/decoder/inspection.h +++ b/av1/decoder/inspection.h
@@ -34,6 +34,7 @@ insp_mv mv[2]; int8_t ref_frame[2]; int8_t mode; + int8_t uv_mode; int8_t sb_type; int8_t skip; int8_t segment_id;
diff --git a/examples/inspect.c b/examples/inspect.c index c108e3d..5159e90 100644 --- a/examples/inspect.c +++ b/examples/inspect.c
@@ -55,7 +55,8 @@ CDEF_LAYER = 1 << 7, REFERENCE_FRAME_LAYER = 1 << 8, MOTION_VECTORS_LAYER = 1 << 9, - ALL_LAYERS = (1 << 10) - 1 + UV_MODE_LAYER = 1 << 10, + ALL_LAYERS = (1 << 11) - 1 } LayerType; static LayerType layers = 0; @@ -76,6 +77,8 @@ static const arg_def_t dump_transform_type_arg = ARG_DEF("tt", "transformType", 0, "Dump Transform Type"); static const arg_def_t dump_mode_arg = ARG_DEF("m", "mode", 0, "Dump Mode"); +static const arg_def_t dump_uv_mode_arg = + ARG_DEF("uvm", "uv_mode", 0, "Dump UV Intra Prediction Modes"); static const arg_def_t dump_skip_arg = ARG_DEF("s", "skip", 0, "Dump Skip"); static const arg_def_t dump_filter_arg = ARG_DEF("f", "filter", 0, "Dump Filter"); @@ -93,6 +96,7 @@ &dump_transform_size_arg, &dump_transform_type_arg, &dump_mode_arg, + &dump_uv_mode_arg, &dump_skip_arg, &dump_filter_arg, #if CONFIG_CDEF @@ -429,6 +433,10 @@ buf += put_block_info(buf, prediction_mode_map, "mode", offsetof(insp_mi_data, mode)); } + if (layers & UV_MODE_LAYER) { + buf += put_block_info(buf, prediction_mode_map, "uv_mode", + offsetof(insp_mi_data, uv_mode)); + } if (layers & SKIP_LAYER) { buf += put_block_info(buf, skip_map, "skip", offsetof(insp_mi_data, skip)); } @@ -565,6 +573,8 @@ layers |= TRANSFORM_TYPE_LAYER; else if (arg_match(&arg, &dump_mode_arg, argi)) layers |= MODE_LAYER; + else if (arg_match(&arg, &dump_uv_mode_arg, argi)) + layers |= UV_MODE_LAYER; else if (arg_match(&arg, &dump_skip_arg, argi)) layers |= SKIP_LAYER; else if (arg_match(&arg, &dump_filter_arg, argi))