Commit 907bf421 authored by Urvang Joshi's avatar Urvang Joshi
Browse files

Send allow_screen_content flag for both key and intra only frames

Cherry-picked from webm/nextgenv2:
https://chromium-review.googlesource.com/#/c/397518/

BUG=webm:1311

Change-Id: I29e7863f40926baddbdcc2b7f2b4d416aa6540cd
parent 40574a1d
......@@ -1854,12 +1854,13 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
pbi->need_resync = 0;
}
#if CONFIG_PALETTE
if (frame_is_intra_only(cm))
cm->allow_screen_content_tools = aom_rb_read_bit(rb);
cm->allow_screen_content_tools = aom_rb_read_bit(rb);
#endif // CONFIG_PALETTE
} else {
cm->intra_only = cm->show_frame ? 0 : aom_rb_read_bit(rb);
#if CONFIG_PALETTE
if (cm->intra_only) cm->allow_screen_content_tools = aom_rb_read_bit(rb);
#endif // CONFIG_PALETTE
if (cm->error_resilient_mode) {
cm->reset_frame_context = RESET_FRAME_CONTEXT_ALL;
} else {
......
......@@ -2026,12 +2026,13 @@ static void write_uncompressed_header(AV1_COMP *cpi,
write_bitdepth_colorspace_sampling(cm, wb);
write_frame_size(cm, wb);
#if CONFIG_PALETTE
if (frame_is_intra_only(cm))
aom_wb_write_bit(wb, cm->allow_screen_content_tools);
aom_wb_write_bit(wb, cm->allow_screen_content_tools);
#endif // CONFIG_PALETTE
} else {
if (!cm->show_frame) aom_wb_write_bit(wb, cm->intra_only);
#if CONFIG_PALETTE
if (cm->intra_only) aom_wb_write_bit(wb, cm->allow_screen_content_tools);
#endif // CONFIG_PALETTE
if (!cm->error_resilient_mode) {
if (cm->intra_only) {
aom_wb_write_bit(wb,
......
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