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/encodemv.c

diff --git a/av1/encoder/encodemv.c b/av1/encoder/encodemv.c
index 5b6f9b6..7a37379 100644
--- a/av1/encoder/encodemv.c
+++ b/av1/encoder/encodemv.c
@@ -294,14 +294,13 @@
                     nmv_context_counts *nmv_counts) {
   int i;
   PREDICTION_MODE mode = mbmi->mode;
-  int mv_idx = (mode == NEWFROMNEARMV);
 #if !CONFIG_REF_MV
   nmv_context_counts *counts = nmv_counts;
 #endif
 
-  if (mode == NEWMV || mode == NEWFROMNEARMV || mode == NEW_NEWMV) {
+  if (mode == NEWMV || mode == NEW_NEWMV) {
     for (i = 0; i < 1 + has_second_ref(mbmi); ++i) {
-      const MV *ref = &mbmi_ext->ref_mvs[mbmi->ref_frame[i]][mv_idx].as_mv;
+      const MV *ref = &mbmi_ext->ref_mvs[mbmi->ref_frame[i]][0].as_mv;
       const MV diff = { mvs[i].as_mv.row - ref->row,
                         mvs[i].as_mv.col - ref->col };
 #if CONFIG_REF_MV
@@ -354,7 +353,7 @@
   nmv_context_counts *counts = nmv_counts;
 #endif
 
-  if (mode == NEWMV || mode == NEWFROMNEARMV || mode == NEW_NEWMV) {
+  if (mode == NEWMV || mode == NEW_NEWMV) {
     for (i = 0; i < 1 + has_second_ref(&mi->mbmi); ++i) {
       const MV *ref = &mi->bmi[block].ref_mv[i].as_mv;
       const MV diff = { mvs[i].as_mv.row - ref->row,