[SCM] libav/experimental: Simplify error handling by processing header errors separate from CRC and buffer size vs. frame size errors.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:58:55 UTC 2013
The following commit has been merged in the experimental branch:
commit 2c2cdc0bfbe14710c321c1a9beb2605d89950557
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Thu Jan 28 23:19:33 2010 +0000
Simplify error handling by processing header errors separate from CRC and
buffer size vs. frame size errors.
Originally committed as revision 21519 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 8b78a0a..9f45af3 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -1236,21 +1236,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
*data_size = 0;
err = parse_frame_header(s);
- /* check that reported frame size fits in input buffer */
- if(!err && s->frame_size > buf_size) {
- av_log(avctx, AV_LOG_ERROR, "incomplete frame\n");
- err = AAC_AC3_PARSE_ERROR_FRAME_SIZE;
- }
-
- /* check for crc mismatch */
- if(err != AAC_AC3_PARSE_ERROR_FRAME_SIZE && avctx->error_recognition >= 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 = AAC_AC3_PARSE_ERROR_CRC;
- }
- }
-
- if(err && err != AAC_AC3_PARSE_ERROR_CRC) {
+ if (err) {
switch(err) {
case AAC_AC3_PARSE_ERROR_SYNC:
av_log(avctx, AV_LOG_ERROR, "frame sync error\n");
@@ -1278,6 +1264,18 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
av_log(avctx, AV_LOG_ERROR, "invalid header\n");
break;
}
+ } else {
+ /* 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 = AAC_AC3_PARSE_ERROR_FRAME_SIZE;
+ } else if (avctx->error_recognition >= FF_ER_CAREFUL) {
+ /* check for crc mismatch */
+ 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 = AAC_AC3_PARSE_ERROR_CRC;
+ }
+ }
}
/* if frame is ok, set audio parameters */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list