commit c0ea2588d11ac0cb73ef90cd076e2dd194b11930
author Yaowu Xu <yaowu@google.com> Tue Jan 15 10:17:16 2019 -0800
committer Yaowu Xu <yaowu@google.com> Wed Jan 16 19:37:32 2019 +0000
tree 353e7acc87f1e00675184f1db7c874922ff8ce03
parent 88cd1669f266e41904b7381b3a679a464a0bc9f5

filmgrain: clear chroma parameters for monochrome

BUG=aomedia:2296

Change-Id: I9daa6007ddcc488fd7892a061ead2217c1eed7b0

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 4fc26d9..a0559e0 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -535,6 +535,19 @@
                   aom_calloc(mi_size, sizeof(*cpi->mbmi_ext_base)));
 }
 
+static void reset_film_grain_chroma_params(aom_film_grain_t *pars) {
+  pars->num_cr_points = 0;
+  pars->cr_mult = 0;
+  pars->cr_luma_mult = 0;
+  memset(pars->scaling_points_cr, 0, sizeof(pars->scaling_points_cr));
+  memset(pars->ar_coeffs_cr, 0, sizeof(pars->ar_coeffs_cr));
+  pars->num_cb_points = 0;
+  pars->cb_mult = 0;
+  pars->cb_luma_mult = 0;
+  memset(pars->scaling_points_cb, 0, sizeof(pars->scaling_points_cb));
+  memset(pars->ar_coeffs_cb, 0, sizeof(pars->ar_coeffs_cb));
+}
+
 static void update_film_grain_parameters(struct AV1_COMP *cpi,
                                          const AV1EncoderConfig *oxcf) {
   AV1_COMMON *const cm = &cpi->common;
@@ -552,7 +565,8 @@
       memcpy(&cm->film_grain_params,
              film_grain_test_vectors + oxcf->film_grain_test_vector - 1,
              sizeof(cm->film_grain_params));
-
+      if (oxcf->monochrome)
+        reset_film_grain_chroma_params(&cm->film_grain_params);
       cm->film_grain_params.bit_depth = cm->seq_params.bit_depth;
       if (cm->seq_params.color_range == AOM_CR_FULL_RANGE) {
         cm->film_grain_params.clip_to_restricted_range = 0;