shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Adjustment to prediction decay."

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

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

@@ -65,8 +65,8 @@

 #define NCOUNT_INTRA_THRESH 8192

 #define NCOUNT_INTRA_FACTOR 3

-#define NCOUNT_FRAME_II_THRESH 5.0

+

 #define DOUBLE_DIVIDE_CHECK(x) ((x) < 0 ? (x) - 0.000001 : (x) + 0.000001)

 #if ARF_STATS_OUTPUT

@@ -1415,6 +1415,8 @@

 #define DEFAULT_DECAY_LIMIT 0.75

 #define LOW_SR_DIFF_TRHESH 0.1

 #define SR_DIFF_MAX 128.0

+#define LOW_CODED_ERR_PER_MB 10.0

+#define NCOUNT_FRAME_II_THRESH 6.0

 static double get_sr_decay_rate(const VP9_COMP *cpi,

                                 const FIRSTPASS_STATS *frame) {

@@ -1431,8 +1433,9 @@

        (cpi->initial_height + cpi->initial_width));

   modified_pct_inter = frame->pcnt_inter;

-  if ((frame->intra_error / DOUBLE_DIVIDE_CHECK(frame->coded_error)) <

-      (double)NCOUNT_FRAME_II_THRESH) {

+  if (((frame->coded_error / num_mbs) > LOW_CODED_ERR_PER_MB) &&

+      ((frame->intra_error / DOUBLE_DIVIDE_CHECK(frame->coded_error)) <

+       (double)NCOUNT_FRAME_II_THRESH)) {

     modified_pct_inter = frame->pcnt_inter - frame->pcnt_neutral;

   }

   modified_pcnt_intra = 100 * (1.0 - modified_pct_inter);