commit 50c810d55de90d412017083e5ab63786a91c18a0
author Zoe Liu <zoeliu@google.com> Tue Dec 05 16:09:37 2017 -0800
committer Zoe Liu <zoeliu@google.com> Sun Dec 10 23:54:33 2017 +0000
tree a21b5f19cbeb7c81e7a21fcce0d46e9bc2467f41
parent 59eaa51d21dd3fcd6d0dac76c3ba04e0fe2c0c33

Enable skip mode work with JNT_COMP

This patch updates also the default cdfs for skip mode. It also remove
the unneeded checking on whether the best obtained RD mode aligned
with the skip mode.

For 30 frames, on both AWCY and Google lowres/midres test sets, with
the following config, the coding gain ranges from ~-0.15% to -0.23%:

--disable-ext-partition --disable-ext-partition-types --disable-txmg
--enable-jnt-comp --enable-mfmv

Change-Id: I39aeeb9e7b27ca679c1b3f9c0eea67b5e1f694e2

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 3a8594b..3ad9e39 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9091,8 +9091,6 @@
         frame_mv[this_mode][second_ref_frame].as_int == INVALID_MV)
       break;
 
-    // TODO(zoeliu): To work with JNT_COMP
-
     mbmi->mode = this_mode;
     mbmi->uv_mode = UV_DC_PRED;
     mbmi->ref_frame[0] = ref_frame;
@@ -9133,6 +9131,10 @@
     mbmi->filter_intra_mode_info.use_filter_intra_mode[1] = 0;
 #endif  // CONFIG_FILTER_INTRA
     mbmi->interintra_mode = (INTERINTRA_MODE)(II_DC_PRED - 1);
+#if CONFIG_JNT_COMP
+    mbmi->comp_group_idx = 0;
+    mbmi->compound_idx = 1;
+#endif  // CONFIG_JNT_COMP
     mbmi->interinter_compound_type = COMPOUND_AVERAGE;
     mbmi->motion_mode = SIMPLE_TRANSLATION;
     mbmi->ref_mv_idx = 0;
@@ -9157,31 +9159,6 @@
     break;
   }
 }
-
-// Check whether the best RD mode satisfies the criteria of skip mode.
-static int check_skip_mode(const AV1_COMMON *const cm,
-                           const MB_MODE_INFO *const best_mbmi) {
-  if (!is_inter_mode(best_mbmi->mode)) return 0;
-
-  if (!has_second_ref(best_mbmi) ||
-      best_mbmi->ref_frame[0] != (cm->ref_frame_idx_0 + LAST_FRAME) ||
-      best_mbmi->ref_frame[1] != (cm->ref_frame_idx_1 + LAST_FRAME) ||
-      best_mbmi->mode != NEAREST_NEARESTMV)
-    return 0;
-
-  if (!best_mbmi->skip) return 0;
-
-  if (best_mbmi->uv_mode != UV_DC_PRED ||
-      best_mbmi->motion_mode != SIMPLE_TRANSLATION ||
-      best_mbmi->interinter_compound_type != COMPOUND_AVERAGE)
-    return 0;
-
-  if (best_mbmi->interp_filters !=
-      av1_broadcast_interp_filter(av1_unswitchable_filter(cm->interp_filter)))
-    return 0;
-
-  return 1;
-}
 #endif  // CONFIG_EXT_SKIP
 
 void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data,
@@ -10601,8 +10578,7 @@
           RDCOST(x->rdmult, rd_cost->rate + x->skip_mode_cost[skip_mode_ctx][0],
                  rd_cost->dist);
 
-      if (x->skip_mode_rdcost <= best_intra_inter_mode_cost ||
-          check_skip_mode(cm, &best_mbmode))
+      if (x->skip_mode_rdcost <= best_intra_inter_mode_cost)
         best_mbmode.skip_mode = 1;
     }