generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Correct handling of show_bit in uncompressed header."

Browse Source
This commit is contained in:
Dmitry Kovalev 2013-10-29 12:10:43 -07:00 committed by Gerrit Code Review
commit 86ef5a0689
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vp9/decoder/vp9_decodframe.c
View File

@ -1041,7 +1041,11 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi,
setup_tile_info(cm, rb); setup_tile_info(cm, rb);
sz = vp9_rb_read_literal(rb, 16); sz = vp9_rb_read_literal(rb, 16);
return sz > 0 ? sz : -1; if (sz == 0)
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
"Invalid header size");
return sz;
} }
static int read_compressed_header(VP9D_COMP *pbi, const uint8_t *data, static int read_compressed_header(VP9D_COMP *pbi, const uint8_t *data,
@ -1157,15 +1161,9 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
YV12_BUFFER_CONFIG *const new_fb = get_frame_new_buffer(cm); YV12_BUFFER_CONFIG *const new_fb = get_frame_new_buffer(cm);
if (!first_partition_size) { if (!first_partition_size) {
if (!keyframe) {
// showing a frame directly // showing a frame directly
*p_data_end = data + 1; *p_data_end = data + 1;
return 0; return 0;
} else {
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
"Invalid key frame");
return -1;
}
} }
if (!pbi->decoded_key_frame && !keyframe) if (!pbi->decoded_key_frame && !keyframe)