commit fead1ef4867bc7d6201faffb2783392c458d1990
author elliottk <elliottk@google.com> Mon Apr 22 14:48:57 2019 -0700
committer Elliott Karpilovsky <elliottk@google.com> Tue Apr 23 19:06:53 2019 +0000
tree 5b6c1851b732b229e091045f26015a895e743736
parent 5a53b390751b24a60e1b023c183a241fbf74862c

Do not pass mode index when mbmi is present

MBMI encodes all the information that mode index does. To prevent these
two variables from getting out-of-sync, use MBMI as the source of truth.

Change-Id: Id9442ab7d0670fd6ff29705be29250b23ae27942

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 8a977d2..77bd01f 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -11728,8 +11728,8 @@
 // Case 2: return 1, means skip this mode completely
 // Case 3: return 2, means skip compound only, but still try single motion modes
 static int inter_mode_search_order_independent_skip(
-    const AV1_COMP *cpi, const MACROBLOCK *x, BLOCK_SIZE bsize, int mode_index,
-    int mi_row, int mi_col, mode_skip_mask_t *mode_skip_mask,
+    const AV1_COMP *cpi, const MACROBLOCK *x, BLOCK_SIZE bsize, int mi_row,
+    int mi_col, mode_skip_mask_t *mode_skip_mask,
     InterModeSearchState *search_state, int skip_ref_frame_mask) {
   const SPEED_FEATURES *const sf = &cpi->sf;
   const AV1_COMMON *const cm = &cpi->common;
@@ -11737,8 +11737,8 @@
   const CurrentFrame *const current_frame = &cm->current_frame;
   const MACROBLOCKD *const xd = &x->e_mbd;
   const MB_MODE_INFO *const mbmi = xd->mi[0];
-  const MV_REFERENCE_FRAME *ref_frame = av1_mode_order[mode_index].ref_frame;
-  const PREDICTION_MODE this_mode = av1_mode_order[mode_index].mode;
+  const MV_REFERENCE_FRAME *ref_frame = mbmi->ref_frame;
+  const PREDICTION_MODE this_mode = mbmi->mode;
   const int comp_pred = ref_frame[1] > INTRA_FRAME;
   int skip_motion_mode = 0;
 
@@ -12676,7 +12676,7 @@
     if (inter_mode_compatible_skip(cpi, x, bsize, midx)) continue;
 
     const int ret = inter_mode_search_order_independent_skip(
-        cpi, x, bsize, midx, mi_row, mi_col, &mode_skip_mask, &search_state,
+        cpi, x, bsize, mi_row, mi_col, &mode_skip_mask, &search_state,
         skip_ref_frame_mask);
     if (ret == 1) continue;
     args.skip_motion_mode = (ret == 2);
@@ -13320,7 +13320,7 @@
     if (inter_mode_compatible_skip(cpi, x, bsize, midx)) continue;
 
     const int ret = inter_mode_search_order_independent_skip(
-        cpi, x, bsize, midx, mi_row, mi_col, &mode_skip_mask, &search_state,
+        cpi, x, bsize, mi_row, mi_col, &mode_skip_mask, &search_state,
         skip_ref_frame_mask);
     if (ret == 1) continue;
     args.skip_motion_mode = (ret == 2);