commit d6c17d98300b25a2ff0b1d5604a4e8101376ac9d
author Jingning Han <jingning@google.com> Mon Apr 24 16:33:12 2017 -0700
committer Jingning Han <jingning@google.com> Tue Apr 25 18:22:05 2017 +0000
tree 21acc4a9a1c78c565f2cf0fedf0260b4f44e5c1d
parent 31eb3ab5934cab5a3eb226cc2c033abfa7f09162

Resolve compiling error due to dual-filter and intrabc

Initialize the inter filter type array in intrabc mode when
dual filter is turned on. This resolves a compiling error when
both experiments are turned on.

Change-Id: Ic4d4f712f83a73029a4a24c7e9284ff9fc9baf3c

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 69325fa..7c6e527 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -974,7 +974,11 @@
     if (mbmi->use_intrabc) {
       int_mv dv_ref;
       mbmi->mode = mbmi->uv_mode = DC_PRED;
+#if CONFIG_DUAL_FILTER
+      for (int idx = 0; idx < 4; ++idx) mbmi->interp_filter[idx] = BILINEAR;
+#else
       mbmi->interp_filter = BILINEAR;
+#endif
       av1_find_ref_dv(&dv_ref, mi_row, mi_col);
       xd->corrupted |=
           !assign_dv(cm, xd, &mbmi->mv[0], &dv_ref, mi_row, mi_col, bsize, r);

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index bda9cff..ec935f1 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9151,7 +9151,11 @@
       mbmi->uv_mode = DC_PRED;
       mbmi->mv[0].as_mv.row = -MAX_SB_SIZE * 8;
       mbmi->mv[0].as_mv.col = 0;
+#if CONFIG_DUAL_FILTER
+      for (int idx = 0; idx < 4; ++idx) mbmi->interp_filter[idx] = BILINEAR;
+#else
       mbmi->interp_filter = BILINEAR;
+#endif
       mbmi->skip = 1;
       x->skip = 1;
       const int mi_row = -xd->mb_to_top_edge / (8 * MI_SIZE);