generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Allow q adjustment for VPX_CQ and VPX_CBR."

Browse Source
This commit is contained in:
paulwilkins
2015-03-10 10:45:02 -07:00
committed by Gerrit Code Review
parent 78df712216 2cff9c4efe
commit 4b01a2d350
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_firstpass.c
View File

@@ -2621,11 +2621,13 @@ void vp9_twopass_postencode_update(VP9_COMP *cpi) {
++twopass->gf_group.index; ++twopass->gf_group.index;
// If the rate control is drifting consider adjustment to min or maxq. // If the rate control is drifting consider adjustment to min or maxq.
if ((cpi->oxcf.rc_mode == VPX_VBR) && if ((cpi->oxcf.rc_mode != VPX_Q) &&
(cpi->twopass.gf_zeromotion_pct < VLOW_MOTION_THRESHOLD) && (cpi->twopass.gf_zeromotion_pct < VLOW_MOTION_THRESHOLD) &&
!cpi->rc.is_src_frame_alt_ref) { !cpi->rc.is_src_frame_alt_ref) {
const int maxq_adj_limit = const int maxq_adj_limit =
rc->worst_quality - twopass->active_worst_quality; rc->worst_quality - twopass->active_worst_quality;
const int minq_adj_limit =
(cpi->oxcf.rc_mode == VPX_CQ) ? 0 : MINQ_ADJ_LIMIT;
// Undershoot. // Undershoot.
if (rc->rate_error_estimate > cpi->oxcf.under_shoot_pct) { if (rc->rate_error_estimate > cpi->oxcf.under_shoot_pct) {
@@ -2650,7 +2652,7 @@ void vp9_twopass_postencode_update(VP9_COMP *cpi) {
--twopass->extend_maxq; --twopass->extend_maxq;
} }
twopass->extend_minq = clamp(twopass->extend_minq, 0, MINQ_ADJ_LIMIT); twopass->extend_minq = clamp(twopass->extend_minq, 0, minq_adj_limit);
twopass->extend_maxq = clamp(twopass->extend_maxq, 0, maxq_adj_limit); twopass->extend_maxq = clamp(twopass->extend_maxq, 0, maxq_adj_limit);
} }
} }

2
vp9/encoder/vp9_ratectrl.c
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 // Extension to max or min Q if undershoot or overshoot is outside
// the permitted range. // 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)) { (cpi->twopass.gf_zeromotion_pct < VLOW_MOTION_THRESHOLD)) {
if (frame_is_intra_only(cm) || if (frame_is_intra_only(cm) ||
(!rc->is_src_frame_alt_ref && (!rc->is_src_frame_alt_ref &&