shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Clamp for min_frame_target"

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

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

@@ -211,17 +211,15 @@

   const RATE_CONTROL *rc = &cpi->rc;

   const VP9EncoderConfig *oxcf = &cpi->oxcf;

-  if (cpi->oxcf.pass != 2) {

-    const int min_frame_target =

-        VPXMAX(rc->min_frame_bandwidth, rc->avg_frame_bandwidth >> 5);

-    if (target < min_frame_target) target = min_frame_target;

-    if (cpi->refresh_golden_frame && rc->is_src_frame_alt_ref) {

-      // If there is an active ARF at this location use the minimum

-      // bits on this frame even if it is a constructed arf.

-      // The active maximum quantizer insures that an appropriate

-      // number of bits will be spent if needed for constructed ARFs.

-      target = min_frame_target;

-    }

+  const int min_frame_target =

+      VPXMAX(rc->min_frame_bandwidth, rc->avg_frame_bandwidth >> 5);

+  if (target < min_frame_target) target = min_frame_target;

+  if (cpi->refresh_golden_frame && rc->is_src_frame_alt_ref) {

+    // If there is an active ARF at this location use the minimum

+    // bits on this frame even if it is a constructed arf.

+    // The active maximum quantizer insures that an appropriate

+    // number of bits will be spent if needed for constructed ARFs.

+    target = min_frame_target;

   }

   // Clip the frame target to the maximum allowed value.