Correct av1_encoder_get_relative_dist()
av1_encoder_get_relative_dist() is used only on the encoder side to make
encoding decisions such as prediction mode selection. It does not need
to check if order hint is enabled in the bitstream.
This fixes some incorrect encoder behaviors in some corner cases. For
example, before this fix, with --enable-order-hint=0
--enable-onesided-comp=0, the encoder would skip all compound modes.
Change-Id: Ifacfa67accff55eb4bb161025c3c5a05f9dde475
(cherry picked from commit 8438c69ccf59e4a18caa05763bce567521d26d74)
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 0e947f6..2f42908 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -972,7 +972,6 @@
static AOM_INLINE void set_rel_frame_dist(
const AV1_COMMON *const cm, RefFrameDistanceInfo *const ref_frame_dist_info,
const int ref_frame_flags) {
- const OrderHintInfo *const order_hint_info = &cm->seq_params.order_hint_info;
MV_REFERENCE_FRAME ref_frame;
int min_past_dist = INT32_MAX, min_future_dist = INT32_MAX;
ref_frame_dist_info->nearest_past_ref = NONE_FRAME;
@@ -981,7 +980,6 @@
ref_frame_dist_info->ref_relative_dist[ref_frame - LAST_FRAME] = 0;
if (ref_frame_flags & av1_ref_frame_flag_list[ref_frame]) {
int dist = av1_encoder_get_relative_dist(
- order_hint_info,
cm->cur_frame->ref_display_order_hint[ref_frame - LAST_FRAME],
cm->current_frame.display_order_hint);
ref_frame_dist_info->ref_relative_dist[ref_frame - LAST_FRAME] = dist;
@@ -1003,14 +1001,12 @@
assert(!frame_is_intra_only(cm));
int one_sided_refs = 1;
+ const int cur_display_order_hint = cm->current_frame.display_order_hint;
for (int ref = LAST_FRAME; ref <= ALTREF_FRAME; ++ref) {
const RefCntBuffer *const buf = get_ref_frame_buf(cm, ref);
if (buf == NULL) continue;
-
- const int ref_display_order_hint = buf->display_order_hint;
- if (av1_encoder_get_relative_dist(
- &cm->seq_params.order_hint_info, ref_display_order_hint,
- (int)cm->current_frame.display_order_hint) > 0) {
+ if (av1_encoder_get_relative_dist(buf->display_order_hint,
+ cur_display_order_hint) > 0) {
one_sided_refs = 0; // bwd reference
break;
}
@@ -1090,17 +1086,15 @@
} else if (!cpi->sf.rt_sf.use_nonrd_pick_mode &&
cpi->sf.inter_sf.selective_ref_frame >= 2) {
AV1_COMMON *const cm = &cpi->common;
- const OrderHintInfo *const order_hint_info =
- &cm->seq_params.order_hint_info;
const int cur_frame_display_order_hint =
cm->current_frame.display_order_hint;
unsigned int *ref_display_order_hint =
cm->cur_frame->ref_display_order_hint;
const int arf2_dist = av1_encoder_get_relative_dist(
- order_hint_info, ref_display_order_hint[ALTREF2_FRAME - LAST_FRAME],
+ ref_display_order_hint[ALTREF2_FRAME - LAST_FRAME],
cur_frame_display_order_hint);
const int bwd_dist = av1_encoder_get_relative_dist(
- order_hint_info, ref_display_order_hint[BWDREF_FRAME - LAST_FRAME],
+ ref_display_order_hint[BWDREF_FRAME - LAST_FRAME],
cur_frame_display_order_hint);
for (int ref_idx = REF_FRAMES; ref_idx < MODE_CTX_REF_FRAMES; ++ref_idx) {
@@ -1115,7 +1109,7 @@
int ref_dist[2];
for (int i = 0; i < 2; ++i) {
ref_dist[i] = av1_encoder_get_relative_dist(
- order_hint_info, ref_display_order_hint[rf[i] - LAST_FRAME],
+ ref_display_order_hint[rf[i] - LAST_FRAME],
cur_frame_display_order_hint);
}
diff --git a/av1/encoder/global_motion_facade.c b/av1/encoder/global_motion_facade.c
index a502ed0..4cb4c43 100644
--- a/av1/encoder/global_motion_facade.c
+++ b/av1/encoder/global_motion_facade.c
@@ -302,7 +302,6 @@
FrameDistPair reference_frames[MAX_DIRECTIONS][REF_FRAMES - 1],
int *num_ref_frames) {
AV1_COMMON *const cm = &cpi->common;
- const OrderHintInfo *const order_hint_info = &cm->seq_params.order_hint_info;
int *num_past_ref_frames = &num_ref_frames[0];
int *num_future_ref_frames = &num_ref_frames[1];
const GF_GROUP *gf_group = &cpi->gf_group;
@@ -335,9 +334,8 @@
do_gm_search_logic(&cpi->sf, frame) && !prune_ref_frames &&
!(cpi->sf.gm_sf.selective_ref_gm && skip_gm_frame(cm, frame))) {
assert(ref_buf[frame] != NULL);
- int relative_frame_dist = av1_encoder_get_relative_dist(
- order_hint_info, buf->display_order_hint,
- cm->cur_frame->display_order_hint);
+ const int relative_frame_dist = av1_encoder_get_relative_dist(
+ buf->display_order_hint, cm->cur_frame->display_order_hint);
// Populate past and future ref frames.
// reference_frames[0][] indicates past direction and
// reference_frames[1][] indicates future direction.
diff --git a/av1/encoder/rdopt.h b/av1/encoder/rdopt.h
index 54086ad..6b4b8a2 100644
--- a/av1/encoder/rdopt.h
+++ b/av1/encoder/rdopt.h
@@ -211,10 +211,7 @@
}
#endif
-static INLINE int av1_encoder_get_relative_dist(const OrderHintInfo *oh, int a,
- int b) {
- if (!oh->enable_order_hint) return 0;
-
+static INLINE int av1_encoder_get_relative_dist(int a, int b) {
assert(a >= 0 && b >= 0);
return (a - b);
}
@@ -247,7 +244,6 @@
// This function prunes the mode if either of the reference frame falls in the
// pruning list
static INLINE int prune_ref(const MV_REFERENCE_FRAME *const ref_frame,
- const OrderHintInfo *const order_hint_info,
const unsigned int *const ref_display_order_hint,
const unsigned int frame_display_order_hint,
const int *ref_frame_list) {
@@ -257,7 +253,6 @@
if (ref_frame[0] == ref_frame_list[i] ||
ref_frame[1] == ref_frame_list[i]) {
if (av1_encoder_get_relative_dist(
- order_hint_info,
ref_display_order_hint[ref_frame_list[i] - LAST_FRAME],
frame_display_order_hint) < 0)
return 1;
@@ -273,8 +268,6 @@
const SPEED_FEATURES *const sf = &cpi->sf;
if (!sf->inter_sf.selective_ref_frame) return 0;
- const AV1_COMMON *const cm = &cpi->common;
- const OrderHintInfo *const order_hint_info = &cm->seq_params.order_hint_info;
const int comp_pred = ref_frame[1] > INTRA_FRAME;
if (sf->inter_sf.selective_ref_frame >= 2 ||
@@ -286,7 +279,7 @@
if (x->tpl_keep_ref_frame[LAST2_FRAME]) ref_frame_list[1] = NONE_FRAME;
}
- if (prune_ref(ref_frame, order_hint_info, ref_display_order_hint,
+ if (prune_ref(ref_frame, ref_display_order_hint,
ref_display_order_hint[GOLDEN_FRAME - LAST_FRAME],
ref_frame_list))
return 1;
@@ -300,7 +293,7 @@
if (x->tpl_keep_ref_frame[BWDREF_FRAME]) ref_frame_list[1] = NONE_FRAME;
}
- if (prune_ref(ref_frame, order_hint_info, ref_display_order_hint,
+ if (prune_ref(ref_frame, ref_display_order_hint,
ref_display_order_hint[LAST_FRAME - LAST_FRAME],
ref_frame_list))
return 1;
