Inspection returns INTRA_INVALID for uv_mode in inter

To avoid confusion, inspection now returns INTRA_INVALID for as the
uv_mode when the block type is inter.

Change-Id: I48c64586078bb1ef1ca256a9f3c5c2bfb4a2abc3

av1/common/enums.h

@@ -333,7 +333,8 @@ typedef enum ATTRIBUTE_PACKED {
   NEW_NEWMV,
 #endif  // CONFIG_EXT_INTER
   MB_MODE_COUNT,
-  INTRA_MODES = TM_PRED + 1
+  INTRA_MODES = TM_PRED + 1,
+  INTRA_INVALID = MB_MODE_COUNT  // For uv_mode in inter blocks
 } PREDICTION_MODE;
 
 typedef enum {

av1/decoder/inspection.c

@@ -72,7 +72,11 @@ int ifd_inspect(insp_frame_data *fd, void *decoder) {
       // Prediction Mode
       mi->mode = mbmi->mode;
       // Prediction Mode for Chromatic planes
-      mi->uv_mode = mbmi->uv_mode;
+      if (mi->mode < INTRA_MODES) {
+        mi->uv_mode = mbmi->uv_mode;
+      } else {
+        mi->uv_mode = INTRA_INVALID;
+      }
       // Block Size
       mi->sb_type = mbmi->sb_type;
       // Skip Flag

examples/inspect.c

@@ -177,37 +177,28 @@ const map_entry tx_type_map[] = { ENUM(DCT_DCT),
 #endif
                                   LAST_ENUM };
 
-const map_entry prediction_mode_map[] = { ENUM(DC_PRED),
-                                          ENUM(V_PRED),
-                                          ENUM(H_PRED),
-                                          ENUM(D45_PRED),
-                                          ENUM(D135_PRED),
-                                          ENUM(D117_PRED),
-                                          ENUM(D153_PRED),
-                                          ENUM(D207_PRED),
-                                          ENUM(D63_PRED),
+const map_entry prediction_mode_map[] = {
+  ENUM(DC_PRED),        ENUM(V_PRED),
+  ENUM(H_PRED),         ENUM(D45_PRED),
+  ENUM(D135_PRED),      ENUM(D117_PRED),
+  ENUM(D153_PRED),      ENUM(D207_PRED),
+  ENUM(D63_PRED),
 #if CONFIG_ALT_INTRA
-                                          ENUM(SMOOTH_PRED),
+  ENUM(SMOOTH_PRED),
 #endif
-                                          ENUM(TM_PRED),
-                                          ENUM(NEARESTMV),
-                                          ENUM(NEARMV),
-                                          ENUM(ZEROMV),
-                                          ENUM(NEWMV),
+  ENUM(TM_PRED),        ENUM(NEARESTMV),
+  ENUM(NEARMV),         ENUM(ZEROMV),
+  ENUM(NEWMV),
 #if CONFIG_EXT_INTER
-                                          ENUM(NEWFROMNEARMV),
-                                          ENUM(NEAREST_NEARESTMV),
-                                          ENUM(NEAREST_NEARMV),
-                                          ENUM(NEAR_NEARESTMV),
-                                          ENUM(NEAR_NEARMV),
-                                          ENUM(NEAREST_NEWMV),
-                                          ENUM(NEW_NEARESTMV),
-                                          ENUM(NEAR_NEWMV),
-                                          ENUM(NEW_NEARMV),
-                                          ENUM(ZERO_ZEROMV),
-                                          ENUM(NEW_NEWMV),
+  ENUM(NEWFROMNEARMV),  ENUM(NEAREST_NEARESTMV),
+  ENUM(NEAREST_NEARMV), ENUM(NEAR_NEARESTMV),
+  ENUM(NEAR_NEARMV),    ENUM(NEAREST_NEWMV),
+  ENUM(NEW_NEARESTMV),  ENUM(NEAR_NEWMV),
+  ENUM(NEW_NEARMV),     ENUM(ZERO_ZEROMV),
+  ENUM(NEW_NEWMV),
 #endif
-                                          LAST_ENUM };
+  ENUM(INTRA_INVALID),  LAST_ENUM
+};
 
 #define NO_SKIP 0
 #define SKIP 1