commit 61bf3d8a3d548926e9c03230a6e7fb20db7d6343
author Jingning Han <jingning@google.com> Mon Feb 19 13:45:06 2018 -0800
committer Jingning Han <jingning@google.com> Tue Feb 20 22:16:39 2018 +0000
tree 15e82549dcd321f6bf5b97b269c3dce96b9eae82
parent 2680275a5a6d4c301ad4f94230a2991694d12162

[NORMATIVE mfmv] Store one mv per decoded block

When the block is coded in the bi-directional compound mode,
store up to one mv that points towards last_frame side, instead
of storing up to two mvs each corresponds to one side.

BUG=aomedia:1412

Change-Id: Id9ec295de28c0831457c8fe9ce5fd2085e3b5459

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 0554b64..17aac41 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -1772,7 +1772,7 @@
         cm->buffer_pool->frame_bufs[lst_buf_idx].alt_frame_offset;
 
     const int is_lst_overlay = (alt_frame_idx == gld_frame_index);
-    if (!is_lst_overlay) motion_field_projection(cm, LAST_FRAME, ref_stamp, 1);
+    if (!is_lst_overlay) motion_field_projection(cm, LAST_FRAME, ref_stamp, 2);
 
     --ref_stamp;
   }
@@ -1788,9 +1788,6 @@
   if (alt_frame_index > cur_frame_index && ref_stamp >= 0)
     if (motion_field_projection(cm, ALTREF_FRAME, ref_stamp, 0)) --ref_stamp;
 
-  if (ref_stamp >= 0 && lst_buf_idx >= 0)
-    if (motion_field_projection(cm, LAST_FRAME, ref_stamp, 2)) --ref_stamp;
-
   if (ref_stamp >= 0 && lst2_buf_idx >= 0)
     if (motion_field_projection(cm, LAST2_FRAME, ref_stamp, 2)) --ref_stamp;
 }