shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Some rate control adjustments to control overshoot"

--- a/vp9/encoder/vp9_ratectrl.c

+++ b/vp9/encoder/vp9_ratectrl.c

@@ -756,7 +756,7 @@

 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 @@

   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);

 }