shithub: libvpx

Info  •  Files  •  Log  •  Branches

Added stricter Q control flag.

Added a variant of the one shot maxQ flag
for two pass that forces a fixed Q for the
normal inter frames. Disabled by default.
Also small adjustment to the Bits per MB
estimation.
Change-Id: I87efdfb2d094fe1340ca9ddae37470d7b278c8b8

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

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

@@ -2751,7 +2751,15 @@

         cpi->active_best_quality * 15 / 16;

     }

   } else {

+#ifdef ONE_SHOT_Q_ESTIMATE

+#ifdef STRICT_ONE_SHOT_Q

+    cpi->active_best_quality = Q;

+#else

     cpi->active_best_quality = inter_minq[Q];

+#endif

+#else

+    cpi->active_best_quality = inter_minq[Q];

+#endif

     // For the constant/constrained quality mode we dont want

     // q to fall below the cq level.

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

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

@@ -31,6 +31,7 @@

 // Experimental rate control switches

 // #define ONE_SHOT_Q_ESTIMATE 1

+// #define STRICT_ONE_SHOT_Q 1

 // #define DISABLE_RC_LONG_TERM_MEM 1

 // #define SPEEDSTATS 1

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

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

@@ -120,10 +120,13 @@

   double q = vp9_convert_qindex_to_q(qindex);

   if (frame_type == KEY_FRAME) {

-    enumerator = 4500000;

+    enumerator = 4000000;

   } else {

-    enumerator = 2850000;

+    enumerator = 2500000;

   }

+

+  // Q based adjustment to baseline enumberator

+  enumerator += (int)(enumerator * q) >> 12;

   return (int)(0.5 + (enumerator * correction_factor / q));

 }