ref: 5009302bce7655054882a1bb7d2e0ad3010e712e
parent: ff184e482a616af575f060238de48e588e4bda7e
parent: 76d77aa013de48ebdaa3b9e58e2756188e39982a
author: Paul Wilkins <paulwilkins@google.com>
date: Tue Aug 15 10:57:22 EDT 2017
Merge "Enable emergency fast Q adaptation for VBR test case."
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3912,9 +3912,10 @@
if (two_pass_first_group_inter(cpi)) {cpi->twopass.active_worst_quality =
VPXMIN(q + qrange_adj, cpi->oxcf.worst_allowed_q);
- }
+ } else if (!frame_is_kf_gf_arf(cpi)) {#else
if (!frame_is_kf_gf_arf(cpi)) {+#endif
// Have we been forced to adapt Q outside the expected range by an extreme
// rate miss. If so adjust the active maxQ for the subsequent frames.
if (q > cpi->twopass.active_worst_quality) {@@ -3921,7 +3922,6 @@
cpi->twopass.active_worst_quality = q;
}
}
-#endif
if (enable_acl) {// Skip recoding, if model diff is below threshold