Commit f4d8c16e authored by Hui Su's avatar Hui Su Committed by Yaowu Xu

Reset mode info before decoding intrabc

Fixes the mismatches reported in the issue tracker.

BUG=aomedia:1328

Change-Id: If60ef1c6cb5c28e21a6d6e71379fe1cb46ab6f0a
parent d6a7dd19
......@@ -1024,6 +1024,11 @@ static void read_intra_frame_mode_info(AV1_COMMON *const cm,
mbmi->ref_frame[0] = INTRA_FRAME;
mbmi->ref_frame[1] = NONE_FRAME;
mbmi->palette_mode_info.palette_size[0] = 0;
mbmi->palette_mode_info.palette_size[1] = 0;
#if CONFIG_FILTER_INTRA
mbmi->filter_intra_mode_info.use_filter_intra = 0;
#endif // CONFIG_FILTER_INTRA
#if CONFIG_INTRABC
if (cm->allow_screen_content_tools) {
......@@ -1089,12 +1094,9 @@ static void read_intra_frame_mode_info(AV1_COMMON *const cm,
#endif
}
mbmi->palette_mode_info.palette_size[0] = 0;
mbmi->palette_mode_info.palette_size[1] = 0;
if (av1_allow_palette(cm->allow_screen_content_tools, bsize))
read_palette_mode_info(cm, xd, mi_row, mi_col, r);
#if CONFIG_FILTER_INTRA
mbmi->filter_intra_mode_info.use_filter_intra = 0;
read_filter_intra_mode_info(xd, r);
#endif // CONFIG_FILTER_INTRA
......
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