Fixed build conflict (amvr,intrabc).
Change-Id: Ibfeb424bf0ebab7bbeb69f6f6df24a4f4924ec97
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 9c3ac2d..765bea3 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3993,11 +3993,11 @@
aom_wb_write_bit(wb, cm->allow_screen_content_tools);
#if CONFIG_AMVR
if (cm->allow_screen_content_tools) {
- if (cm->seq_mv_precision_level == 2) {
+ if (cm->seq_force_integer_mv == 2) {
aom_wb_write_bit(wb, 1);
} else {
aom_wb_write_bit(wb, 0);
- aom_wb_write_bit(wb, cm->seq_mv_precision_level == 0);
+ aom_wb_write_bit(wb, cm->seq_force_integer_mv);
}
}
#endif
@@ -4077,12 +4077,17 @@
#endif
#if CONFIG_AMVR
- if (cm->seq_mv_precision_level == 2) {
- aom_wb_write_bit(wb, cm->cur_frame_mv_precision_level == 0);
+ if (cm->seq_force_integer_mv == 2) {
+ aom_wb_write_bit(wb, cm->cur_frame_force_integer_mv);
}
-#endif
+ if (cm->cur_frame_force_integer_mv) {
+ cm->allow_high_precision_mv = 0;
+ } else {
+ aom_wb_write_bit(wb, cm->allow_high_precision_mv);
+ }
+#else
aom_wb_write_bit(wb, cm->allow_high_precision_mv);
-
+#endif
fix_interp_filter(cm, cpi->td.counts);
write_frame_interp_filter(cm->interp_filter, wb);
#if CONFIG_TEMPMV_SIGNALING
@@ -4270,11 +4275,11 @@
aom_wb_write_bit(wb, cm->allow_screen_content_tools);
#if CONFIG_AMVR
if (cm->allow_screen_content_tools) {
- if (cm->seq_mv_precision_level == 2) {
+ if (cm->seq_force_integer_mv == 2) {
aom_wb_write_bit(wb, 1);
} else {
aom_wb_write_bit(wb, 0);
- aom_wb_write_bit(wb, cm->seq_mv_precision_level == 0);
+ aom_wb_write_bit(wb, cm->seq_force_integer_mv == 0);
}
}
#endif
@@ -4356,8 +4361,8 @@
#endif
#if CONFIG_AMVR
- if (cm->seq_mv_precision_level == 2) {
- aom_wb_write_bit(wb, cm->cur_frame_mv_precision_level == 0);
+ if (cm->seq_force_integer_mv == 2) {
+ aom_wb_write_bit(wb, cm->cur_frame_force_integer_mv == 0);
}
#endif
aom_wb_write_bit(wb, cm->allow_high_precision_mv);
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 29b2573..5403318 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3341,7 +3341,7 @@
seg_skip = segfeature_active(seg, segment_id, SEG_LVL_SKIP);
}
#if CONFIG_AMVR
- xd->cur_frame_mv_precision_level = cm->cur_frame_mv_precision_level;
+ xd->cur_frame_force_integer_mv = cm->cur_frame_force_integer_mv;
#endif
if (cm->delta_q_present_flag) {
diff --git a/av1/encoder/encodemv.c b/av1/encoder/encodemv.c
index 3c05444..e3e07bd 100644
--- a/av1/encoder/encodemv.c
+++ b/av1/encoder/encodemv.c
@@ -171,7 +171,7 @@
int i;
int nmv_ctx = 0;
#if CONFIG_AMVR
- if (cm->cur_frame_mv_precision_level) {
+ if (cm->cur_frame_force_integer_mv) {
return;
}
#endif
@@ -195,7 +195,7 @@
const MV diff = { mv->row - ref->row, mv->col - ref->col };
const MV_JOINT_TYPE j = av1_get_mv_joint(&diff);
#if CONFIG_AMVR
- if (cpi->common.cur_frame_mv_precision_level) {
+ if (cpi->common.cur_frame_force_integer_mv) {
usehp = MV_SUBPEL_NONE;
}
#endif
@@ -324,7 +324,7 @@
const MB_MODE_INFO_EXT *mbmi_ext = td->mb.mbmi_ext;
#if CONFIG_AMVR
MvSubpelPrecision precision = 1;
- if (xd->cur_frame_mv_precision_level) {
+ if (xd->cur_frame_force_integer_mv) {
precision = MV_SUBPEL_NONE;
}
#endif
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 83bd295..19d8686 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -280,15 +280,14 @@
static void set_high_precision_mv(AV1_COMP *cpi, int allow_high_precision_mv
#if CONFIG_AMVR
,
- int cur_frame_mv_precision_level
+ int cur_frame_force_integer_mv
#endif
) {
MACROBLOCK *const mb = &cpi->td.mb;
cpi->common.allow_high_precision_mv = allow_high_precision_mv;
#if CONFIG_AMVR
- if (cpi->common.allow_high_precision_mv &&
- cur_frame_mv_precision_level == 0) {
+ if (cpi->common.allow_high_precision_mv && cur_frame_force_integer_mv == 0) {
#else
if (cpi->common.allow_high_precision_mv) {
#endif
@@ -2559,7 +2558,7 @@
cpi->common.ans_window_size_log2 = cpi->oxcf.ans_window_size_log2;
#endif // CONFIG_ANS && ANS_MAX_SYMBOLS
#if CONFIG_AMVR
- cm->seq_mv_precision_level = 2;
+ cm->seq_force_integer_mv = 2;
#endif
}
@@ -4145,7 +4144,7 @@
if (!frame_is_intra_only(cm)) {
#if CONFIG_AMVR
set_high_precision_mv(cpi, (*q) < HIGH_PRECISION_MV_QTHRESH,
- cpi->common.cur_frame_mv_precision_level);
+ cpi->common.cur_frame_force_integer_mv);
#else
set_high_precision_mv(cpi, (*q) < HIGH_PRECISION_MV_QTHRESH);
#endif
@@ -6481,17 +6480,16 @@
#if CONFIG_AMVR
cpi->cur_poc++;
if (oxcf->pass != 1 && cpi->common.allow_screen_content_tools) {
- if (cpi->common.seq_mv_precision_level == 2) {
+ if (cpi->common.seq_force_integer_mv == 2) {
struct lookahead_entry *previous_entry =
cpi->lookahead->buf + cpi->previsous_index;
- cpi->common.cur_frame_mv_precision_level = is_integer_mv(
+ cpi->common.cur_frame_force_integer_mv = is_integer_mv(
cpi, cpi->source, &previous_entry->img, cpi->previsou_hash_table);
} else {
- cpi->common.cur_frame_mv_precision_level =
- cpi->common.seq_mv_precision_level;
+ cpi->common.cur_frame_force_integer_mv = cpi->common.seq_force_integer_mv;
}
} else {
- cpi->common.cur_frame_mv_precision_level = 0;
+ cpi->common.cur_frame_force_integer_mv = 0;
}
#endif
diff --git a/av1/encoder/mbgraph.c b/av1/encoder/mbgraph.c
index eb0e103..844ea60 100644
--- a/av1/encoder/mbgraph.c
+++ b/av1/encoder/mbgraph.c
@@ -50,7 +50,7 @@
// Try sub-pixel MC
// if (bestsme > error_thresh && bestsme < INT_MAX)
#if CONFIG_AMVR
- if (cpi->common.cur_frame_mv_precision_level == 1) {
+ if (cpi->common.cur_frame_force_integer_mv == 1) {
x->best_mv.as_mv.row *= 8;
x->best_mv.as_mv.col *= 8;
} else {
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 622a36a..9987467 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -706,7 +706,7 @@
for (nmv_ctx = 0; nmv_ctx < NMV_CONTEXTS; ++nmv_ctx) {
#if CONFIG_AMVR
- if (cm->cur_frame_mv_precision_level) {
+ if (cm->cur_frame_force_integer_mv) {
av1_build_nmv_cost_table(x->nmv_vec_cost[nmv_ctx], x->nmvcost[nmv_ctx],
&cm->fc->nmvc[nmv_ctx], MV_SUBPEL_NONE);
} else {
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 14ffaed..042448e 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5730,7 +5730,7 @@
mi_col, mi_row, block
#if CONFIG_AMVR
,
- cpi->common.cur_frame_mv_precision_level
+ cpi->common.cur_frame_force_integer_mv
#endif
)
.as_int;
@@ -6102,11 +6102,11 @@
x->mv_limits = tmp_mv_limits;
#if CONFIG_AMVR
- if (cpi->common.cur_frame_mv_precision_level) {
+ if (cpi->common.cur_frame_force_integer_mv) {
x->best_mv.as_mv.row *= 8;
x->best_mv.as_mv.col *= 8;
}
- if (bestsme < INT_MAX && cpi->common.cur_frame_mv_precision_level == 0)
+ if (bestsme < INT_MAX && cpi->common.cur_frame_force_integer_mv == 0)
#else
if (bestsme < INT_MAX)
#endif
@@ -6456,7 +6456,7 @@
#if CONFIG_AMVR
av1_find_best_ref_mvs(cm->allow_high_precision_mv, candidates,
&frame_nearest_mv[ref_frame], &frame_near_mv[ref_frame],
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
av1_find_best_ref_mvs(cm->allow_high_precision_mv, candidates,
&frame_nearest_mv[ref_frame],
@@ -6607,11 +6607,11 @@
x->mv_limits = tmp_mv_limits;
#if CONFIG_AMVR
- if (cpi->common.cur_frame_mv_precision_level) {
+ if (cpi->common.cur_frame_force_integer_mv) {
x->best_mv.as_mv.row *= 8;
x->best_mv.as_mv.col *= 8;
}
- if (bestsme < INT_MAX && cpi->common.cur_frame_mv_precision_level == 0) {
+ if (bestsme < INT_MAX && cpi->common.cur_frame_force_integer_mv == 0) {
#else
if (bestsme < INT_MAX) {
#endif
@@ -6914,11 +6914,11 @@
x->mv_limits = tmp_mv_limits;
#if CONFIG_AMVR
- if (cpi->common.cur_frame_mv_precision_level) {
+ if (cpi->common.cur_frame_force_integer_mv) {
x->best_mv.as_mv.row *= 8;
x->best_mv.as_mv.col *= 8;
}
- if (bestsme < INT_MAX && cpi->common.cur_frame_mv_precision_level == 0) {
+ if (bestsme < INT_MAX && cpi->common.cur_frame_force_integer_mv == 0) {
#else
if (bestsme < INT_MAX) {
#endif
@@ -8482,7 +8482,7 @@
#if CONFIG_AMVR
lower_mv_precision(&cur_mv[0].as_mv, cm->allow_high_precision_mv,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
lower_mv_precision(&cur_mv[0].as_mv, cm->allow_high_precision_mv);
#endif
@@ -8496,7 +8496,7 @@
#if CONFIG_AMVR
lower_mv_precision(&cur_mv[1].as_mv, cm->allow_high_precision_mv,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
lower_mv_precision(&cur_mv[1].as_mv, cm->allow_high_precision_mv);
#endif
@@ -8517,7 +8517,7 @@
#if CONFIG_AMVR
lower_mv_precision(&cur_mv[0].as_mv, cm->allow_high_precision_mv,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
lower_mv_precision(&cur_mv[0].as_mv, cm->allow_high_precision_mv);
#endif
@@ -8540,7 +8540,7 @@
#if CONFIG_AMVR
lower_mv_precision(&cur_mv[1].as_mv, cm->allow_high_precision_mv,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
lower_mv_precision(&cur_mv[1].as_mv, cm->allow_high_precision_mv);
#endif
@@ -9000,7 +9000,11 @@
NULL, NULL, mbmi_ext->mode_context);
int_mv nearestmv, nearmv;
+#if CONFIG_AMVR
+ av1_find_best_ref_mvs(0, candidates, &nearestmv, &nearmv, 0);
+#else
av1_find_best_ref_mvs(0, candidates, &nearestmv, &nearmv);
+#endif
int_mv dv_ref = nearestmv.as_int == 0 ? nearmv : nearestmv;
if (dv_ref.as_int == 0) av1_find_ref_dv(&dv_ref, mi_row, mi_col);
@@ -9529,7 +9533,7 @@
0
#if CONFIG_AMVR
,
- cm->cur_frame_mv_precision_level
+ cm->cur_frame_force_integer_mv
#endif
)
.as_int;
@@ -9548,7 +9552,7 @@
0
#if CONFIG_AMVR
,
- cm->cur_frame_mv_precision_level
+ cm->cur_frame_force_integer_mv
#endif
)
.as_int;
@@ -9646,7 +9650,7 @@
mi_col, mi_row, 0
#if CONFIG_AMVR
,
- cm->cur_frame_mv_precision_level
+ cm->cur_frame_force_integer_mv
#endif
)
.as_int;
@@ -10828,22 +10832,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 =
- comp_pred_mode
- ? gm_get_motion_vector(&cm->global_motion[refs[1]],
- cm->allow_high_precision_mv, bsize, mi_col,
- mi_row, 0
+ zeromv[1].as_int = comp_pred_mode
+ ? gm_get_motion_vector(&cm->global_motion[refs[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 = 0;
zeromv[1].as_int = 0;
@@ -10940,7 +10943,7 @@
mi_col, mi_row, 0
#if CONFIG_AMVR
,
- cm->cur_frame_mv_precision_level
+ cm->cur_frame_force_integer_mv
#endif
)
.as_int;
@@ -11088,7 +11091,7 @@
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;
diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index 61fd75d..1afeebe 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -288,7 +288,7 @@
// Ignore mv costing by sending NULL pointer instead of cost array
#if CONFIG_AMVR
- if (cpi->common.cur_frame_mv_precision_level == 1) {
+ if (cpi->common.cur_frame_force_integer_mv == 1) {
const uint8_t *const src_address = x->plane[0].src.buf;
const int src_stride = x->plane[0].src.stride;
const uint8_t *const y = xd->plane[0].pre[0].buf;
