From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9997B4256B for ; Fri, 18 Mar 2022 18:32:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49BA568B098; Fri, 18 Mar 2022 20:32:12 +0200 (EET) Received: from mail-oo1-f52.google.com (mail-oo1-f52.google.com [209.85.161.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31BE268AC80 for ; Fri, 18 Mar 2022 20:32:05 +0200 (EET) Received: by mail-oo1-f52.google.com with SMTP id j7-20020a4ad6c7000000b0031c690e4123so11120257oot.11 for ; Fri, 18 Mar 2022 11:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=PbL3ZzGevhgCksLVMya1hv2NOjrnfhGMFRaX9GduJQk=; b=cLOHxLCpk1dIfjkBcuaFClVgoYa3Qp61P8rpQC6HegFcp0czlsX/WxI327cEXRh+TL 9SpAfrGvOPprwXe20hGXr2ELvFjJKxav5sBaK/w5dNM5JFql0IuMkcc+RsJwK72sA3dV /Xc5rb8nG28nCTR1FQOXVMbm6HGP0AlsoBDqTlM915+HOIDfze8JfytNeZNG+qGPZbTK TPfLPpSlZcT1f6Df4tw9acvNDpxySq9X3c1IaoY9zxQMP7cV+fyih2oEcch0gDrR3pg3 AGYHfUCaZdhZk0Jx8CNS8pTjsSiCauc3l3vptpf1H7nYdg3Ocehfrm97o2BU5iAKHVbi qBUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=PbL3ZzGevhgCksLVMya1hv2NOjrnfhGMFRaX9GduJQk=; b=6zt7Zm8FvxxI91tZr1fxWewUcjxbMiEr9PWC32iN5mfcbRWpKkYA2fOOQXZvakLCqP fu1fe5qNiwGQWsmG04C8LCuO7KLGwFDFhN3abHVkOxvkqP5Q0WgAWA28LWaCzZoHIe/4 cq/KaAS9MxXAQpuhsdg/fSJMOno4+wDPlv4ssAmZZxlebSDSsp6ZycXC4ZKUYKqviZhG zFFmqj5jfGXmtgEN1osXShKXnFZdsZRzoywQush5WFxmtGMlkZVcarfBQ2QSv/fosv6q bDokXc2PEgtCGhlhaJnOwTXemMH8NjrCYVJcIQMdxxnKLteN9I759aDrVsuQPYGluXHD pIMw== X-Gm-Message-State: AOAM532Vh6vGT7oCsPKOvYG8P9JAUVQdUF297rvkQH8w2RpZ1crkQBny gUhIGFn7XTtFnRBmpwVlWS20Hii6rHkXTQ== X-Google-Smtp-Source: ABdhPJwYSF34Y+/fqnnY+7QA3rShLoS/1AVhwDLfq5rCy8LnUw4jbVY2Fy7i1ksKlN+eYyJwD99W0w== X-Received: by 2002:a05:6870:248c:b0:d7:19f3:a52c with SMTP id s12-20020a056870248c00b000d719f3a52cmr4082632oaq.149.1647628323326; Fri, 18 Mar 2022 11:32:03 -0700 (PDT) Received: from [192.168.0.13] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id o10-20020aca410a000000b002ecf2a4fda5sm4233582oia.10.2022.03.18.11.32.02 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 18 Mar 2022 11:32:02 -0700 (PDT) Message-ID: <54aa664c-cc91-1f18-511d-e63c59cf7b86@gmail.com> Date: Fri, 18 Mar 2022 15:32:02 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220318182458.64311-1-onemda@gmail.com> From: James Almer In-Reply-To: <20220318182458.64311-1-onemda@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] avformat/pcmdec: add support to set channel layout X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/18/2022 3:24 PM, Paul B Mahol wrote: > Signed-off-by: Paul B Mahol > --- > libavformat/pcmdec.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c > index c7da740541..775cda8cc7 100644 > --- a/libavformat/pcmdec.c > +++ b/libavformat/pcmdec.c > @@ -22,6 +22,7 @@ > #include "config_components.h" > > #include "libavutil/avstring.h" > +#include "libavutil/channel_layout.h" > #include "avformat.h" > #include "internal.h" > #include "pcm.h" > @@ -33,6 +34,7 @@ typedef struct PCMAudioDemuxerContext { > AVClass *class; > int sample_rate; > int channels; > + char *ch_layout_str; > } PCMAudioDemuxerContext; > > static int pcm_read_header(AVFormatContext *s) > @@ -41,6 +43,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) > @@ -50,7 +53,14 @@ 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; > - par->ch_layout.nb_channels = s1->channels; > + if (s1->ch_layout_str) { > + ret = av_channel_layout_from_string(&par->ch_layout, > + s1->ch_layout_str); > + if (ret < 0) > + return ret; > + } else { > + par->ch_layout.nb_channels = s1->channels; > + } > > av_opt_get(s->pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type); > if (mime_type && s->iformat->mime_type) { > @@ -99,6 +109,7 @@ 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 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, This option should be deprecated here and in every other raw demuxer in favor of a new ch_layout one like the one you're introducing, and the code in ffmpeg.c looking for them adapted. > + { "ch_layout", "", offsetof(PCMAudioDemuxerContext, ch_layout_str),AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, AV_OPT_TYPE_CHLAYOUT. That way you don't need to bother with av_channel_layout_from_string(), and use av_channel_layout_copy() instead. > { NULL }, > }; > static const AVClass pcm_demuxer_class = { _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".