Fix a compiler warning in ext-inter experiment

Change-Id: If36417c1384646da57453344b208e7653a4d31e5

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 6ae3a952acd791bb60d53c526ecbee20dfd0f0c3..d6e2d787a41375b1a0c1118ded51a40c1c0f83f3 100644 (file)
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -1788,12 +1788,6 @@ static void build_intra_predictors_for_interintra(MACROBLOCKD *xd, uint8_t *ref,
   }
 }
 
-// Mapping of interintra to intra mode for use in the intra component
-static const int interintra_to_intra_mode[INTERINTRA_MODES] = {
-  DC_PRED,   V_PRED,    H_PRED,    D45_PRED, D135_PRED,
-  D117_PRED, D153_PRED, D207_PRED, D63_PRED, TM_PRED
-};
-
 void av1_build_intra_predictors_for_interintra(MACROBLOCKD *xd,
                                                BLOCK_SIZE bsize, int plane,
                                                uint8_t *dst, int dst_stride) {

diff --git a/av1/common/reconintra.h b/av1/common/reconintra.h
index 499d53681fee49b99b6ba698b58b33fb9c5eebdf..5983a6c83a6b073d2d7559241093dfd2293ab347 100644 (file)
--- a/av1/common/reconintra.h
+++ b/av1/common/reconintra.h
@@ -28,6 +28,20 @@ void av1_predict_intra_block(const MACROBLOCKD *xd, int bwl_in, int bhl_in,
 #if CONFIG_EXT_INTRA
 int av1_is_intra_filter_switchable(int angle);
 #endif  // CONFIG_EXT_INTRA
+
+#if CONFIG_EXT_INTER
+// Mapping of interintra to intra mode for use in the intra component
+static const PREDICTION_MODE interintra_to_intra_mode[INTERINTRA_MODES] = {
+  DC_PRED,   V_PRED,    H_PRED,    D45_PRED, D135_PRED,
+  D117_PRED, D153_PRED, D207_PRED, D63_PRED, TM_PRED
+};
+
+// Mapping of intra mode to the interintra mode
+static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = {
+  II_DC_PRED,   II_V_PRED,    II_H_PRED,    II_D45_PRED, II_D135_PRED,
+  II_D117_PRED, II_D153_PRED, II_D207_PRED, II_D63_PRED, II_TM_PRED
+};
+#endif  // CONFIG_EXT_INTER
 #ifdef __cplusplus
 }  // extern "C"
 #endif

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index d822d09c8d41dc16e49898fe028dd00db5a2f1b1..2966e770d211c020b8bed9fe6a88157c7866c7f1 100644 (file)
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8738,7 +8738,7 @@ void av1_rd_pick_inter_mode_sb(AV1_COMP *cpi, TileDataEnc *tile_data,
     }
 
 #if CONFIG_EXT_INTER
-    mbmi->interintra_mode = (PREDICTION_MODE)(DC_PRED - 1);
+    mbmi->interintra_mode = (INTERINTRA_MODE)(II_DC_PRED - 1);
 #endif  // CONFIG_EXT_INTER
 
     if (ref_frame == INTRA_FRAME) {
@@ -8892,7 +8892,7 @@ void av1_rd_pick_inter_mode_sb(AV1_COMP *cpi, TileDataEnc *tile_data,
 #if CONFIG_EXT_INTER
       if (second_ref_frame == INTRA_FRAME) {
         if (best_single_inter_ref != ref_frame) continue;
-        mbmi->interintra_mode = best_intra_mode;
+        mbmi->interintra_mode = intra_to_interintra_mode[best_intra_mode];
 #if CONFIG_EXT_INTRA
         // TODO(debargha|geza.lore):
         // Should we use ext_intra modes for interintra?