From 76d77aa013de48ebdaa3b9e58e2756188e39982a Mon Sep 17 00:00:00 2001 From: paulwilkins Date: Tue, 1 Aug 2017 17:06:29 +0100 Subject: [PATCH] Enable emergency fast Q adaptation for VBR test case. Enable fast adaptation of Q when there is a large overshoot for the #ifdef AGGRESSIVE_VBR test case. AGGRESSIVE_VBR is not currently enabled by default. Change-Id: I7240bb6589795964b6b0b66df4468e4f21504e0f --- vp9/encoder/vp9_encoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 4888c20f4..a9d43ef02 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -3907,16 +3907,16 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size, 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) { cpi->twopass.active_worst_quality = q; } } -#endif if (enable_acl) { // Skip recoding, if model diff is below threshold -- 2.49.0