Merge "vp9: Fix to quality regression issue for 1 pass."

This commit is contained in:
Marco Paniconi 2016-05-11 22:15:24 +00:00 committed by Gerrit Code Review
commit 70bdf643d0

View File

@ -953,11 +953,10 @@ static int rc_pick_q_and_bounds_one_pass_vbr(const VP9_COMP *cpi,
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]];