commit 7f24e1b019a3e0c1a9e919f13edbbc46b85da4cb
author Zoe Liu <zoeliu@google.com> Fri Mar 17 17:42:05 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Mon Apr 10 20:30:56 2017 -0700
tree 64f6bd274e1be1ffc59b0b9d66add1fcd02995bf
parent 2a7de6836cf1236c621ef97bbd614114f2f83953

Remove the single ref inter mode NEWFROMNEARMV

Change-Id: I246da885154303d139f5d97c53ebfc55d6dc82ca

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 7e9e1cd..57ce7e2 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -240,26 +240,15 @@
 #endif  // CONFIG_EXT_INTER
 
 static void write_inter_mode(aom_writer *w, PREDICTION_MODE mode,
-                             FRAME_CONTEXT *ec_ctx,
-#if CONFIG_REF_MV && CONFIG_EXT_INTER
-                             int is_compound,
-#endif  // CONFIG_REF_MV && CONFIG_EXT_INTER
-                             const int16_t mode_ctx) {
+                             FRAME_CONTEXT *ec_ctx, const int16_t mode_ctx) {
 #if CONFIG_REF_MV
   const int16_t newmv_ctx = mode_ctx & NEWMV_CTX_MASK;
   const aom_prob newmv_prob = ec_ctx->newmv_prob[newmv_ctx];
-#if CONFIG_EXT_INTER
-  aom_write(w, mode != NEWMV && mode != NEWFROMNEARMV, newmv_prob);
 
-  if (!is_compound && (mode == NEWMV || mode == NEWFROMNEARMV))
-    aom_write(w, mode == NEWFROMNEARMV, ec_ctx->new2mv_prob);
+#define IS_NEWMV_MODE(mode) ((mode) == NEWMV)
+  aom_write(w, !IS_NEWMV_MODE(mode), newmv_prob);
 
-  if (mode != NEWMV && mode != NEWFROMNEARMV) {
-#else
-  aom_write(w, mode != NEWMV, newmv_prob);
-
-  if (mode != NEWMV) {
-#endif  // CONFIG_EXT_INTER
+  if (!IS_NEWMV_MODE(mode)) {
     const int16_t zeromv_ctx = (mode_ctx >> ZEROMV_OFFSET) & ZEROMV_CTX_MASK;
     const aom_prob zeromv_prob = ec_ctx->zeromv_prob[zeromv_ctx];
 
@@ -282,7 +271,10 @@
       aom_write(w, mode != NEARESTMV, refmv_prob);
     }
   }
-#else
+
+#undef IS_NEWMV_MODE
+
+#else  // !CONFIG_REF_MV
   assert(is_inter_mode(mode));
 #if CONFIG_EC_MULTISYMBOL
   aom_write_symbol(w, av1_inter_mode_ind[INTER_OFFSET(mode)],
@@ -520,10 +512,6 @@
   for (i = 0; i < DRL_MODE_CONTEXTS; ++i)
     av1_cond_prob_diff_update(w, &cm->fc->drl_prob[i], counts->drl_mode[i],
                               probwt);
-#if CONFIG_EXT_INTER
-  av1_cond_prob_diff_update(w, &cm->fc->new2mv_prob, counts->new2mv_mode,
-                            probwt);
-#endif  // CONFIG_EXT_INTER
 }
 #endif
 
@@ -1734,11 +1722,7 @@
           write_inter_compound_mode(cm, w, mode, mode_ctx);
         else if (is_inter_singleref_mode(mode))
 #endif  // CONFIG_EXT_INTER
-          write_inter_mode(w, mode, ec_ctx,
-#if CONFIG_REF_MV && CONFIG_EXT_INTER
-                           is_compound,
-#endif  // CONFIG_REF_MV && CONFIG_EXT_INTER
-                           mode_ctx);
+          write_inter_mode(w, mode, ec_ctx, mode_ctx);
 
 #if CONFIG_REF_MV
 #if CONFIG_EXT_INTER
@@ -1778,15 +1762,10 @@
             write_inter_compound_mode(cm, w, b_mode, mode_ctx);
           else if (is_inter_singleref_mode(b_mode))
 #endif  // CONFIG_EXT_INTER
-            write_inter_mode(w, b_mode, ec_ctx,
-#if CONFIG_REF_MV && CONFIG_EXT_INTER
-                             has_second_ref(mbmi),
-#endif  // CONFIG_REF_MV && CONFIG_EXT_INTER
-                             mode_ctx);
+            write_inter_mode(w, b_mode, ec_ctx, mode_ctx);
 
 #if CONFIG_EXT_INTER
-          if (b_mode == NEWMV || b_mode == NEWFROMNEARMV ||
-              b_mode == NEW_NEWMV) {
+          if (b_mode == NEWMV || b_mode == NEW_NEWMV) {
 #else
           if (b_mode == NEWMV) {
 #endif  // CONFIG_EXT_INTER
@@ -1838,7 +1817,7 @@
       }
     } else {
 #if CONFIG_EXT_INTER
-      if (mode == NEWMV || mode == NEWFROMNEARMV || mode == NEW_NEWMV) {
+      if (mode == NEWMV || mode == NEW_NEWMV) {
 #else
       if (mode == NEWMV) {
 #endif  // CONFIG_EXT_INTER
@@ -1852,15 +1831,8 @@
           nmv_context *nmvc = &ec_ctx->nmvc[nmv_ctx];
 #endif
           ref_mv = mbmi_ext->ref_mvs[mbmi->ref_frame[ref]][0];
-#if CONFIG_EXT_INTER
-          if (mode == NEWFROMNEARMV)
-            av1_encode_mv(cpi, w, &mbmi->mv[ref].as_mv,
-                          &mbmi_ext->ref_mvs[mbmi->ref_frame[ref]][1].as_mv,
-                          nmvc, allow_hp);
-          else
-#endif  // CONFIG_EXT_INTER
-            av1_encode_mv(cpi, w, &mbmi->mv[ref].as_mv, &ref_mv.as_mv, nmvc,
-                          allow_hp);
+          av1_encode_mv(cpi, w, &mbmi->mv[ref].as_mv, &ref_mv.as_mv, nmvc,
+                        allow_hp);
         }
 #if CONFIG_EXT_INTER
       } else if (mode == NEAREST_NEWMV || mode == NEAR_NEWMV) {