diff options
| author | Anton Khirnov <anton@khirnov.net> | 2019-06-04 17:24:28 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:42 -0300 |
| commit | a3826241134b49d47d5aac6bfced1a7eb762b878 (patch) | |
| tree | a6d44c1943bf2f8e8ff54311b45d3ac02e67de86 /libavcodec/libcodec2.c | |
| parent | 89dc056b0106e3ef01a3499e8a43af7c7dfe2646 (diff) | |
| download | ffmpeg-a3826241134b49d47d5aac6bfced1a7eb762b878.tar.gz | |
libcodec2: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libcodec2.c')
| -rw-r--r-- | libavcodec/libcodec2.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libavcodec/libcodec2.c b/libavcodec/libcodec2.c index eb66867f82..a2efb813c6 100644 --- a/libavcodec/libcodec2.c +++ b/libavcodec/libcodec2.c @@ -85,9 +85,9 @@ libcodec2_init_common_error: static av_cold int libcodec2_init_decoder(AVCodecContext *avctx) { avctx->sample_rate = 8000; - avctx->channels = 1; avctx->sample_fmt = AV_SAMPLE_FMT_S16; - avctx->channel_layout = AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; if (avctx->extradata_size != CODEC2_EXTRADATA_SIZE) { av_log(avctx, AV_LOG_ERROR, "must have exactly %i bytes of extradata (got %i)\n", @@ -104,7 +104,7 @@ static av_cold int libcodec2_init_encoder(AVCodecContext *avctx) //will need to be smarter once we get wideband support if (avctx->sample_rate != 8000 || - avctx->channels != 1 || + avctx->ch_layout.nb_channels != 1 || avctx->sample_fmt != AV_SAMPLE_FMT_S16) { av_log(avctx, AV_LOG_ERROR, "only 8 kHz 16-bit mono allowed\n"); return AVERROR(EINVAL); @@ -188,7 +188,10 @@ const AVCodec ff_libcodec2_decoder = { .capabilities = AV_CODEC_CAP_CHANNEL_CONF, .supported_samplerates = (const int[]){ 8000, 0 }, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, +#if FF_API_OLD_CHANNEL_LAYOUT .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, +#endif + .ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, { 0 } }, }; const AVCodec ff_libcodec2_encoder = { @@ -203,6 +206,9 @@ const AVCodec ff_libcodec2_encoder = { .encode2 = libcodec2_encode, .supported_samplerates = (const int[]){ 8000, 0 }, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, +#if FF_API_OLD_CHANNEL_LAYOUT .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, +#endif + .ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, { 0 } }, .priv_class = &libcodec2_enc_class, }; |