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

wavpack: determine sample_fmt before requesting a buffer

Browse Source 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
This commit is contained in:
Hendrik Leppkes
2011-12-16 22:41:29 +01:00
committed by Justin Ruggles
parent 8893fbdf7a
commit 14165fe125
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/wavpack.c
View File

@@ -783,13 +783,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
s->samples = wc->samples; s->samples = wc->samples;
} }
s->frame_flags = AV_RL32(buf); buf += 4; s->frame_flags = AV_RL32(buf); buf += 4;
if(s->frame_flags&0x80){
avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
} else if((s->frame_flags&0x03) <= 1){
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
} else {
avctx->sample_fmt = AV_SAMPLE_FMT_S32;
}
bpp = av_get_bytes_per_sample(avctx->sample_fmt); bpp = av_get_bytes_per_sample(avctx->sample_fmt);
samples = (uint8_t*)samples + bpp * wc->ch_offset; samples = (uint8_t*)samples + bpp * wc->ch_offset;
@@ -1147,7 +1140,7 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
WavpackContext *s = avctx->priv_data; WavpackContext *s = avctx->priv_data;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
int frame_size, ret; int frame_size, ret, frame_flags;
int samplecount = 0; int samplecount = 0;
s->block = 0; s->block = 0;
@@ -1156,11 +1149,15 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
/* determine number of samples */ /* determine number of samples */
if(s->mkv_mode){ if(s->mkv_mode){
s->samples = AV_RL32(buf); buf += 4; s->samples = AV_RL32(buf); buf += 4;
frame_flags = AV_RL32(buf);
} else { } else {
if (s->multichannel) if (s->multichannel) {
s->samples = AV_RL32(buf + 4); s->samples = AV_RL32(buf + 4);
else frame_flags = AV_RL32(buf + 8);
} else {
s->samples = AV_RL32(buf); s->samples = AV_RL32(buf);
frame_flags = AV_RL32(buf + 4);
}
} }
if (s->samples <= 0) { if (s->samples <= 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid number of samples: %d\n", av_log(avctx, AV_LOG_ERROR, "Invalid number of samples: %d\n",
@@ -1168,6 +1165,14 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (frame_flags & 0x80) {
avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
} else if ((frame_flags & 0x03) <= 1) {
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
} else {
avctx->sample_fmt = AV_SAMPLE_FMT_S32;
}
/* get output buffer */ /* get output buffer */
s->frame.nb_samples = s->samples; s->frame.nb_samples = s->samples;
if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) { if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) {