commit 10a0380a9118d93e5d78d2796b81f031aab4b444
author RogerZhou <youzhou@microsoft.com> Thu Oct 26 11:49:48 2017 -0700
committer Roger Zhou <youzhou@microsoft.com> Fri Oct 27 00:06:15 2017 +0000
tree 510b38b48ddb4517efef207678e51d3a6a1e0c01
parent 43edb7605669c5c59b2b6c3377d4c48018918987

Fixed build conflict (amvr,intrabc).

Change-Id: Ibfeb424bf0ebab7bbeb69f6f6df24a4f4924ec97

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index e5faaab..e9814a7 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -243,7 +243,7 @@
 #if CONFIG_GLOBAL_MOTION && USE_CUR_GM_REFMV
         gm_mv_candidates, cm->global_motion,
 #endif  // CONFIG_GLOBAL_MOTION && USE_CUR_GM_REFMV
-        col_offset + i, weight, cm->cur_frame_mv_precision_level,
+        col_offset + i, weight, cm->cur_frame_force_integer_mv,
         xd->mi[0]->mbmi.sb_type, mi_row, mi_col, xd->plane[0].subsampling_x,
         xd->plane[0].subsampling_y);
 #else
@@ -313,7 +313,7 @@
 #if CONFIG_GLOBAL_MOTION && USE_CUR_GM_REFMV
         gm_mv_candidates, cm->global_motion,
 #endif  // CONFIG_GLOBAL_MOTION && USE_CUR_GM_REFMV
-        col_offset, weight, cm->cur_frame_mv_precision_level,
+        col_offset, weight, cm->cur_frame_force_integer_mv,
         xd->mi[0]->mbmi.sb_type, mi_row, mi_col, xd->plane[0].subsampling_x,
         xd->plane[0].subsampling_y);
 #else
@@ -361,9 +361,8 @@
 #if CONFIG_GLOBAL_MOTION && USE_CUR_GM_REFMV
         gm_mv_candidates, cm->global_motion,
 #endif  // CONFIG_GLOBAL_MOTION && USE_CUR_GM_REFMV
-        mi_pos.col, 2, cm->cur_frame_mv_precision_level,
-        xd->mi[0]->mbmi.sb_type, mi_row, mi_col, xd->plane[0].subsampling_x,
-        xd->plane[0].subsampling_y);
+        mi_pos.col, 2, cm->cur_frame_force_integer_mv, xd->mi[0]->mbmi.sb_type,
+        mi_row, mi_col, xd->plane[0].subsampling_x, xd->plane[0].subsampling_y);
 #else
     newmv_count += add_ref_mv_candidate(
         candidate_mi, candidate, rf, refmv_count, ref_mv_stack,
@@ -593,7 +592,7 @@
       int_mv this_refmv = prev_frame_mvs->mv[ref];
 #if CONFIG_AMVR
       lower_mv_precision(&this_refmv.as_mv, cm->allow_high_precision_mv,
-                         cm->cur_frame_mv_precision_level);
+                         cm->cur_frame_force_integer_mv);
 #else
       lower_mv_precision(&this_refmv.as_mv, cm->allow_high_precision_mv);
 #endif
@@ -1246,22 +1245,21 @@
                                             mi_col, mi_row, 0
 #if CONFIG_AMVR
                                             ,
-                                            cm->cur_frame_mv_precision_level
+                                            cm->cur_frame_force_integer_mv
 #endif
                                             )
                            .as_int;
-    zeromv[1].as_int =
-        (rf[1] != NONE_FRAME)
-            ? gm_get_motion_vector(&cm->global_motion[rf[1]],
-                                   cm->allow_high_precision_mv, bsize, mi_col,
-                                   mi_row, 0
+    zeromv[1].as_int = (rf[1] != NONE_FRAME)
+                           ? gm_get_motion_vector(&cm->global_motion[rf[1]],
+                                                  cm->allow_high_precision_mv,
+                                                  bsize, mi_col, mi_row, 0
 #if CONFIG_AMVR
-                                   ,
-                                   cm->cur_frame_mv_precision_level
+                                                  ,
+                                                  cm->cur_frame_force_integer_mv
 #endif
-                                   )
-                  .as_int
-            : 0;
+                                                  )
+                                 .as_int
+                           : 0;
   } else {
     zeromv[0].as_int = zeromv[1].as_int = 0;
   }