diff options
-rw-r--r-- | vp9/common/vp9_onyxc_int.h | 6 | ||||
-rw-r--r-- | vp9/decoder/vp9_decodframe.c | 9 | ||||
-rw-r--r-- | vp9/encoder/vp9_bitstream.c | 6 | ||||
-rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 4 |
4 files changed, 24 insertions, 1 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index b148a6377..ac190059b 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -154,6 +154,12 @@ typedef struct VP9Common { int show_frame; int last_show_frame; + // Flag signaling that the frame is encoded using only INTRA modes. + int intra_only; + + // Flag signaling that the frame context should be reset to default values. + int reset_frame_context; + int frame_flags; // MBs, mb_rows/cols is in 16-pixel units; mi_rows/cols is in // MODE_INFO (8-pixel) units. diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 4e78ebf30..a2bcb17e7 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -955,16 +955,25 @@ size_t read_uncompressed_header(VP9D_COMP *pbi, "Invalid frame sync code"); } } + setup_frame_size(pbi, scaling_active, rb); + if (!cm->show_frame) { + cm->intra_only = vp9_rb_read_bit(rb); + } else { + cm->intra_only = 0; + } + cm->frame_context_idx = vp9_rb_read_literal(rb, NUM_FRAME_CONTEXTS_LG2); cm->clr_type = (YUV_TYPE)vp9_rb_read_bit(rb); cm->error_resilient_mode = vp9_rb_read_bit(rb); if (!cm->error_resilient_mode) { + cm->reset_frame_context = vp9_rb_read_bit(rb); cm->refresh_frame_context = vp9_rb_read_bit(rb); cm->frame_parallel_decoding_mode = vp9_rb_read_bit(rb); } else { + cm->reset_frame_context = 0; cm->refresh_frame_context = 0; cm->frame_parallel_decoding_mode = 1; } diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index e4db5c1dc..6b4fe8c96 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1490,7 +1490,6 @@ static void encode_segmentation(VP9_COMP *cpi, vp9_writer *w) { } } - void write_uncompressed_header(VP9_COMMON *cm, struct vp9_write_bit_buffer *wb) { const int scaling_active = cm->width != cm->display_width || @@ -1517,11 +1516,16 @@ void write_uncompressed_header(VP9_COMMON *cm, vp9_wb_write_literal(wb, cm->width, 16); vp9_wb_write_literal(wb, cm->height, 16); + if (!cm->show_frame) { + vp9_wb_write_bit(wb, cm->intra_only); + } + vp9_wb_write_literal(wb, cm->frame_context_idx, NUM_FRAME_CONTEXTS_LG2); vp9_wb_write_bit(wb, cm->clr_type); vp9_wb_write_bit(wb, cm->error_resilient_mode); if (!cm->error_resilient_mode) { + vp9_wb_write_bit(wb, cm->reset_frame_context); vp9_wb_write_bit(wb, cm->refresh_frame_context); vp9_wb_write_bit(wb, cm->frame_parallel_decoding_mode); } diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index d9c34fe9b..3b784cb41 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -1190,6 +1190,7 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { cpi->refresh_golden_frame = 0; cpi->refresh_last_frame = 1; cm->refresh_frame_context = 1; + cm->reset_frame_context = 0; setup_features(cpi); cpi->mb.e_mbd.allow_high_precision_mv = 0; // Default mv precision adaptation @@ -2617,6 +2618,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, (cpi->oxcf.frame_parallel_decoding_mode != 0); if (cm->error_resilient_mode) { cm->frame_parallel_decoding_mode = 1; + cm->reset_frame_context = 0; cm->refresh_frame_context = 0; } } @@ -3671,6 +3673,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, } cm->show_frame = 0; + cm->intra_only = 0; cpi->refresh_alt_ref_frame = 1; cpi->refresh_golden_frame = 0; cpi->refresh_last_frame = 0; @@ -3875,6 +3878,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, cpi->droppable = !frame_is_reference(cpi); // return to normal state + cm->reset_frame_context = 0; cm->refresh_frame_context = 1; cpi->refresh_alt_ref_frame = 0; cpi->refresh_golden_frame = 0; |