commit b0571874d58dca0986aeb0aaf37fdef48918897d
author Yue Chen <yuec@google.com> Mon Dec 18 18:12:59 2017 -0800
committer Yue Chen <yuec@google.com> Tue Dec 19 18:21:02 2017 +0000
tree a5bc2767f041eab89bab3f57f3e5f7375c137e79
parent e2d8f1835915f54bcc14386f56280e1a16c6633c

Remove filter_intra mode info for UV plane

Change-Id: I92f73b78dfd0e25a61897e8b6e9e28ff210376d5

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 3aedcdb..9f596c1 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -813,11 +813,11 @@
                                          aom_writer *w) {
   if (mbmi->mode == DC_PRED && mbmi->palette_mode_info.palette_size[0] == 0 &&
       av1_filter_intra_allowed_txsize(mbmi->tx_size)) {
-    aom_write_symbol(w, mbmi->filter_intra_mode_info.use_filter_intra_mode[0],
+    aom_write_symbol(w, mbmi->filter_intra_mode_info.use_filter_intra,
                      xd->tile_ctx->filter_intra_cdfs[mbmi->tx_size], 2);
-    if (mbmi->filter_intra_mode_info.use_filter_intra_mode[0]) {
+    if (mbmi->filter_intra_mode_info.use_filter_intra) {
       const FILTER_INTRA_MODE mode =
-          mbmi->filter_intra_mode_info.filter_intra_mode[0];
+          mbmi->filter_intra_mode_info.filter_intra_mode;
       aom_write_symbol(w, mode, xd->tile_ctx->filter_intra_mode_cdf[0],
                        FILTER_INTRA_MODES);
     }
@@ -1118,9 +1118,9 @@
       } else if (ALLOW_INTRA_EXT_TX) {
 #if CONFIG_FILTER_INTRA
         PREDICTION_MODE intra_dir;
-        if (mbmi->filter_intra_mode_info.use_filter_intra_mode[0])
+        if (mbmi->filter_intra_mode_info.use_filter_intra)
           intra_dir = fimode_to_intradir[mbmi->filter_intra_mode_info
-                                             .filter_intra_mode[0]];
+                                             .filter_intra_mode];
         else
           intra_dir = mbmi->mode;
         aom_write_symbol(