commit eaddeee1ff0351d54b2659982639ea60fcfe02a9
author hui su <huisu@google.com> Tue May 30 12:19:38 2017 -0700
committer Urvang Joshi <urvang@google.com> Thu Jun 01 18:03:36 2017 +0000
tree 161560f3d1d5addfbf539bedb85208bb2eeea8cb
parent b4ed1493fc2da3fc32c5e7d1749abe6fefb4a6dc

Initialize chroma mode info before RD search

Make sure initialization is done regardless of whether RD search
is skipped (skip_chroma_rd).

BUG=aomedia:568

Change-Id: Idb620b34be6930bb35ab6c912dfd4777f7614159

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index dc7d7bf..962c4c6 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3676,7 +3676,6 @@
 #endif  // CONFIG_FILTER_INTRA
 #if CONFIG_PALETTE
   pmi->palette_size[0] = 0;
-  pmi->palette_size[1] = 0;
   if (above_mi)
     palette_y_mode_ctx +=
         (above_mi->mbmi.palette_mode_info.palette_size[0] > 0);
@@ -4859,6 +4858,16 @@
 }
 #endif  // CONFIG_EXT_INTRA
 
+static void init_sbuv_mode(MB_MODE_INFO *const mbmi) {
+  mbmi->uv_mode = DC_PRED;
+#if CONFIG_PALETTE
+  mbmi->palette_mode_info.palette_size[1] = 0;
+#endif  // CONFIG_PALETTE
+#if CONFIG_FILTER_INTRA
+  mbmi->filter_intra_mode_info.use_filter_intra_mode[1] = 0;
+#endif  // CONFIG_FILTER_INTRA
+}
+
 static int64_t rd_pick_intra_sbuv_mode(const AV1_COMP *const cpi, MACROBLOCK *x,
                                        int *rate, int *rate_tokenonly,
                                        int64_t *distortion, int *skippable,
@@ -4880,12 +4889,6 @@
   uint8_t *best_palette_color_map = NULL;
 #endif  // CONFIG_PALETTE
 
-#if CONFIG_FILTER_INTRA
-  mbmi->filter_intra_mode_info.use_filter_intra_mode[1] = 0;
-#endif  // CONFIG_FILTER_INTRA
-#if CONFIG_PALETTE
-  pmi->palette_size[1] = 0;
-#endif  // CONFIG_PALETTE
   for (mode = DC_PRED; mode <= TM_PRED; ++mode) {
 #if CONFIG_EXT_INTRA
     const int is_directional_mode =
@@ -4982,6 +4985,7 @@
   // Use an estimated rd for uv_intra based on DC_PRED if the
   // appropriate speed flag is set.
   (void)ctx;
+  init_sbuv_mode(&x->e_mbd.mi[0]->mbmi);
 #if CONFIG_CB4X4
 #if CONFIG_CHROMA_2X2
   rd_pick_intra_sbuv_mode(cpi, x, rate_uv, rate_uv_tokenonly, dist_uv, skip_uv,
@@ -9475,7 +9479,7 @@
   if (intra_yrd < best_rd) {
     max_uv_tx_size = uv_txsize_lookup[bsize][xd->mi[0]->mbmi.tx_size]
                                      [pd[1].subsampling_x][pd[1].subsampling_y];
-
+    init_sbuv_mode(&xd->mi[0]->mbmi);
 #if CONFIG_CB4X4
 #if !CONFIG_CHROMA_2X2
     max_uv_tx_size = AOMMAX(max_uv_tx_size, TX_4X4);