commit 09c0a5bcf57c58963516289ff2173576e3fa8378
author Yue Chen <yuec@google.com> Fri Jan 20 12:48:52 2017 -0800
committer Yue Chen <yuec@google.com> Fri Jan 20 21:57:55 2017 +0000
tree 6f308a7b7c818aace1d175407494e0fe643bd5b8
parent a1f6432dfac92c17672071d9da5c6114fa4faa75

Remove unused input in av1_encode_mv()

Change-Id: I54a0fbaeb59de0907a17b73dab4170cf62b4fd8d

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 286e97c..edf0267 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1486,12 +1486,9 @@
               av1_encode_mv(cpi, w, &mi->bmi[j].as_mv[ref].as_mv,
 #if CONFIG_EXT_INTER
                             &mi->bmi[j].ref_mv[ref].as_mv,
-#if CONFIG_REF_MV
-                            is_compound,
-#endif
 #else
 #if CONFIG_REF_MV
-                            &mi->bmi[j].pred_mv[ref].as_mv, is_compound,
+                            &mi->bmi[j].pred_mv[ref].as_mv,
 #else
                             &mbmi_ext->ref_mvs[mbmi->ref_frame[ref]][0].as_mv,
 #endif  // CONFIG_REF_MV
@@ -1509,11 +1506,7 @@
             nmv_context *nmvc = &ec_ctx->nmvc[nmv_ctx];
 #endif
             av1_encode_mv(cpi, w, &mi->bmi[j].as_mv[1].as_mv,
-                          &mi->bmi[j].ref_mv[1].as_mv,
-#if CONFIG_REF_MV
-                          is_compound,
-#endif
-                          nmvc, allow_hp);
+                          &mi->bmi[j].ref_mv[1].as_mv, nmvc, allow_hp);
           } else if (b_mode == NEW_NEARESTMV || b_mode == NEW_NEARMV) {
 #if CONFIG_REF_MV
             int8_t rf_type = av1_ref_frame_type(mbmi->ref_frame);
@@ -1523,11 +1516,7 @@
             nmv_context *nmvc = &ec_ctx->nmvc[nmv_ctx];
 #endif
             av1_encode_mv(cpi, w, &mi->bmi[j].as_mv[0].as_mv,
-                          &mi->bmi[j].ref_mv[0].as_mv,
-#if CONFIG_REF_MV
-                          is_compound,
-#endif
-                          nmvc, allow_hp);
+                          &mi->bmi[j].ref_mv[0].as_mv, nmvc, allow_hp);
           }
 #endif  // CONFIG_EXT_INTER
         }
@@ -1552,17 +1541,11 @@
           if (mode == NEWFROMNEARMV)
             av1_encode_mv(cpi, w, &mbmi->mv[ref].as_mv,
                           &mbmi_ext->ref_mvs[mbmi->ref_frame[ref]][1].as_mv,
-#if CONFIG_REF_MV
-                          is_compound,
-#endif
                           nmvc, allow_hp);
           else
 #endif  // CONFIG_EXT_INTER
-            av1_encode_mv(cpi, w, &mbmi->mv[ref].as_mv, &ref_mv.as_mv,
-#if CONFIG_REF_MV
-                          is_compound,
-#endif
-                          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) {
@@ -1574,11 +1557,8 @@
         nmv_context *nmvc = &ec_ctx->nmvc[nmv_ctx];
 #endif
         av1_encode_mv(cpi, w, &mbmi->mv[1].as_mv,
-                      &mbmi_ext->ref_mvs[mbmi->ref_frame[1]][0].as_mv,
-#if CONFIG_REF_MV
-                      is_compound,
-#endif
-                      nmvc, allow_hp);
+                      &mbmi_ext->ref_mvs[mbmi->ref_frame[1]][0].as_mv, nmvc,
+                      allow_hp);
       } else if (mode == NEW_NEARESTMV || mode == NEW_NEARMV) {
 #if CONFIG_REF_MV
         int8_t rf_type = av1_ref_frame_type(mbmi->ref_frame);
@@ -1588,11 +1568,8 @@
         nmv_context *nmvc = &ec_ctx->nmvc[nmv_ctx];
 #endif
         av1_encode_mv(cpi, w, &mbmi->mv[0].as_mv,
-                      &mbmi_ext->ref_mvs[mbmi->ref_frame[0]][0].as_mv,
-#if CONFIG_REF_MV
-                      is_compound,
-#endif
-                      nmvc, allow_hp);
+                      &mbmi_ext->ref_mvs[mbmi->ref_frame[0]][0].as_mv, nmvc,
+                      allow_hp);
 #endif  // CONFIG_EXT_INTER
       }
     }