commit 0c294fab95f412c47d5597708755e2b3f394b616
author Andrey Norkin <anorkin@netflix.com> Fri Feb 16 18:32:12 2018 -0800
committer Andrey Norkin <anorkin@netflix.com> Tue Feb 20 19:02:56 2018 +0000
tree aba932e8060fd115ec26dab778b975ea4e8b0d47
parent fa904a09c9012dfaed509c2aa28514b80dc6e980

[NORMATIVE] Film grain bug fixes

BUG=aomedia:1348
BUG=aomedia:1347
BUG=aomedia:1345

Change-Id: Ibe94d826b06e44e4ffad5a6ddc24f962b889ae17

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index cef70e2..dff1983 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3361,7 +3361,10 @@
 
   aom_wb_write_bit(wb, pars->chroma_scaling_from_luma);
 
-  if (!pars->chroma_scaling_from_luma) {
+  if (pars->chroma_scaling_from_luma) {
+    assert(pars->num_cb_points == 0);
+    assert(pars->num_cr_points == 0);
+  } else {
     aom_wb_write_literal(wb, pars->num_cb_points, 4);  // max 10
     for (int i = 0; i < pars->num_cb_points; i++) {
       aom_wb_write_literal(wb, pars->scaling_points_cb[i][0], 8);