summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2015-03-12 11:10:59 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2015-03-12 11:10:59 -0700
commit791bf5657f330cbbd48668bf3924b990e9a820a0 (patch)
tree2448659df1473705cceb79699ef6798b6e350257 /vp9
parent1ff15fbffe35e45251089e86ef258baaa076f2cd (diff)
parent0308e2ee6dbefa7558374b0470d2c3ea17786a04 (diff)
downloadlibvpx-791bf5657f330cbbd48668bf3924b990e9a820a0.tar
libvpx-791bf5657f330cbbd48668bf3924b990e9a820a0.tar.gz
libvpx-791bf5657f330cbbd48668bf3924b990e9a820a0.tar.bz2
libvpx-791bf5657f330cbbd48668bf3924b990e9a820a0.zip
Merge "Some rate control adjustments to control overshoot"
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_ratectrl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 626c6e9af..7783f7bdc 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -756,7 +756,7 @@ static int rc_pick_q_and_bounds_one_pass_cbr(const VP9_COMP *cpi,
static int get_active_cq_level(const RATE_CONTROL *rc,
const VP9EncoderConfig *const oxcf) {
- static const double cq_adjust_threshold = 0.5;
+ static const double cq_adjust_threshold = 0.1;
int active_cq_level = oxcf->cq_level;
if (oxcf->rc_mode == VPX_CQ &&
rc->total_target_bits > 0) {
@@ -1689,7 +1689,7 @@ void vp9_set_target_rate(VP9_COMP *cpi) {
int target_rate = rc->base_frame_target;
// Correction to rate target based on prior over or under shoot.
- if (cpi->oxcf.rc_mode == VPX_VBR)
+ if (cpi->oxcf.rc_mode == VPX_VBR || cpi->oxcf.rc_mode == VPX_CQ)
vbr_rate_correction(cpi, &target_rate, rc->vbr_bits_off_target);
vp9_rc_set_frame_target(cpi, target_rate);
}