RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-16 20:07:04 +00:00
Code Issues Projects Releases Wiki Activity

avformat/pcmdec: deprecate channels option

Browse Source 
And ensure ch_layout has priority if set over channels, until the latter is
gone.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2022-03-20 15:12:59 -03:00
parent 902ee9cafc
commit 5cd6cb9f05
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/pcmdec.c
View File

@ -33,7 +33,9 @@
typedef struct PCMAudioDemuxerContext { typedef struct PCMAudioDemuxerContext {
AVClass *class; AVClass *class;
int sample_rate; int sample_rate;
#if FF_API_OLD_CHANNEL_LAYOUT
int channels; int channels;
#endif
AVChannelLayout ch_layout; AVChannelLayout ch_layout;
} PCMAudioDemuxerContext; } PCMAudioDemuxerContext;
@ -43,6 +45,7 @@ static int pcm_read_header(AVFormatContext *s)
AVCodecParameters *par; AVCodecParameters *par;
AVStream *st; AVStream *st;
uint8_t *mime_type = NULL; uint8_t *mime_type = NULL;
int ret;
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
@ -52,13 +55,16 @@ static int pcm_read_header(AVFormatContext *s)
par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = s->iformat->raw_codec_id; par->codec_id = s->iformat->raw_codec_id;
par->sample_rate = s1->sample_rate; 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; par->ch_layout.nb_channels = s1->channels;
else { #endif
int ret = av_channel_layout_copy(&par->ch_layout, &s1->ch_layout);
if (ret < 0)
return ret;
}
av_opt_get(s->pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type); av_opt_get(s->pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type);
if (mime_type && s->iformat->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[] = { 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 }, { "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 }, { "ch_layout", "", offsetof(PCMAudioDemuxerContext, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = "mono"}, 0, 0, AV_OPT_FLAG_DECODING_PARAM },
#endif
{ NULL }, { NULL },
}; };
static const AVClass pcm_demuxer_class = { static const AVClass pcm_demuxer_class = {