RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 02:04:58 +00:00
Code Issues Projects Releases Wiki Activity

move header error logging to after CRC check

Browse Source 
Originally committed as revision 13579 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-05-31 15:30:55 +00:00
parent 4dc471c30c
commit c78c6d6c58
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/ac3dec.c
View File

@ -1144,12 +1144,29 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
} }
/* parse the syncinfo */ /* parse the syncinfo */
*data_size = 0;
err = ac3_parse_header(s); err = ac3_parse_header(s);
if(err) {
/* check that reported frame size fits in input buffer */
if(s->frame_size > buf_size) {
av_log(avctx, AV_LOG_ERROR, "incomplete frame\n");
err = AC3_PARSE_ERROR_FRAME_SIZE;
}
/* check for crc mismatch */
if(err != AC3_PARSE_ERROR_FRAME_SIZE && avctx->error_resilience >= FF_ER_CAREFUL) {
if(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, &buf[2], s->frame_size-2)) {
av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n");
err = 1;
}
}
/* parse the syncinfo */
if(err && err != 1) {
switch(err) { switch(err) {
case AC3_PARSE_ERROR_SYNC: case AC3_PARSE_ERROR_SYNC:
av_log(avctx, AV_LOG_ERROR, "frame sync error : cannot use error concealment\n"); av_log(avctx, AV_LOG_ERROR, "frame sync error\n");
return -1; break;
case AC3_PARSE_ERROR_BSID: case AC3_PARSE_ERROR_BSID:
av_log(avctx, AV_LOG_ERROR, "invalid bitstream id\n"); av_log(avctx, AV_LOG_ERROR, "invalid bitstream id\n");
break; break;
@ -1168,20 +1185,6 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
} }
} }
/* check that reported frame size fits in input buffer */
if(s->frame_size > buf_size) {
av_log(avctx, AV_LOG_ERROR, "incomplete frame\n");
return -1;
}
/* check for crc mismatch */
if(!err && avctx->error_resilience >= FF_ER_CAREFUL) {
if(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, &buf[2], s->frame_size-2)) {
av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n");
err = 1;
}
}
/* if frame is ok, set audio parameters */ /* if frame is ok, set audio parameters */
if (!err) { if (!err) {
avctx->sample_rate = s->sample_rate; avctx->sample_rate = s->sample_rate;