[FFmpeg-devel] [PATCH 1/3] avformat/slndec: add support to set channel layout

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Sat Mar 19 00:47:08 EET 2022


James Almer:
> On 3/18/2022 7:41 PM, Andreas Rheinhardt wrote:
>> James Almer:
>>> Signed-off-by: James Almer <jamrial at gmail.com>
>>> ---
>>>   libavformat/pcmdec.c | 3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
>>> index dcd13787d5..a2bcfc2814 100644
>>> --- a/libavformat/pcmdec.c
>>> +++ b/libavformat/pcmdec.c
>>> @@ -170,7 +170,8 @@ PCMDEF(vidc,  "PCM Archimedes
>>> VIDC",                            NULL,  VIDC)
>>>   #if CONFIG_SLN_DEMUXER
>>>   static const AVOption sln_options[] = {
>>>       { "sample_rate", "", offsetof(PCMAudioDemuxerContext,
>>> sample_rate), AV_OPT_TYPE_INT, {.i64 = 8000}, 0, INT_MAX,
>>> AV_OPT_FLAG_DECODING_PARAM },
>>> -    { "channels",    "", offsetof(PCMAudioDemuxerContext,
>>> channels),    AV_OPT_TYPE_INT, {.i64 = 1}, 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 },
>>> +    { "ch_layout",   "", offsetof(PCMAudioDemuxerContext,
>>> ch_layout),   AV_OPT_TYPE_CHLAYOUT, {.str = "mono"}, 0, 0,
>>> AV_OPT_FLAG_DECODING_PARAM },
>>>       { NULL },
>>>   };
>>>   
>>
>> There is no avformat/slndec. And I presume it is possible to set an
>> unspecified channel layout via AV_OPT_TYPE_CHLAYOUT, so why don't you
>> deprecate the now redundant channels option?
> 
> There is no slndec, but it's the sln demuxer, so it seemed better than
> to write pcmdec. I can change it if you want.
> 

The naming convention contains the (main) file that is changed; the fact
that it is about the sln demuxer can (and should) be mentioned in the
commit title afterwards like: "avformat/pcmdec: Add support for channel
layouts for sln"

- Andreas


More information about the ffmpeg-devel mailing list