On 03/18/2012 01:15 PM, Ronald S. Bultje wrote:
> ---
> libavcodec/adpcm.c | 20 +++++++++++---------
> 1 files changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
> index 4ee71b2..9307388 100644
> --- a/libavcodec/adpcm.c
> +++ b/libavcodec/adpcm.c
> @@ -450,6 +450,8 @@ static int get_nb_samples(AVCodecContext *avctx, const
> uint8_t *buf,
> nb_samples = ((buf_size - 16) * 8 / 3) / ch;
> break;
> case CODEC_ID_ADPCM_IMA_DK4:
> + if (avctx->block_align > 0)
> + buf_size = FFMIN(buf_size, avctx->block_align);
> nb_samples = 1 + (buf_size - 4 * ch) * 2 / ch;
> break;
> case CODEC_ID_ADPCM_IMA_WAV:
> @@ -713,18 +715,18 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
> void *data,
> break;
> }
> case CODEC_ID_ADPCM_IMA_DK4:
> - if (avctx->block_align != 0 && buf_size > avctx->block_align)
> - buf_size = avctx->block_align;
> -
> for (channel = 0; channel < avctx->channels; channel++) {
> cs = &c->status[channel];
> - cs->predictor = (int16_t)bytestream_get_le16(&src);
> - cs->step_index = av_clip(*src++, 0, 88);
> - src++;
> - *samples++ = cs->predictor;
> + cs->predictor = *samples++ =
> sign_extend(bytestream2_get_le16u(&gb), 16);
> + cs->step_index = sign_extend(bytestream2_get_le16u(&gb), 16);
> + if (cs->step_index > 88u){
> + av_log(avctx, AV_LOG_ERROR, "ERROR: step_index[%d] = %i\n",
> + channel, cs->step_index);
> + return AVERROR_INVALIDDATA;
> + }
> }
> - for (n = nb_samples >> (1 - st); n > 0; n--, src++) {
> - uint8_t v = *src;
> + for (n = nb_samples >> (1 - st); n > 0; n--) {
> + int v = bytestream2_get_byteu(&gb);
> *samples++ = adpcm_ima_expand_nibble(&c->status[0 ], v >> 4 ,
> 3);
> *samples++ = adpcm_ima_expand_nibble(&c->status[st], v & 0x0F,
> 3);
> }
LGTM
-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
