Strengthened film grain setting.

This patch increases the preference for maintaining similar variance
between source and reconstruction and thus helps improve film grain
retention.

The changes are only active when film mode is selected

Change-Id: I3bc082dca678a0f32ec00f30f5d90d0f95ca2381

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index c4eefa8..5fc3b7c 100644 (file)
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2999,8 +2999,8 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *rd_cost,
 // on the relative variance of the source and reconstruction.
 #define VERY_LOW_VAR_THRESH 2
 #define LOW_VAR_THRESH 5
-#define VAR_MULT 100
-static unsigned int max_var_adjust[VP9E_CONTENT_INVALID] = { 16, 16, 100 };
+#define VAR_MULT 250
+static unsigned int max_var_adjust[VP9E_CONTENT_INVALID] = { 16, 16, 250 };
 
 static void rd_variance_adjustment(VP9_COMP *cpi, MACROBLOCK *x,
                                    BLOCK_SIZE bsize, int64_t *this_rd,