commit e52676970e534c00079352a6d77de5484b478ff2
author Debargha Mukherjee <debargha@google.com> Tue Jan 16 09:41:15 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Tue Jan 16 21:19:23 2018 +0000
tree dec37c607fab48c4ff2c0c1ff2c4bd32820204b9
parent 5f0485b4d77b010027f073c89b5682402151428b

Rearrange the colorspace/mono deocde logic a bit

Change-Id: I0d76adba7c5ea387a9c58076369d1eba89b0fbfe

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 41b7c9d..bd89081 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3282,6 +3282,9 @@
   if (!is_monochrome) aom_wb_write_literal(wb, cm->color_space, 4);
 #endif  // CONFIG_COLORSPACE_HEADERS
 #endif  // CONFIG_CICP
+#if CONFIG_MONO_VIDEO
+  if (is_monochrome) return;
+#endif  // CONFIG_MONO_VIDEO
 #if CONFIG_CICP
   if (cm->color_primaries == AOM_CICP_CP_BT_709 &&
       cm->transfer_characteristics == AOM_CICP_TC_SRGB &&
@@ -3294,10 +3297,6 @@
     assert(cm->subsampling_x == 0 && cm->subsampling_y == 0);
     assert(cm->profile == PROFILE_1 ||
            (cm->profile == PROFILE_2 && cm->bit_depth == AOM_BITS_12));
-#if CONFIG_MONO_VIDEO
-  } else if (is_monochrome) {
-    return;
-#endif  // CONFIG_MONO_VIDEO
   } else {
     // 0: [16, 235] (i.e. xvYCC), 1: [0, 255]
     aom_wb_write_bit(wb, cm->color_range);