commit 626a1b2a8063de64dbefc121aec51287fa3acc4a
author Andrey Norkin <anorkin@netflix.com> Fri Mar 23 21:47:17 2018 -0700
committer Yaowu Xu <yaowu@google.com> Sat Mar 24 23:09:40 2018 +0000
tree 336c93be74226c080eeabcbd354714743f5adb45
parent c8b52d519b57ba929cd4501e1773def8032008df

[NORMATIVE] Film grain combinations constraints for 4:2:0

BUG=aomedia:1626

Change-Id: Icab515f7c1506c63622ee88e3f5bbbdeab533f55

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index b76e453..973361a 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2093,7 +2093,9 @@
   if (!cm->seq_params.monochrome)
     pars->chroma_scaling_from_luma = aom_rb_read_bit(rb);
 
-  if (cm->seq_params.monochrome || pars->chroma_scaling_from_luma) {
+  if (cm->seq_params.monochrome || pars->chroma_scaling_from_luma ||
+      ((cm->subsampling_x == 1) && (cm->subsampling_y == 1) &&
+       (pars->num_y_points == 0))) {
     pars->num_cb_points = 0;
     pars->num_cr_points = 0;
   } else {
@@ -2126,6 +2128,13 @@
                            "shall be increasing.");
       pars->scaling_points_cr[i][1] = aom_rb_read_literal(rb, 8);
     }
+
+    if ((cm->subsampling_x == 1) && (cm->subsampling_y == 1) &&
+        (((pars->num_cb_points == 0) && (pars->num_cr_points != 0)) ||
+         ((pars->num_cb_points != 0) && (pars->num_cr_points == 0))))
+      aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                         "In YCbCr 4:2:0, film grain shall be applied "
+                         "to both chroma components or neither.");
   }
 
   pars->scaling_shift = aom_rb_read_literal(rb, 2) + 8;  // 8 + value