Commit 24f7b07f authored by hui su's avatar hui su

Send allow_screen_content flag for both key and intra only frames

BUG=webm:1311

Change-Id: I03c1043d17ed4e4ea22002473779a9612884c6c6
parent 732c1885
......@@ -3224,11 +3224,10 @@ static size_t read_uncompressed_header(AV1Decoder *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 = aom_rb_read_bit(rb);
cm->allow_screen_content_tools = aom_rb_read_bit(rb);
} else {
cm->intra_only = cm->show_frame ? 0 : aom_rb_read_bit(rb);
if (cm->intra_only) cm->allow_screen_content_tools = aom_rb_read_bit(rb);
if (cm->error_resilient_mode) {
cm->reset_frame_context = RESET_FRAME_CONTEXT_ALL;
} else {
......
......@@ -3198,11 +3198,10 @@ static void write_uncompressed_header(AV1_COMP *cpi,
write_sync_code(wb);
write_bitdepth_colorspace_sampling(cm, wb);
write_frame_size(cm, wb);
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);
} else {
if (!cm->show_frame) aom_wb_write_bit(wb, cm->intra_only);
if (cm->intra_only) aom_wb_write_bit(wb, cm->allow_screen_content_tools);
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