ref: ec8be105189bae3004933a91cad3a40f3d1a1eb9
parent: 80997347ba68104f3a7a309d32e12544961377ea
parent: bb58dfade710c94fc78b50a50f76925863873f38
author: Paul Wilkins <paulwilkins@google.com>
date: Wed Sep 12 07:57:02 EDT 2018
Merge "Fix rate control bug with recode all."
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -4150,8 +4150,9 @@
// Special case if the projected size is > the max allowed.
if ((q == q_high) &&
((rc->projected_frame_size >= rc->max_frame_bandwidth) ||
- (rc->projected_frame_size >=
- big_rate_miss_high_threshold(cpi)))) {+ (!rc->is_src_frame_alt_ref &&
+ (rc->projected_frame_size >=
+ big_rate_miss_high_threshold(cpi))))) {int max_rate = VPXMAX(1, VPXMIN(rc->max_frame_bandwidth,
big_rate_miss_high_threshold(cpi)));
double q_val_high;
@@ -4256,7 +4257,7 @@
#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) {+ if (!rc->is_src_frame_alt_ref && (q > cpi->twopass.active_worst_quality)) {cpi->twopass.active_worst_quality = q;
} else if (oxcf->vbr_corpus_complexity && q == q_low &&
rc->projected_frame_size < rc->this_frame_target) {