RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264_sei: Return meaningful values 

Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Vittorio Giovara 2013-08-02 10:33:00 +02:00 committed by Diego Biurrun
parent b18412171f
commit 0d8b943d20
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/h264_sei.c
View File

@ -61,7 +61,7 @@ static int decode_picture_timing(H264Context *h)
h->sei_ct_type = 0; h->sei_ct_type = 0;
if (h->sei_pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING) if (h->sei_pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING)
return -1; return AVERROR_INVALIDDATA;
num_clock_ts = sei_num_clock_ts_table[h->sei_pic_struct]; num_clock_ts = sei_num_clock_ts_table[h->sei_pic_struct];
@ -109,7 +109,7 @@ static int decode_unregistered_user_data(H264Context *h, int size)
int e, build, i; int e, build, i;
if (size < 16) if (size < 16)
return -1; return AVERROR_INVALIDDATA;
for (i = 0; i < sizeof(user_data) - 1 && i < size; i++) for (i = 0; i < sizeof(user_data) - 1 && i < size; i++)
user_data[i] = get_bits(&h->gb, 8); user_data[i] = get_bits(&h->gb, 8);
@ -150,7 +150,7 @@ static int decode_buffering_period(H264Context *h)
if (sps_id > 31 || !h->sps_buffers[sps_id]) { if (sps_id > 31 || !h->sps_buffers[sps_id]) {
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
"non-existing SPS %d referenced in buffering period\n", sps_id); "non-existing SPS %d referenced in buffering period\n", sps_id);
return -1; return AVERROR_INVALIDDATA;
} }
sps = h->sps_buffers[sps_id]; sps = h->sps_buffers[sps_id];
@ -181,6 +181,7 @@ int ff_h264_decode_sei(H264Context *h)
while (get_bits_left(&h->gb) > 16) { while (get_bits_left(&h->gb) > 16) {
int size = 0; int size = 0;
int type = 0; int type = 0;
int ret = 0;
do do
type += show_bits(&h->gb, 8); type += show_bits(&h->gb, 8);
@ -192,20 +193,24 @@ int ff_h264_decode_sei(H264Context *h)
switch (type) { switch (type) {
case SEI_TYPE_PIC_TIMING: // Picture timing SEI case SEI_TYPE_PIC_TIMING: // Picture timing SEI
if (decode_picture_timing(h) < 0) ret = decode_picture_timing(h);
return -1; if (ret < 0)
return ret;
break; break;
case SEI_TYPE_USER_DATA_UNREGISTERED: case SEI_TYPE_USER_DATA_UNREGISTERED:
if (decode_unregistered_user_data(h, size) < 0) ret = decode_unregistered_user_data(h, size);
return -1; if (ret < 0)
return ret;
break; break;
case SEI_TYPE_RECOVERY_POINT: case SEI_TYPE_RECOVERY_POINT:
if (decode_recovery_point(h) < 0) ret = decode_recovery_point(h);
return -1; if (ret < 0)
return ret;
break; break;
case SEI_BUFFERING_PERIOD: case SEI_BUFFERING_PERIOD:
if (decode_buffering_period(h) < 0) ret = decode_buffering_period(h);
return -1; if (ret < 0)
return ret;
break; break;
default: default:
skip_bits(&h->gb, 8 * size); skip_bits(&h->gb, 8 * size);