generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adxdec: Do not require extradata.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
This commit is contained in:
Michael Niedermayer 2011-12-18 20:10:30 +01:00 committed by Justin Ruggles
parent cbaef7d16e
commit 4f1a787744
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavcodec/adxdec.c
View File

@ -38,16 +38,16 @@ static av_cold int adx_decode_init(AVCodecContext *avctx)
ADXContext *c = avctx->priv_data; ADXContext *c = avctx->priv_data;
int ret, header_size; int ret, header_size;
if (avctx->extradata_size < 24) if (avctx->extradata_size >= 24) {
return AVERROR_INVALIDDATA; if ((ret = avpriv_adx_decode_header(avctx, avctx->extradata,
avctx->extradata_size, &header_size,
if ((ret = avpriv_adx_decode_header(avctx, avctx->extradata, c->coeff)) < 0) {
avctx->extradata_size, &header_size, av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n");
c->coeff)) < 0) { return AVERROR_INVALIDDATA;
av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n"); }
return AVERROR_INVALIDDATA; c->channels = avctx->channels;
c->header_parsed = 1;
} }
c->channels = avctx->channels;
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_S16;
@ -107,6 +107,23 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data,
return buf_size; return buf_size;
} }
if (!c->header_parsed && buf_size >= 2 && AV_RB16(buf) == 0x8000) {
int header_size;
if ((ret = avpriv_adx_decode_header(avctx, buf, buf_size, &header_size,
c->coeff)) < 0) {
av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n");
return AVERROR_INVALIDDATA;
}
c->channels = avctx->channels;
c->header_parsed = 1;
if (buf_size < header_size)
return AVERROR_INVALIDDATA;
buf += header_size;
buf_size -= header_size;
}
if (!c->header_parsed)
return AVERROR_INVALIDDATA;
/* calculate number of blocks in the packet */ /* calculate number of blocks in the packet */
num_blocks = buf_size / (BLOCK_SIZE * c->channels); num_blocks = buf_size / (BLOCK_SIZE * c->channels);