commit f340fece2c18f068dc3c0c9219b2e5a5eee7ba79
author Debargha Mukherjee <debargha@google.com> Wed Jan 10 18:12:22 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Thu Jan 11 20:04:17 2018 +0000
tree ff86731f36f26b91ca96190cc9882c15d3638771
parent f9a50ea3d3eb73d295ce11eda10d67862067135c

No colorspace for mono-video f/ CICP compatibility

Change-Id: I03c6cf0b58f9e1d74c7d30d76e846be9a640dab7

aomdec.c

diff --git a/aomdec.c b/aomdec.c
index 76a6618..f2800a3 100644
--- a/aomdec.c
+++ b/aomdec.c
@@ -505,6 +505,7 @@
   int use_y4m = 1;
   int opt_yv12 = 0;
   int opt_i420 = 0;
+  int opt_raw = 0;
   aom_codec_dec_cfg_t cfg = { 0, 0, 0, CONFIG_LOWBITDEPTH };
   unsigned int output_bit_depth = 0;
 #if CONFIG_EXT_TILE
@@ -561,12 +562,19 @@
       use_y4m = 0;
       flipuv = 1;
       opt_yv12 = 1;
+      opt_i420 = 0;
+      opt_raw = 0;
     } else if (arg_match(&arg, &use_i420, argi)) {
       use_y4m = 0;
       flipuv = 0;
+      opt_yv12 = 0;
       opt_i420 = 1;
+      opt_raw = 0;
     } else if (arg_match(&arg, &rawvideo, argi)) {
       use_y4m = 0;
+      opt_yv12 = 0;
+      opt_i420 = 0;
+      opt_raw = 1;
     } else if (arg_match(&arg, &flipuvarg, argi)) {
       flipuv = 1;
     } else if (arg_match(&arg, &noblitarg, argi)) {
@@ -909,10 +917,11 @@
       aom_input_ctx.height = img->d_h;
 #endif  // CONFIG_EXT_TILE
 
-#if CONFIG_MONO_VIDEO && !CONFIG_CICP
-      int num_planes = (!use_y4m && img->cs == AOM_CS_MONOCHROME) ? 1 : 3;
+#if CONFIG_MONO_VIDEO
+      int num_planes = (!use_y4m && opt_raw && img->monochrome) ? 1 : 3;
 #else
       int num_planes = 3;
+      (void)opt_raw;
 #endif
 
       if (single_file) {