commit 7eedd6e8293a884a9538c3604af846eb2224c0c7
author Jonathan Matthews <jonathan.matthews@argondesign.com> Fri Feb 02 16:26:12 2018 +0000
committer Imdad Sardharwalla <imdad.sardharwalla@argondesign.com> Mon Feb 12 10:21:14 2018 +0000
tree 48ef2bce54f780d978e1b59f8ee5d92a950b9bee
parent 1a3dd3bc79a1ba4216a242c810af4aa7e6115813

Bug fix read_palette_mode_info() for mono video

read_palette_mode_info() shouldn't read luma palette info in monochrome mode.

BUG=aomedia:1311

Change-Id: I86f479beac41a3b8725926086f3d21605a003088

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 8e7a771..db320e6 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -732,6 +732,7 @@
 
 static void read_palette_mode_info(AV1_COMMON *const cm, MACROBLOCKD *const xd,
                                    int mi_row, int mi_col, aom_reader *r) {
+  const int num_planes = av1_num_planes(cm);
   MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
   const BLOCK_SIZE bsize = mbmi->sb_type;
   assert(av1_allow_palette(cm->allow_screen_content_tools, bsize));
@@ -751,7 +752,7 @@
       read_palette_colors_y(xd, cm->bit_depth, pmi, r);
     }
   }
-  if (mbmi->uv_mode == UV_DC_PRED &&
+  if (num_planes > 1 && mbmi->uv_mode == UV_DC_PRED &&
       is_chroma_reference(mi_row, mi_col, bsize, xd->plane[1].subsampling_x,
                           xd->plane[1].subsampling_y)) {
     const int palette_uv_mode_ctx = (pmi->palette_size[0] > 0);