diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-02-23 13:11:10 -0500 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-23 21:51:12 -0500 |
| commit | 1574eff3d23ad799d25454a449b01f94795495ea (patch) | |
| tree | 6e273234a184ce8ea2c4f56bab521f0412e30aa5 | |
| parent | ba9516cca845f8d3fb7ac08ef53a996c3ee0dbf5 (diff) | |
| download | ffmpeg-1574eff3d23ad799d25454a449b01f94795495ea.tar.gz | |
vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making a single call to vmdaudio_loadsound().
This also adds output buffer size checks for AUDIO and SILENCE block types.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| -rw-r--r-- | libavcodec/vmdav.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index d0ffa39f78..446e2c1dbc 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -506,7 +506,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; VmdAudioContext *s = avctx->priv_data; - int block_type; + int block_type, silent_chunks; unsigned char *output_samples = (unsigned char *)data; if (buf_size < 16) { @@ -523,23 +523,23 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, buf += 16; buf_size -= 16; - if (block_type == BLOCK_TYPE_AUDIO) { - /* the chunk contains audio */ - *data_size = vmdaudio_loadsound(s, output_samples, buf, 0, buf_size); - } else if (block_type == BLOCK_TYPE_INITIAL) { - /* initial chunk, may contain audio and silence */ + silent_chunks = 0; + if (block_type == BLOCK_TYPE_INITIAL) { uint32_t flags = AV_RB32(buf); - int silent_chunks = av_popcount(flags); + silent_chunks = av_popcount(flags); buf += 4; buf_size -= 4; - if(*data_size < (s->block_align*silent_chunks + buf_size) * 2) - return -1; - *data_size = vmdaudio_loadsound(s, output_samples, buf, silent_chunks, buf_size); } else if (block_type == BLOCK_TYPE_SILENCE) { - /* silent chunk */ - *data_size = vmdaudio_loadsound(s, output_samples, buf, 1, 0); + silent_chunks = 1; + buf_size = 0; // should already be zero but set it just to be sure } + /* ensure output buffer is large enough */ + if (*data_size < (s->block_align*silent_chunks + buf_size) * 2) + return -1; + + *data_size = vmdaudio_loadsound(s, output_samples, buf, silent_chunks, buf_size); + return avpkt->size; } |