ref: 62cce50d55cff857ef641553bc991b499645f923
parent: 35c4a13eb7d9c3c8c4c85974f39a0042a9930b88
parent: bea22782e9cd794171a6cd2e3999ca88711d2180
author: Marco Paniconi <[email protected]>
date: Mon Jan 9 18:30:32 EST 2017
Merge "vp9: 1 pass cbr: Fix to qp clamping when gf_cbr_boost_pct is used."
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -560,6 +560,8 @@
// In CBR mode, this makes sure q is between oscillating Qs to prevent
// resonance.
if (cpi->oxcf.rc_mode == VPX_CBR &&
+ (!cpi->oxcf.gf_cbr_boost_pct ||
+ !(cpi->refresh_alt_ref_frame || cpi->refresh_golden_frame)) &&
(cpi->rc.rc_1_frame * cpi->rc.rc_2_frame == -1) &&
cpi->rc.q_1_frame != cpi->rc.q_2_frame) {q = clamp(q, VPXMIN(cpi->rc.q_1_frame, cpi->rc.q_2_frame),