Refine quality of keyframes for superres.
With this change, for video, enabling SUPERRES_QTHRESH for keyframes
only provides gains for some videos:
- hdres 60 frames (1 keyframe): -0.027
(sunflower_720p25.y4m: -0.435,
jets_720p30.y4m: -0.255)
- lowres 150 frames (1 keyframe): 0.055
- midres 150 frames (1 keyframe): 0.031
Change-Id: I7232ea1e064f1057b39852ba910f544f4fcecdea
diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index 861c737..4fcda5a 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1089,6 +1089,16 @@
q_val = av1_convert_qindex_to_q(active_best_quality, bit_depth);
active_best_quality +=
av1_compute_qdelta(rc, q_val, q_val * q_adj_factor, bit_depth);
+
+ // Tweak active_best_quality for AOM_Q mode when superres is on, as this
+ // will be used directly as 'q' later.
+ if (oxcf->rc_mode == AOM_Q && oxcf->superres_mode == SUPERRES_QTHRESH &&
+ cm->superres_scale_denominator != SCALE_NUMERATOR) {
+ active_best_quality =
+ AOMMAX(active_best_quality -
+ ((cm->superres_scale_denominator - SCALE_NUMERATOR) * 4),
+ 0);
+ }
}
} else if (!rc->is_src_frame_alt_ref &&
(cpi->refresh_golden_frame || is_intrl_arf_boost ||
