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

Merge "Added trap for invalid key frame"

Browse Source
This commit is contained in:
Yaowu Xu 2013-10-15 14:28:21 -07:00 committed by Gerrit Code Review
commit f999d791e0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vp9/decoder/vp9_decodframe.c
View File

@ -955,9 +955,15 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
YV12_BUFFER_CONFIG *new_fb = &cm->yv12_fb[cm->new_fb_idx];
if (!first_partition_size) {
// showing a frame directly
*p_data_end = data + 1;
return 0;
if (!keyframe) {
// showing a frame directly
*p_data_end = data + 1;
return 0;
} else {
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
"Invalid key frame");
return -1;
}
}
data += vp9_rb_bytes_read(&rb);
xd->corrupted = 0;