Merge "Allow q adjustment for VPX_CQ and VPX_CBR."

This commit is contained in:
paulwilkins
2015-03-10 10:45:02 -07:00
committed by Gerrit Code Review
2 changed files with 5 additions and 3 deletions

View File

@@ -1050,7 +1050,7 @@ static int rc_pick_q_and_bounds_two_pass(const VP9_COMP *cpi,
// Extension to max or min Q if undershoot or overshoot is outside
// the permitted range.
if ((cpi->oxcf.rc_mode == VPX_VBR) &&
if ((cpi->oxcf.rc_mode != VPX_Q) &&
(cpi->twopass.gf_zeromotion_pct < VLOW_MOTION_THRESHOLD)) {
if (frame_is_intra_only(cm) ||
(!rc->is_src_frame_alt_ref &&