Commit ed37d01b authored by Alex Converse's avatar Alex Converse
Browse files

Turn off palette when enabling intrabc

Change-Id: I109e382097a8fcbf85a339f97f6297252f01b021
parent 106b3cbc
......@@ -2318,6 +2318,9 @@ static void write_tokens_b(AV1_COMP *cpi, const TileInfo *const tile,
const uint8_t palette_size_plane =
mbmi->palette_mode_info.palette_size[plane];
if (palette_size_plane > 0) {
#if CONFIG_INTRABC
assert(mbmi->use_intrabc == 0);
#endif
int rows, cols;
assert(mbmi->sb_type >= BLOCK_8X8);
av1_get_block_dimensions(mbmi->sb_type, plane, xd, NULL, NULL, &rows,
......
......@@ -9138,6 +9138,9 @@ static int64_t rd_pick_intrabc_mode_sb(const AV1_COMP *cpi, MACROBLOCK *x,
if (bsize >= BLOCK_8X8 && cpi->common.allow_screen_content_tools) {
if (xd->mb_to_top_edge == -MAX_SB_SIZE * 8) {
MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
#if CONFIG_PALETTE
memset(&mbmi->palette_mode_info, 0, sizeof(mbmi->palette_mode_info));
#endif
mbmi->use_intrabc = 1;
mbmi->mode = DC_PRED;
mbmi->uv_mode = DC_PRED;
......
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