Reset filter-intra flag when intrabc is on

Change-Id: I19c49e5a5f0df0d767f156dcf006e5bf105bf6a0

Reset filter-intra flag when intrabc is on
Change-Id: I19c49e5a5f0df0d767f156dcf006e5bf105bf6a0
8ea6e5bf · Hui Su · Yaowu Xu · c9fd4732 · 8ea6e5bf
Commit 8ea6e5bf authored Feb 19, 2018 by Hui Su Committed by Yaowu Xu Feb 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

av1/encoder/rdopt.c av1/encoder/rdopt.c +3 -0

No files found.
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8892,6 +8892,9 @@ static int64_t rd_pick_intrabc_mode_sb(const AV1_COMP *cpi, MACROBLOCK *x,
    assert((dv.col & 7) == 0);
    assert((dv.row & 7) == 0);
    memset(&mbmi->palette_mode_info, 0, sizeof(mbmi->palette_mode_info));
+#if CONFIG_FILTER_INTRA
+    mbmi->filter_intra_mode_info.use_filter_intra = 0;
+#endif  // CONFIG_FILTER_INTRA
    mbmi->use_intrabc = 1;
    mbmi->mode = DC_PRED;
    mbmi->uv_mode = UV_DC_PRED;