ref: 70bdf643d09242bd50f47e415664f2927715ee9d
parent: 8700eed4c628e368cc5107057a24f2b23df2ed8e
parent: 0c60db7def133eb93e9479480f7a019fc6386de0
author: Marco Paniconi <[email protected]>
date: Wed May 11 18:15:24 EDT 2016
Merge "vp9: Fix to quality regression issue for 1 pass."
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -953,11 +953,10 @@
FIXED_GF_INTERVAL], cm->bit_depth);
active_best_quality = VPXMAX(qindex + delta_qindex, rc->best_quality);
} else {
- // Use the min of the average Q (with some increase) and
- // active_worst_quality as basis for active_best.
+ // Use the min of the average Q and active_worst_quality as basis for
+ // active_best.
if (cm->current_video_frame > 1) {
- q = VPXMIN(((17 * rc->avg_frame_qindex[INTER_FRAME]) >> 4),
- active_worst_quality);
+ q = VPXMIN(rc->avg_frame_qindex[INTER_FRAME], active_worst_quality);
active_best_quality = inter_minq[q];
} else {
active_best_quality = inter_minq[rc->avg_frame_qindex[KEY_FRAME]];