shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Revert "Prevent double application of min rate in two pass.""

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

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

@@ -47,6 +47,8 @@

 #define MIN_BPB_FACTOR 0.005

 #define MAX_BPB_FACTOR 50

+#define FRAME_OVERHEAD_BITS 200

+

 #if CONFIG_VP9_HIGHBITDEPTH

 #define ASSIGN_MINQ_TABLE(bit_depth, name)       \

   do {                                           \

@@ -210,23 +212,18 @@

 int vp9_rc_clamp_pframe_target_size(const VP9_COMP *const cpi, int target) {

   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.

   if (target > rc->max_frame_bandwidth) target = rc->max_frame_bandwidth;

-

   if (oxcf->rc_max_inter_bitrate_pct) {

     const int max_rate =

         rc->avg_frame_bandwidth * oxcf->rc_max_inter_bitrate_pct / 100;

--- a/vp9/encoder/vp9_ratectrl.h

+++ b/vp9/encoder/vp9_ratectrl.h

@@ -32,8 +32,6 @@

 #define FIXED_GF_INTERVAL 8  // Used in some testing modes only

 #define ONEHALFONLY_RESIZE 0

-#define FRAME_OVERHEAD_BITS 200

-

 // Threshold used to define a KF group as static (e.g. a slide show).

 // Essentially this means that no frame in the group has more than 1% of MBs

 // that are not marked as coded with 0,0 motion in the first pass.