shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Enforce max-intra-pct in one-pass cbr mode"

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

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

@@ -1338,9 +1338,10 @@

 static int calc_iframe_target_size_one_pass_cbr(const VP9_COMP *cpi) {

   const RATE_CONTROL *rc = &cpi->rc;

+  int target;

   if (cpi->common.current_video_frame == 0) {

-    return ((cpi->oxcf.starting_buffer_level / 2) > INT_MAX)

+    target = ((cpi->oxcf.starting_buffer_level / 2) > INT_MAX)

       ? INT_MAX : (int)(cpi->oxcf.starting_buffer_level / 2);

   } else {

     const int initial_boost = 32;

@@ -1349,8 +1350,9 @@

       kf_boost = (int)(kf_boost * rc->frames_since_key /

                        (cpi->output_framerate / 2));

     }

-    return ((16 + kf_boost) * rc->av_per_frame_bandwidth) >> 4;

+    target = ((16 + kf_boost) * rc->av_per_frame_bandwidth) >> 4;

   }

+  return vp9_rc_clamp_iframe_target_size(cpi, target);

 }

 void vp9_rc_get_svc_params(VP9_COMP *cpi) {

-- 

⑨