Resolved build conflict by amvr

Change-Id: Icd0a8c4a9cf47cb93e8329ed0bdc0f79787baaaf

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 3f1d2c8..a4d4d61 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -112,7 +112,11 @@
               ROUND_POWER_OF_TWO_SIGNED(out[0] + out[2], SCALING_FCT + 1);
           this_refmv.as_mv.row =
               ROUND_POWER_OF_TWO_SIGNED(out[1] + out[3], SCALING_FCT + 1);
+#if CONFIG_AMVR
+          lower_mv_precision(&this_refmv.as_mv, use_hp, is_integer);
+#else
           lower_mv_precision(&this_refmv.as_mv, use_hp);
+#endif
         } else {
 #endif  // CONFIG_EXT_WARPED_MOTION
 #if USE_CUR_GM_REFMV
@@ -474,7 +478,12 @@
       if (prev_frame_mvs->mfmv[ref_frame - LAST_FRAME][i].as_int !=
           INVALID_MV) {
         int_mv this_refmv = prev_frame_mvs->mfmv[ref_frame - LAST_FRAME][i];
+#if CONFIG_AMVR
+        lower_mv_precision(&this_refmv.as_mv, cm->allow_high_precision_mv,
+                           cm->cur_frame_force_integer_mv);
+#else
         lower_mv_precision(&this_refmv.as_mv, cm->allow_high_precision_mv);
+#endif
 
         if (blk_row == 0 && blk_col == 0)
           if (abs(this_refmv.as_mv.row) >= 16 ||
@@ -509,9 +518,15 @@
           prev_frame_mvs->mfmv[rf[1] - LAST_FRAME][i].as_int != INVALID_MV) {
         int_mv this_refmv = prev_frame_mvs->mfmv[rf[0] - LAST_FRAME][i];
         int_mv comp_refmv = prev_frame_mvs->mfmv[rf[1] - LAST_FRAME][i];
+#if CONFIG_AMVR
+        lower_mv_precision(&this_refmv.as_mv, cm->allow_high_precision_mv,
+                           cm->cur_frame_force_integer_mv);
+        lower_mv_precision(&comp_refmv.as_mv, cm->allow_high_precision_mv,
+                           cm->cur_frame_force_integer_mv);
+#else
         lower_mv_precision(&this_refmv.as_mv, cm->allow_high_precision_mv);
         lower_mv_precision(&comp_refmv.as_mv, cm->allow_high_precision_mv);
-
+#endif
         if (blk_row == 0 && blk_col == 0)
           if (abs(this_refmv.as_mv.row) >= 16 ||
               abs(this_refmv.as_mv.col) >= 16 ||

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 83376f6..8a577b0 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1880,7 +1880,12 @@
       assert(!is_compound);
       mv[0].as_int = gm_get_motion_vector(&cm->global_motion[ref_frame[0]],
                                           cm->allow_high_precision_mv, bsize,
-                                          mi_col, mi_row, block)
+                                          mi_col, mi_row, block
+#if CONFIG_AMVR
+                                          ,
+                                          cm->cur_frame_force_integer_mv
+#endif
+                                          )
                          .as_int;
 
       FRAME_COUNTS *counts = xd->counts;
@@ -2360,7 +2365,12 @@
         if (compound_ref0_mode(mbmi->mode) == NEARMV ||
             compound_ref1_mode(mbmi->mode) == NEARMV) {
           nearmv[0] = xd->ref_mv_stack[ref_frame_type][ref_mv_idx].this_mv;
+#if CONFIG_AMVR
+          lower_mv_precision(&nearmv[0].as_mv, allow_hp,
+                             cm->cur_frame_force_integer_mv);
+#else
           lower_mv_precision(&nearmv[0].as_mv, allow_hp);
+#endif
         }
       }
 #endif  // CONFIG_COMPOUND_SINGLEREF