commit dcb3cff52822b6a5d9fd872bdb37383025644bd7
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Thu Nov 09 15:58:33 2017 +0000
committer Debargha Mukherjee <debargha@google.com> Tue Nov 14 18:12:03 2017 +0000
tree a4c46ab7ae7f05d1a40c60de7b358d0d9cde651e
parent dfcbfbd436ad66d5102508a50563e7331d72c60e

Don't send chroma data in monochrome mode

This is still a rather inefficient black+white encoder, since it carefully
computes some chroma data, but just doesn't write it. However, at least the
bitstream is now monochrome.

Change-Id: Ie8a89bf329e7b41441032fb0d9e9011385bc12ff

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 649bfb0..e57d3d3 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -845,8 +845,8 @@
   aom_free(cpi->tile_tok[0][0]);
 
   {
-    unsigned int tokens =
-        get_token_alloc(cm->mb_rows, cm->mb_cols, MAX_SB_SIZE_LOG2);
+    unsigned int tokens = get_token_alloc(cm->mb_rows, cm->mb_cols,
+                                          MAX_SB_SIZE_LOG2, av1_num_planes(cm));
     CHECK_MEM_ERROR(cm, cpi->tile_tok[0][0],
                     aom_calloc(tokens, sizeof(*cpi->tile_tok[0][0])));
   }
@@ -5499,7 +5499,7 @@
 #endif  // CONFIG_EXT_TILE
 
 #if CONFIG_MONO_VIDEO
-  cm->monochrome = oxcf->monochrome;
+  cm->seq_params.monochrome = oxcf->monochrome;
 #endif  // CONFIG_MONO_VIDEO
 
 #if CONFIG_XIPHRC