Fixed build conflict (amvr,intrabc).
Change-Id: Ibfeb424bf0ebab7bbeb69f6f6df24a4f4924ec97
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index ec2bd83..8e07a04 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3072,12 +3072,12 @@
#if CONFIG_AMVR
if (cm->allow_screen_content_tools) {
if (aom_rb_read_bit(rb)) {
- cm->seq_mv_precision_level = 2;
+ cm->seq_force_integer_mv = 2;
} else {
- cm->seq_mv_precision_level = aom_rb_read_bit(rb) ? 0 : 1;
+ cm->seq_force_integer_mv = aom_rb_read_bit(rb);
}
} else {
- cm->seq_mv_precision_level = 0;
+ cm->seq_force_integer_mv = 0;
}
#endif
#if CONFIG_TEMPMV_SIGNALING
@@ -3206,13 +3206,20 @@
#endif
#if CONFIG_AMVR
- if (cm->seq_mv_precision_level == 2) {
- cm->cur_frame_mv_precision_level = aom_rb_read_bit(rb) ? 0 : 1;
+ if (cm->seq_force_integer_mv == 2) {
+ cm->cur_frame_force_integer_mv = aom_rb_read_bit(rb);
} else {
- cm->cur_frame_mv_precision_level = cm->seq_mv_precision_level;
+ cm->cur_frame_force_integer_mv = cm->seq_force_integer_mv;
}
-#endif
+
+ if (cm->cur_frame_force_integer_mv) {
+ cm->allow_high_precision_mv = 0;
+ } else {
+ cm->allow_high_precision_mv = aom_rb_read_bit(rb);
+ }
+#else
cm->allow_high_precision_mv = aom_rb_read_bit(rb);
+#endif
cm->interp_filter = read_frame_interp_filter(rb);
#if CONFIG_TEMPMV_SIGNALING
if (frame_might_use_prev_frame_mvs(cm))
@@ -3394,7 +3401,7 @@
}
}
#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
for (i = 0; i < MAX_SEGMENTS; ++i) {
@@ -3567,7 +3574,7 @@
#if !CONFIG_NEW_MULTISYMBOL
#if CONFIG_AMVR
- if (cm->cur_frame_mv_precision_level == 0) {
+ if (cm->cur_frame_force_integer_mv == 0) {
#endif
for (int i = 0; i < NMV_CONTEXTS; ++i)
read_mv_probs(&fc->nmvc[i], cm->allow_high_precision_mv, &r);
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 361297d..2bc1358 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1134,8 +1134,12 @@
mi_col, NULL, NULL, inter_mode_ctx);
int_mv nearestmv, nearmv;
- av1_find_best_ref_mvs(0, ref_mvs, &nearestmv, &nearmv);
+#if CONFIG_AMVR
+ av1_find_best_ref_mvs(0, ref_mvs, &nearestmv, &nearmv, 0);
+#else
+ av1_find_best_ref_mvs(0, ref_mvs, &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);
xd->corrupted |=
@@ -1834,7 +1838,7 @@
(void)mi_col;
(void)bsize;
#if CONFIG_AMVR
- if (cm->cur_frame_mv_precision_level) {
+ if (cm->cur_frame_force_integer_mv) {
allow_hp = MV_SUBPEL_NONE;
}
#endif
@@ -1879,7 +1883,7 @@
mi_col, mi_row, block
#if CONFIG_AMVR
,
- cm->cur_frame_mv_precision_level
+ cm->cur_frame_force_integer_mv
#endif
)
.as_int;
@@ -1889,7 +1893,7 @@
mi_col, mi_row, block
#if CONFIG_AMVR
,
- cm->cur_frame_mv_precision_level
+ cm->cur_frame_force_integer_mv
#endif
)
.as_int;
@@ -2073,7 +2077,7 @@
mi_col, mi_row, block
#if CONFIG_AMVR
,
- cm->cur_frame_mv_precision_level
+ cm->cur_frame_force_integer_mv
#endif
)
.as_int;
@@ -2082,7 +2086,7 @@
mi_col, mi_row, block
#if CONFIG_AMVR
,
- cm->cur_frame_mv_precision_level
+ cm->cur_frame_force_integer_mv
#endif
)
.as_int;
@@ -2258,7 +2262,7 @@
bsize, mi_col, mi_row, 0
#if CONFIG_AMVR
,
- cm->cur_frame_mv_precision_level
+ cm->cur_frame_force_integer_mv
#endif
)
.as_int;
@@ -2269,7 +2273,7 @@
mi_row, 0
#if CONFIG_AMVR
,
- cm->cur_frame_mv_precision_level
+ cm->cur_frame_force_integer_mv
#endif
)
.as_int
@@ -2281,9 +2285,9 @@
if (rf[ref] == NONE_FRAME) continue;
#if CONFIG_AMVR
lower_mv_precision(&ref_mvs[rf[ref]][0].as_mv, allow_hp,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
lower_mv_precision(&ref_mvs[rf[ref]][1].as_mv, allow_hp,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
lower_mv_precision(&ref_mvs[rf[ref]][0].as_mv, allow_hp);
lower_mv_precision(&ref_mvs[rf[ref]][1].as_mv, allow_hp);
@@ -2335,7 +2339,7 @@
#if CONFIG_AMVR
av1_find_best_ref_mvs(allow_hp, ref_mvs[mbmi->ref_frame[ref]],
&nearestmv[ref], &nearmv[ref],
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
av1_find_best_ref_mvs(allow_hp, ref_mvs[mbmi->ref_frame[ref]],
&nearestmv[ref], &nearmv[ref]);
@@ -2357,9 +2361,9 @@
nearestmv[1] = xd->ref_mv_stack[ref_frame_type][0].comp_mv;
#if CONFIG_AMVR
lower_mv_precision(&nearestmv[0].as_mv, allow_hp,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
lower_mv_precision(&nearestmv[1].as_mv, allow_hp,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
lower_mv_precision(&nearestmv[0].as_mv, allow_hp);
lower_mv_precision(&nearestmv[1].as_mv, allow_hp);
@@ -2374,7 +2378,7 @@
#if CONFIG_AMVR
lower_mv_precision(&nearestmv[0].as_mv, allow_hp,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
lower_mv_precision(&nearestmv[0].as_mv, allow_hp);
#endif
@@ -2382,7 +2386,7 @@
nearestmv[1] = xd->ref_mv_stack[ref_frame_type][0].comp_mv;
#if CONFIG_AMVR
lower_mv_precision(&nearestmv[1].as_mv, allow_hp,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
lower_mv_precision(&nearestmv[1].as_mv, allow_hp);
#endif
@@ -2398,7 +2402,7 @@
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_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
lower_mv_precision(&nearmv[0].as_mv, allow_hp);
#endif
@@ -2408,7 +2412,7 @@
nearmv[1] = xd->ref_mv_stack[ref_frame_type][ref_mv_idx].comp_mv;
#if CONFIG_AMVR
lower_mv_precision(&nearmv[1].as_mv, allow_hp,
- cm->cur_frame_mv_precision_level);
+ cm->cur_frame_force_integer_mv);
#else
lower_mv_precision(&nearmv[1].as_mv, allow_hp);
#endif
