Bring palette back to nextgenv2
It was removed by the master branch merge. Change-Id: I4b2a524c9e052e41063359afcb4ba22bf78344cf
This commit is contained in:
@@ -919,6 +919,9 @@ static void decode_block(VP10Decoder *const pbi, MACROBLOCKD *const xd,
|
||||
const int max_blocks_high = num_4x4_h + (xd->mb_to_bottom_edge >= 0 ?
|
||||
0 : xd->mb_to_bottom_edge >> (5 + pd->subsampling_y));
|
||||
|
||||
if (plane <= 1 && mbmi->palette_mode_info.palette_size[plane])
|
||||
vp10_decode_palette_tokens(xd, plane, r);
|
||||
|
||||
for (row = 0; row < max_blocks_high; row += step)
|
||||
for (col = 0; col < max_blocks_wide; col += step)
|
||||
predict_and_reconstruct_intra_block(xd, r, mbmi, plane,
|
||||
@@ -2023,6 +2026,8 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
|
||||
memset(&cm->ref_frame_map, -1, sizeof(cm->ref_frame_map));
|
||||
pbi->need_resync = 0;
|
||||
}
|
||||
if (frame_is_intra_only(cm))
|
||||
cm->allow_screen_content_tools = vpx_rb_read_bit(rb);
|
||||
} else {
|
||||
cm->intra_only = cm->show_frame ? 0 : vpx_rb_read_bit(rb);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user