diff options
| author | James Almer <jamrial@gmail.com> | 2022-03-20 15:12:59 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-22 08:45:34 -0300 |
| commit | 5cd6cb9f051059bc2f24020755d87debea715c28 (patch) | |
| tree | e7adeafa400b7e015888b10c0c9e9ecaadcc6a23 /libavformat | |
| parent | 902ee9cafc8ac2b92e29196cb1e7b00628b664ca (diff) | |
avformat/pcmdec: deprecate channels option
And ensure ch_layout has priority if set over channels, until the latter is
gone.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/pcmdec.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index dcd13787d5..51b1098430 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -33,7 +33,9 @@ typedef struct PCMAudioDemuxerContext { AVClass *class; int sample_rate; +#if FF_API_OLD_CHANNEL_LAYOUT int channels; +#endif AVChannelLayout ch_layout; } PCMAudioDemuxerContext; @@ -43,6 +45,7 @@ static int pcm_read_header(AVFormatContext *s) AVCodecParameters *par; AVStream *st; uint8_t *mime_type = NULL; + int ret; st = avformat_new_stream(s, NULL); if (!st) @@ -52,13 +55,16 @@ static int pcm_read_header(AVFormatContext *s) par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_id = s->iformat->raw_codec_id; par->sample_rate = s1->sample_rate; - if (s1->channels) +#if FF_API_OLD_CHANNEL_LAYOUT + if (s1->ch_layout.nb_channels) { +#endif + ret = av_channel_layout_copy(&par->ch_layout, &s1->ch_layout); + if (ret < 0) + return ret; +#if FF_API_OLD_CHANNEL_LAYOUT + } else par->ch_layout.nb_channels = s1->channels; - else { - int ret = av_channel_layout_copy(&par->ch_layout, &s1->ch_layout); - if (ret < 0) - return ret; - } +#endif av_opt_get(s->pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type); if (mime_type && s->iformat->mime_type) { @@ -108,8 +114,12 @@ static int pcm_read_header(AVFormatContext *s) static const AVOption pcm_options[] = { { "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 44100}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, - { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, +#if FF_API_OLD_CHANNEL_LAYOUT + { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_DEPRECATED }, + { "ch_layout", "", offsetof(PCMAudioDemuxerContext, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = NULL}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, +#else { "ch_layout", "", offsetof(PCMAudioDemuxerContext, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = "mono"}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, +#endif { NULL }, }; static const AVClass pcm_demuxer_class = { |