rtc: Fix usage of force_skip_low_temp_var in nonrd
Should be that it excludes non-LAST, instead
of just GOLDEN. Fix related comments.
Flag is only currently used for speed 8 resoln > VGA.
No change as GOLDEN is the only non-LAST reference
used in speed 8.
Change-Id: Ie4984b8cba680ff029f2ca451b9eb9b4daf55c76
diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 28002b9..d308621 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -282,9 +282,9 @@
av1_find_best_ref_mvs_from_stack(cm->allow_high_precision_mv, mbmi_ext,
ref_frame, &frame_mv[NEARESTMV][ref_frame],
&frame_mv[NEARMV][ref_frame], 0);
- // Early exit for golden frame if force_skip_low_temp_var is set.
+ // Early exit for non-LAST frame if force_skip_low_temp_var is set.
if (!av1_is_scaled(sf) && bsize >= BLOCK_8X8 &&
- !(force_skip_low_temp_var && ref_frame == GOLDEN_FRAME)) {
+ !(force_skip_low_temp_var && ref_frame != LAST_FRAME)) {
av1_mv_pred(cpi, x, yv12_mb[ref_frame][0].buf, yv12->y_stride, ref_frame,
bsize);
}
@@ -1566,7 +1566,7 @@
x->nonrd_prune_ref_frame_search) {
force_skip_low_temp_var =
get_force_skip_low_temp_var(&x->variance_low[0], mi_row, mi_col, bsize);
- // If force_skip_low_temp_var is set, skip golden reference.
+ // If force_skip_low_temp_var is set, skip non-LAST references.
if (force_skip_low_temp_var) {
usable_ref_frame = LAST_FRAME;
}
@@ -1696,7 +1696,7 @@
if (ref_frame != LAST_FRAME && this_mode == NEARMV) continue;
}
- // Skip non-zeromv mode search for golden frame if force_skip_low_temp_var
+ // Skip non-zeromv mode search for non-LAST frame if force_skip_low_temp_var
// is set. If nearestmv for golden frame is 0, zeromv mode will be skipped
// later.
if (!force_mv_inter_layer && force_skip_low_temp_var &&
