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 | |
| parent | eb81c946c1888a8d929cc8719f6fd486450e2d0d (diff) | |
| download | ffmpeg-457e88fcaf4fe450869a9a34b59ae94a2af04b05.tar.gz | |
vorbis: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/vorbisdec.c | 27 | ||||
| -rw-r--r-- | libavcodec/vorbisenc.c | 7 |
2 files changed, 21 insertions, 13 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 }, }; diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index d9c6f6d494..d85a46038a 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -276,7 +276,7 @@ static int create_vorbis_context(vorbis_enc_context *venc, const uint8_t *clens, *quant; int i, book, ret; - venc->channels = avctx->channels; + venc->channels = avctx->ch_layout.nb_channels; venc->sample_rate = avctx->sample_rate; venc->log2_blocksize[0] = venc->log2_blocksize[1] = 11; @@ -1038,7 +1038,8 @@ static AVFrame *spawn_empty_frame(AVCodecContext *avctx, int channels) f->format = avctx->sample_fmt; f->nb_samples = avctx->frame_size; - f->channel_layout = avctx->channel_layout; + f->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + f->ch_layout.nb_channels = channels; if (av_frame_get_buffer(f, 4)) { av_frame_free(&f); @@ -1267,7 +1268,7 @@ static av_cold int vorbis_encode_init(AVCodecContext *avctx) vorbis_enc_context *venc = avctx->priv_data; int ret; - if (avctx->channels != 2) { + if (avctx->ch_layout.nb_channels != 2) { av_log(avctx, AV_LOG_ERROR, "Current FFmpeg Vorbis encoder only supports 2 channels.\n"); return -1; } |