Fixed build conflict (amvr,intrabc).
Change-Id: Ibfeb424bf0ebab7bbeb69f6f6df24a4f4924ec97
diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 5ad7894..d02e670 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -723,7 +723,7 @@
int lossless[MAX_SEGMENTS];
int corrupted;
#if CONFIG_AMVR
- int cur_frame_mv_precision_level;
+ int cur_frame_force_integer_mv;
// same with that in AV1_COMMON
#endif
struct aom_internal_error_info *error_info;
@@ -1457,7 +1457,7 @@
const MODE_INFO *mi) {
const MB_MODE_INFO *mbmi = &mi->mbmi;
#if CONFIG_AMVR
- if (xd->cur_frame_mv_precision_level == 0) {
+ if (xd->cur_frame_force_integer_mv == 0) {
#endif
#if CONFIG_GLOBAL_MOTION
const TransformationType gm_type = gm_params[mbmi->ref_frame[0]].wmtype;
@@ -1476,7 +1476,7 @@
if (!has_second_ref(mbmi) && mbmi->num_proj_ref[0] >= 1 &&
!av1_is_scaled(&(xd->block_refs[0]->sf))) {
#if CONFIG_AMVR
- if (xd->cur_frame_mv_precision_level) {
+ if (xd->cur_frame_force_integer_mv) {
return OBMC_CAUSAL;
}
#endif
diff --git a/av1/common/entropymv.c b/av1/common/entropymv.c
index 2d01913..fda65ce 100644
--- a/av1/common/entropymv.c
+++ b/av1/common/entropymv.c
@@ -235,7 +235,7 @@
for (j = 0; j < MV_OFFSET_BITS; ++j)
comp->bits[j] = av1_mode_mv_merge_probs(pre_comp->bits[j], c->bits[j]);
#if CONFIG_AMVR
- if (cm->cur_frame_mv_precision_level == 0) {
+ if (cm->cur_frame_force_integer_mv == 0) {
#endif
for (j = 0; j < CLASS0_SIZE; ++j)
aom_tree_merge_probs(av1_mv_fp_tree, pre_comp->class0_fp[j],
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;
}
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 353e45f..5d769c5 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -262,9 +262,10 @@
int allow_high_precision_mv;
#if CONFIG_AMVR
- int seq_mv_precision_level; // 0 the default in AOM, 1 only integer, 2
- // adaptive
- int cur_frame_mv_precision_level; // 0 the default in AOM, 1 only integer
+ int seq_force_integer_mv; // 0 - Not to force. MV can be in 1/4 or 1/8
+ // 1 - force to integer
+ // 2 - adaptive
+ int cur_frame_force_integer_mv; // 0 the default in AOM, 1 only integer
#endif
int allow_screen_content_tools;
diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 30e1d72..475350b 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -183,7 +183,7 @@
&final_warp_params));
if (do_warp
#if CONFIG_AMVR
- && xd->cur_frame_mv_precision_level == 0
+ && xd->cur_frame_force_integer_mv == 0
#endif
) {
const struct macroblockd_plane *const pd = &xd->plane[plane];
