shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Rate control fix for CBR mode."

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

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

@@ -620,8 +620,14 @@

        !(cpi->refresh_alt_ref_frame || cpi->refresh_golden_frame)) &&

       (cpi->rc.rc_1_frame * cpi->rc.rc_2_frame == -1) &&

       cpi->rc.q_1_frame != cpi->rc.q_2_frame) {

-    q = clamp(q, VPXMIN(cpi->rc.q_1_frame, cpi->rc.q_2_frame),

-              VPXMAX(cpi->rc.q_1_frame, cpi->rc.q_2_frame));

+    int qclamp = clamp(q, VPXMIN(cpi->rc.q_1_frame, cpi->rc.q_2_frame),

+                       VPXMAX(cpi->rc.q_1_frame, cpi->rc.q_2_frame));

+    // If the previous had overshoot and the current q needs to increase above

+    // the clamped value, reduce the clamp for faster reaction to overshoot.

+    if (cpi->rc.rc_1_frame == -1 && q > qclamp)

+      q = (q + qclamp) >> 1;

+    else

+      q = qclamp;

   }

   return q;

 }