commit 13fb7c1b88ad6b22884b3155734e5465ce08d116
author Jingning Han <jingning@google.com> Wed Mar 02 20:09:54 2016 -0800
committer Jingning Han <jingning@google.com> Wed Mar 02 20:14:07 2016 -0800
tree 9ce05048838010deb47c2239c304203a4d783dbf
parent 342a368fd489d4bb2fd2ef9189a933ff7b643d64

Apply mv precision check to reference mv candidate

This allows the codec to use effective motion vector as the candidate
to produce the reference motion vector list.

Change-Id: Ib90be705fe28200c13376d6d7741800a61f13043

vp10/common/mvref_common.c

diff --git a/vp10/common/mvref_common.c b/vp10/common/mvref_common.c
index 5a2def0..c67beed 100644
--- a/vp10/common/mvref_common.c
+++ b/vp10/common/mvref_common.c
@@ -17,6 +17,7 @@
                                     const MV_REFERENCE_FRAME rf[2],
                                     uint8_t *refmv_count,
                                     CANDIDATE_MV *ref_mv_stack,
+                                    const int use_hp,
                                     int len, int block, int col) {
   const int weight = len;
   int index = 0, ref;
@@ -28,6 +29,8 @@
       if (candidate->ref_frame[ref] == rf[0]) {
         int_mv this_refmv =
             get_sub_block_mv(candidate_mi, ref, col, block);
+        lower_mv_precision(&this_refmv.as_mv, use_hp);
+
         for (index = 0; index < *refmv_count; ++index)
           if (ref_mv_stack[index].this_mv.as_int == this_refmv.as_int)
             break;
@@ -168,8 +171,9 @@
                              num_8x8_blocks_wide_lookup[candidate->sb_type]);
 
       newmv_count += add_ref_mv_candidate(candidate_mi, candidate, rf,
-                                          refmv_count, ref_mv_stack, len,
-                                          block, mi_pos.col);
+                                          refmv_count, ref_mv_stack,
+                                          cm->allow_high_precision_mv,
+                                          len, block, mi_pos.col);
       i += len;
     } else {
       ++i;
@@ -202,8 +206,9 @@
                        num_8x8_blocks_high_lookup[candidate->sb_type]);
 
       newmv_count += add_ref_mv_candidate(candidate_mi, candidate, rf,
-                                          refmv_count, ref_mv_stack, len,
-                                          block, mi_pos.col);
+                                          refmv_count, ref_mv_stack,
+                                          cm->allow_high_precision_mv,
+                                          len, block, mi_pos.col);
       i += len;
     } else {
       ++i;
@@ -234,8 +239,9 @@
     const int len = 1;
 
     newmv_count += add_ref_mv_candidate(candidate_mi, candidate, rf,
-                                        refmv_count, ref_mv_stack, len,
-                                        block, mi_pos.col);
+                                        refmv_count, ref_mv_stack,
+                                        cm->allow_high_precision_mv,
+                                        len, block, mi_pos.col);
   }  // Analyze a single 8x8 block motion information.
   return newmv_count;
 }
@@ -355,9 +361,12 @@
 
         for (ref = 0; ref < 2; ++ref) {
           if (prev_frame_mvs->ref_frame[ref] == ref_frame) {
+            int_mv this_refmv = prev_frame_mvs->mv[ref];
+            lower_mv_precision(&this_refmv.as_mv,
+                               cm->allow_high_precision_mv);
+
             for (idx = 0; idx < *refmv_count; ++idx)
-              if (prev_frame_mvs->mv[ref].as_int ==
-                  ref_mv_stack[idx].this_mv.as_int)
+              if (this_refmv.as_int == ref_mv_stack[idx].this_mv.as_int)
                 break;
 
             if (idx < *refmv_count)
@@ -365,7 +374,7 @@
 
             if (idx == *refmv_count &&
                 *refmv_count < MAX_REF_MV_STACK_SIZE) {
-              ref_mv_stack[idx].this_mv.as_int = prev_frame_mvs->mv[ref].as_int;
+              ref_mv_stack[idx].this_mv.as_int = this_refmv.as_int;
               ref_mv_stack[idx].weight = 2;
               ++(*refmv_count);