commit 085095dc19e647a1359f92388853de3d95b1a804
author Debargha Mukherjee <debargha@google.com> Fri Mar 30 12:39:56 2018 -0700
committer Debargha Mukherjee <debargha@google.com> Sat Mar 31 06:12:27 2018 +0000
tree 1547aa03985b62cd091d6e13ad6cd7ed76e51072
parent 95612803a87e9e3f6c54a8c17840fcd0b910d4e0

[NORMATIVE] Signal color range for monochorme

BUG=aomedia:1684

Change-Id: Ief0cb209418d37a6e5d895d703ae0f3ca6e96208

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index a6cae4e..3a41311 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2199,7 +2199,8 @@
     cm->matrix_coefficients = AOM_CICP_MC_UNSPECIFIED;
   }
   if (is_monochrome) {
-    cm->color_range = AOM_CR_FULL_RANGE;
+    // [16,235] (including xvycc) vs [0,255] range
+    cm->color_range = aom_rb_read_bit(rb);
     cm->subsampling_y = cm->subsampling_x = 1;
     cm->chroma_sample_position = AOM_CSP_UNKNOWN;
     cm->separate_uv_delta_q = 0;

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index f050c04..67a3ec2 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2446,7 +2446,11 @@
     aom_wb_write_literal(wb, cm->transfer_characteristics, 8);
     aom_wb_write_literal(wb, cm->matrix_coefficients, 8);
   }
-  if (is_monochrome) return;
+  if (is_monochrome) {
+    // 0: [16, 235] (i.e. xvYCC), 1: [0, 255]
+    aom_wb_write_bit(wb, cm->color_range);
+    return;
+  }
   if (cm->color_primaries == AOM_CICP_CP_BT_709 &&
       cm->transfer_characteristics == AOM_CICP_TC_SRGB &&
       cm->matrix_coefficients ==