shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Modified no memory rate control."

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -1743,7 +1743,7 @@

   vp9_zero(cpi->y_uv_mode_count);

 #ifdef MODE_TEST_HIT_STATS

-  vp9_zero(cpi->mode_test_hits)

+  vp9_zero(cpi->mode_test_hits);

 #endif

   return (VP9_PTR) cpi;

@@ -3295,8 +3295,9 @@

   cpi->total_byte_count += (*size);

   cpi->projected_frame_size = (*size) << 3;

+  // Post encode loop adjustment of Q prediction.

   if (!active_worst_qchanged)

-    vp9_update_rate_correction_factors(cpi, 2);

+    vp9_update_rate_correction_factors(cpi, (cpi->sf.recode_loop) ? 2 : 0);

   cpi->last_q[cm->frame_type] = cm->base_qindex;

@@ -3371,6 +3372,7 @@

   cpi->buffer_level = cpi->bits_off_target;

+#ifndef DISABLE_RC_LONG_TERM_MEM

   // Update bits left to the kf and gf groups to account for overshoot or

   // undershoot on these frames

   if (cm->frame_type == KEY_FRAME) {

@@ -3384,6 +3386,7 @@

     cpi->twopass.gf_group_bits = MAX(cpi->twopass.gf_group_bits, 0);

   }

+#endif

 #if 0

   output_frame_level_debug_stats(cpi);

--- a/vp9/encoder/vp9_onyx_int.h

+++ b/vp9/encoder/vp9_onyx_int.h

@@ -33,8 +33,8 @@

 #if CONFIG_ONESHOTQ

 #define ONE_SHOT_Q_ESTIMATE 0

 #define STRICT_ONE_SHOT_Q 0

-#define DISABLE_RC_LONG_TERM_MEM 0

 #endif

+#define DISABLE_RC_LONG_TERM_MEM 0

 // #define MODE_TEST_HIT_STATS

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

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

@@ -288,7 +288,7 @@

   if (correction_factor > 102) {

     // We are not already at the worst allowable quality

     correction_factor =

-        (int)(100.5 + ((correction_factor - 100) * adjustment_limit));

+        (int)(100 + ((correction_factor - 100) * adjustment_limit));

     rate_correction_factor =

         ((rate_correction_factor * correction_factor) / 100);

@@ -298,7 +298,7 @@

   } else if (correction_factor < 99) {

     // We are not already at the best allowable quality

     correction_factor =

-        (int)(100.5 - ((100 - correction_factor) * adjustment_limit));

+        (int)(100 - ((100 - correction_factor) * adjustment_limit));

     rate_correction_factor =

         ((rate_correction_factor * correction_factor) / 100);