diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2012-10-22 19:11:05 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2012-10-23 14:22:16 +0200 |
commit | 9ab0874ea8b6774c6f5470dba2b5b4615a610d0d (patch) | |
tree | e0845ddeef2ace41e07fedef09f38a12158bd0cb | |
parent | 0c03cc68386443f1e96ab6fb358220faf67cd5ff (diff) | |
download | ffmpeg-9ab0874ea8b6774c6f5470dba2b5b4615a610d0d.tar.gz |
mp3: properly forward mp_decode_frame errors
The function can return either a parsing error or a memory management
error.
-rw-r--r-- | libavcodec/mpegaudiodec.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 169254f5d7..52abcb2906 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1636,7 +1636,7 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr, int buf_size = avpkt->size; MPADecodeContext *s = avctx->priv_data; uint32_t header; - int out_size; + int ret; if (buf_size < HEADER_SIZE) return AVERROR_INVALIDDATA; @@ -1665,21 +1665,22 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr, buf_size= s->frame_size; } - out_size = mp_decode_frame(s, NULL, buf, buf_size); - if (out_size >= 0) { + ret = mp_decode_frame(s, NULL, buf, buf_size); + if (ret >= 0) { *got_frame_ptr = 1; *(AVFrame *)data = s->frame; avctx->sample_rate = s->sample_rate; //FIXME maybe move the other codec info stuff from above here too } else { av_log(avctx, AV_LOG_ERROR, "Error while decoding MPEG audio frame.\n"); - /* Only return an error if the bad frame makes up the whole packet. - If there is more data in the packet, just consume the bad frame - instead of returning an error, which would discard the whole - packet. */ + /* Only return an error if the bad frame makes up the whole packet or + * the error is related to buffer management. + * If there is more data in the packet, just consume the bad frame + * instead of returning an error, which would discard the whole + * packet. */ *got_frame_ptr = 0; - if (buf_size == avpkt->size) - return out_size; + if (buf_size == avpkt->size || ret != AVERROR_INVALIDDATA) + return ret; } s->frame_size = 0; return buf_size; @@ -1704,7 +1705,7 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data, int buf_size = avpkt->size; MPADecodeContext *s = avctx->priv_data; uint32_t header; - int len, out_size; + int len, ret; len = buf_size; @@ -1735,10 +1736,10 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data, s->frame_size = len; - out_size = mp_decode_frame(s, NULL, buf, buf_size); - if (out_size < 0) { + ret = mp_decode_frame(s, NULL, buf, buf_size); + if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error while decoding MPEG audio frame.\n"); - return AVERROR_INVALIDDATA; + return ret; } *got_frame_ptr = 1; @@ -1943,7 +1944,10 @@ static int decode_frame_mp3on4(AVCodecContext *avctx, void *data, } ch += m->nb_channels; - out_size += mp_decode_frame(m, outptr, buf, fsize); + if ((ret = mp_decode_frame(m, outptr, buf, fsize)) < 0) + return ret; + + out_size += ret; buf += fsize; len -= fsize; |