diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 21:31:17 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-15 21:12:03 +0100 |
| commit | 9636266cbdab29ef41c38d3368e014752ca49fd9 (patch) | |
| tree | 07d10a871d5a257816fd0bb2c4454667d2d38669 | |
| parent | dc3349024a06fd3a036ffb2b5243ce20e866bcbf (diff) | |
| download | ffmpeg-9636266cbdab29ef41c38d3368e014752ca49fd9.tar.gz | |
vorbisdec: handle midstream parameter changes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e9ffee23f372390684d6d94bf8abf51350fc66a3)
| -rw-r--r-- | libavcodec/vorbisdec.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 3f160544f0..63a855b241 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1655,6 +1655,45 @@ static int vorbis_decode_frame(AVCodecContext *avccontext, void *data, av_dlog(NULL, "packet length %d \n", buf_size); + if (*buf == 1 && buf_size > 7) { + init_get_bits(gb, buf+1, buf_size*8 - 8); + vorbis_free(vc); + if ((ret = vorbis_parse_id_hdr(vc))) { + av_log(avccontext, AV_LOG_ERROR, "Id header corrupt.\n"); + vorbis_free(vc); + return ret; + } + + if (vc->audio_channels > 8) + avccontext->channel_layout = 0; + else + avccontext->channel_layout = ff_vorbis_channel_layouts[vc->audio_channels - 1]; + + avccontext->channels = vc->audio_channels; + avccontext->sample_rate = vc->audio_samplerate; + return buf_size; + } + + if (*buf == 3 && buf_size > 7) { + av_log(avccontext, AV_LOG_DEBUG, "Ignoring comment header\n"); + return buf_size; + } + + if (*buf == 5 && buf_size > 7 && vc->channel_residues && !vc->modes) { + init_get_bits(gb, buf+1, buf_size*8 - 8); + if ((ret = vorbis_parse_setup_hdr(vc))) { + av_log(avccontext, AV_LOG_ERROR, "Setup header corrupt.\n"); + vorbis_free(vc); + return ret; + } + return buf_size; + } + + if (!vc->channel_residues || !vc->modes) { + av_log(avccontext, AV_LOG_ERROR, "Data packet before valid headers\n"); + return AVERROR_INVALIDDATA; + } + /* get output buffer */ vc->frame.nb_samples = vc->blocksize[1] / 2; if ((ret = ff_get_buffer(avccontext, &vc->frame)) < 0) { |