Commit d6c17d98 authored by Jingning Han's avatar Jingning Han
Browse files

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
parent 31eb3ab5
......@@ -974,7 +974,11 @@ static void read_intra_frame_mode_info(AV1_COMMON *const cm,
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);
......
......@@ -9151,7 +9151,11 @@ static int64_t rd_pick_intrabc_mode_sb(const AV1_COMP *cpi, MACROBLOCK *x,
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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment