diff options
| author | Anton Khirnov <anton@khirnov.net> | 2019-06-04 12:37:42 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:45 -0300 |
| commit | 457e88fcaf4fe450869a9a34b59ae94a2af04b05 (patch) | |
| tree | 61b731df92f62cbb2d0e9b8d4192129b4752ef6a /libavcodec/vorbisdec.c | |
| parent | eb81c946c1888a8d929cc8719f6fd486450e2d0d (diff) | |
| download | ffmpeg-457e88fcaf4fe450869a9a34b59ae94a2af04b05.tar.gz | |
vorbis: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vorbisdec.c')
| -rw-r--r-- | libavcodec/vorbisdec.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index be4ac055e0..798c7b1d67 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1077,12 +1077,14 @@ static av_cold int vorbis_decode_init(AVCodecContext *avctx) return ret; } - if (vc->audio_channels > 8) - avctx->channel_layout = 0; - else - avctx->channel_layout = ff_vorbis_channel_layouts[vc->audio_channels - 1]; + av_channel_layout_uninit(&avctx->ch_layout); + if (vc->audio_channels > 8) { + avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + avctx->ch_layout.nb_channels = vc->audio_channels; + } else { + av_channel_layout_copy(&avctx->ch_layout, &ff_vorbis_ch_layouts[vc->audio_channels - 1]); + } - avctx->channels = vc->audio_channels; avctx->sample_rate = vc->audio_samplerate; return 0; @@ -1788,12 +1790,14 @@ static int vorbis_decode_frame(AVCodecContext *avctx, void *data, return ret; } - if (vc->audio_channels > 8) - avctx->channel_layout = 0; - else - avctx->channel_layout = ff_vorbis_channel_layouts[vc->audio_channels - 1]; + av_channel_layout_uninit(&avctx->ch_layout); + if (vc->audio_channels > 8) { + avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + avctx->ch_layout.nb_channels = vc->audio_channels; + } else { + av_channel_layout_copy(&avctx->ch_layout, &ff_vorbis_ch_layouts[vc->audio_channels - 1]); + } - avctx->channels = vc->audio_channels; avctx->sample_rate = vc->audio_samplerate; return buf_size; } @@ -1892,7 +1896,10 @@ const AVCodec ff_vorbis_decoder = { .flush = vorbis_decode_flush, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, +#if FF_API_OLD_CHANNEL_LAYOUT .channel_layouts = ff_vorbis_channel_layouts, +#endif + .ch_layouts = ff_vorbis_ch_layouts, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; |