shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Increase the bits allocated to key frame"

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

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

@@ -2929,6 +2929,7 @@

   FIRSTPASS_STATS next_frame;

   FIRSTPASS_STATS last_frame;

   int kf_bits = 0;

+  int64_t max_kf_bits;

   double decay_accumulator = 1.0;

   double zero_motion_accumulator = 1.0;

   double zero_motion_sum = 0.0;

@@ -3179,6 +3180,13 @@

   // Work out how many bits to allocate for the key frame itself.

   kf_bits = calculate_boost_bits((rc->frames_to_key - 1), rc->kf_boost,

                                  twopass->kf_group_bits);

+  // Based on the spatial complexity, increase the bits allocated to key frame.

+  kf_bits +=

+      (int)((twopass->kf_group_bits - kf_bits) * (kf_mod_err / kf_group_err));

+  max_kf_bits =

+      twopass->kf_group_bits - (rc->frames_to_key - 1) * FRAME_OVERHEAD_BITS;

+  max_kf_bits = lclamp(max_kf_bits, 0, INT_MAX);

+  kf_bits = VPXMIN(kf_bits, (int)max_kf_bits);

   twopass->kf_group_bits -= kf_bits;

--- a/vpx_dsp/vpx_dsp_common.h

+++ b/vpx_dsp/vpx_dsp_common.h

@@ -57,6 +57,10 @@

   return value < low ? low : (value > high ? high : value);

 }

+static INLINE int64_t lclamp(int64_t value, int64_t low, int64_t high) {

+  return value < low ? low : (value > high ? high : value);

+}

+

 static INLINE uint16_t clip_pixel_highbd(int val, int bd) {

   switch (bd) {

     case 8: