From patchwork Fri Mar 18 22:50:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp2174740nkb; Fri, 18 Mar 2022 15:50:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGJwq/eHyZSI2O/iKMOi6LjPqD7PRLtt9WcFxa4256Bu1vv9IMhnp904ssHW4+hRa2hBig X-Received: by 2002:a17:906:7953:b0:6da:951c:1173 with SMTP id l19-20020a170906795300b006da951c1173mr11008165ejo.465.1647643848318; Fri, 18 Mar 2022 15:50:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647643848; cv=none; d=google.com; s=arc-20160816; b=QGA3obaIxcrMp6C+GE1f8Ve8VcZU8IwRashSJed/F4k1ttsaV4LdMHZTspVTwLbINW ZsuAm7Z7aDAaBmvQ8BuOFOtoVjCjBbzLEVGD8H7Bh7aOuSYcb3MtJqGQGmKacpFOO54B cWjsb1jmxjUIWdgEk6AtRVPT3Uh+9hXbYGYrR0PI21g5gF+A574SUW1jQ5rpwR+erfpw uAZ77D2OKygRk2YzV44j6kOQ0MfqJQHc99HOdhCS3amD1+5txIz0arONSG+Yjdis+ReS bwBMe0g1QHvKcAPtuecbV18ngtwOgFhrWFjdGng3wEoynunXIXJnIAtdxO1osS2h2Ff2 EPgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=p0HFw6HzEqIrYp/yRzG0DLkwXH9vWnUzkAgTPH/Pu1M=; b=JtXk2M2Ek2yF67HZIBLRMkQeeUN3yUpJj1M6n4BfmZW6Bn6oNmhWlxGbTD9vqWeKSr m1QMK3aE4mQKW2HXEtFtHmrFDVNlUok9nSZmkJjSMCuh8JmQeao+/Th/3FfmwUgsVc5t 8e16NC1aPSxWTuvhImI4oZ7eU19TETzd2a4m1I5vJErjEG6WYqZCu/54sLUEQevyY+w/ 8385d9Zvqs8xmNXncHIcT172EeU2BFkPhl0Zu0ZVw5Uq9r/GEkgt35LJAxML70rp4Bjc c/dtwzU97jW043TglOVHfdJW20UIDiPM38ye4DxFHFmvHSXqCepokL4VupD1BE7siAAd 6ypg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=SRvYdMlB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t19-20020a1709063e5300b006df76385d2csi2120822eji.460.2022.03.18.15.50.48; Fri, 18 Mar 2022 15:50:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=SRvYdMlB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A683068AF91; Sat, 19 Mar 2022 00:50:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8F6868A920 for ; Sat, 19 Mar 2022 00:50:38 +0200 (EET) Received: by mail-oi1-f173.google.com with SMTP id e4so7283787oif.2 for ; Fri, 18 Mar 2022 15:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nvmgEBQjhSG9imJbpEjwJ8Bt8a8kBCO4QZiORzvLYx8=; b=SRvYdMlBQgHHU2OdCKV6j9rit3uRTTxEaiHHDYs2BX/O6CtJRpAtdpNRkhFNJuHuOL jUtinvPwEHAXrBQx7TQ6KZSMCq8QLAfzRDXJdg7Nge7OdlLLyVsazUTQk4vUQj2Slojf Gzi7SQpissQ4RvBNxFppS52Sf6JZkBjngPixqPkMFL9rle8Bu2iFPNI09+h+hbEqMB9Y nAH/PjqDJkTMnM/rvkoK5P3ckLtRqZPmFG0svo5JpdaGWbK6qnbPts+B+FXLva7begpq P6xEyp7xkB9XMRLQGoKaNliVBgSscOggjbEIfmLVsmzjV1hmF/8/6dSIsezlATQxv0/p lSkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nvmgEBQjhSG9imJbpEjwJ8Bt8a8kBCO4QZiORzvLYx8=; b=hdPsW0NH8+gfRCc8CpFYHs4eXkM0DOBDGneZN8We1nJubTm6Fi2z2JrZ3ShBuhv87J LyplspGxT2VJ538f0irECTggnzBsLUPwi7bdODxD9yT01tq3ArHqKx/PwjN2mfL+6Tcu qhjOriWZ+JFqqmvaXinjiELaKgeDjr9q1tQh+16p5TzjDB5uAPUZT28QZmUbVDuKoHKx CI9kviuGx5EKJpTbUSbjnK6A7fiIw2ctKDQNxRuWsm7Fz1kuV1EtwJaLeBtKuh8xae9l V2alNRNK3cGYu30wP1ahGvT2+FzTu9v55jxg6/8f3cGu8FfTXz15qWjoEQAG1SKd5S/I FKhQ== X-Gm-Message-State: AOAM530v0BPW/NwU+NqXxgvGPWeLx3Nt3PVEhVYT7MLmJK+goqClX40u po3u7mEgXXAUAf4oyIYWDOl3OC4h4gS0/A== X-Received: by 2002:a05:6808:3db:b0:2ec:cfe1:dfa0 with SMTP id o27-20020a05680803db00b002eccfe1dfa0mr8410835oie.127.1647643837120; Fri, 18 Mar 2022 15:50:37 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id h83-20020aca3a56000000b002ece47dce52sm4481414oia.26.2022.03.18.15.50.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 15:50:36 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Mar 2022 19:50:25 -0300 Message-Id: <20220318225025.44966-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220318221907.44594-1-jamrial@gmail.com> References: <20220318221907.44594-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4 v2] avformat/pcmdec: Add support for channel layouts for sln 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: m45uDLxT9BMM Signed-off-by: James Almer --- 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 }, };