ref: a5af49331dda0ed58305a66acd1d85887210af56
parent: b81f04a0cc5344e47389f1a1e852d319e4e389fe
parent: cea5e1c1e362ea37612346ed1585ae28089c1f45
author: Paul Wilkins <[email protected]>
date: Tue Dec 15 10:50:05 EST 2015
Merge "1 pass VBR mode bug fix."
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -1313,9 +1313,9 @@
}
}
} else {
- if (rc->is_src_frame_alt_ref ||
- !(cpi->refresh_golden_frame || cpi->refresh_alt_ref_frame) ||
- (cpi->use_svc && oxcf->rc_mode == VPX_CBR)) {
+ if ((cpi->use_svc && oxcf->rc_mode == VPX_CBR) ||
+ (!rc->is_src_frame_alt_ref &&
+ !(cpi->refresh_golden_frame || cpi->refresh_alt_ref_frame))) {
rc->last_q[INTER_FRAME] = qindex;
rc->avg_frame_qindex[INTER_FRAME] =
ROUND_POWER_OF_TWO(3 * rc->avg_frame_qindex[INTER_FRAME] + qindex, 2);