shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Bug in clamping of base_frame_target."

--- a/vp9/encoder/vp9_firstpass.c

+++ b/vp9/encoder/vp9_firstpass.c

@@ -1183,10 +1183,13 @@

                                      double group_weight_factor) {

   const RATE_CONTROL *const rc = &cpi->rc;

   const VP9EncoderConfig *const oxcf = &cpi->oxcf;

+  // Clamp the target rate to VBR min / max limts.

+  const int target_rate =

+      vp9_rc_clamp_pframe_target_size(cpi, section_target_bandwidth);

   inactive_zone = fclamp(inactive_zone, 0.0, 1.0);

-  if (section_target_bandwidth <= 0) {

+  if (target_rate <= 0) {

     return rc->worst_quality;  // Highest value allowed

   } else {

     const int num_mbs = (cpi->oxcf.resize_mode != RESIZE_NONE)

@@ -1195,7 +1198,7 @@

     const double av_err_per_mb = section_err / active_mbs;

     const double speed_term = 1.0 + 0.04 * oxcf->speed;

     const double ediv_size_correction = (double)num_mbs / EDIV_SIZE_FACTOR;

-    const int target_norm_bits_per_mb = ((uint64_t)section_target_bandwidth <<

+    const int target_norm_bits_per_mb = ((uint64_t)target_rate <<

                                          BPER_MB_NORMBITS) / active_mbs;

     int q;

@@ -2737,11 +2740,6 @@

   }

   target_rate = gf_group->bit_allocation[gf_group->index];

-  if (cpi->common.frame_type == KEY_FRAME)

-    target_rate = vp9_rc_clamp_iframe_target_size(cpi, target_rate);

-  else

-    target_rate = vp9_rc_clamp_pframe_target_size(cpi, target_rate);

-

   rc->base_frame_target = target_rate;

   {

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

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

@@ -1816,6 +1816,11 @@

   RATE_CONTROL *const rc = &cpi->rc;

   int target_rate = rc->base_frame_target;

+  if (cpi->common.frame_type == KEY_FRAME)

+    target_rate = vp9_rc_clamp_iframe_target_size(cpi, target_rate);

+  else

+    target_rate = vp9_rc_clamp_pframe_target_size(cpi, target_rate);

+

   // Correction to rate target based on prior over or under shoot.

   if (cpi->oxcf.rc_mode == VPX_VBR || cpi->oxcf.rc_mode == VPX_CQ)

     vbr_rate_correction(cpi, &target_rate);