From patchwork Fri Mar 18 18:24:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 34844 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp2004211nkb; Fri, 18 Mar 2022 11:23:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/r8VcYthwtos/rPwrsc4gSaYYuvARXHYmq3AUxxT7j4M6WugpzAeyy9iNSlUdOzBSp+w2 X-Received: by 2002:a17:907:3e82:b0:6da:6f15:ff38 with SMTP id hs2-20020a1709073e8200b006da6f15ff38mr10149611ejc.324.1647627822208; Fri, 18 Mar 2022 11:23:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647627822; cv=none; d=google.com; s=arc-20160816; b=OyScAOLEFHrKOs0fdSIvOaA9QH3UdrAFZm3LgRmtH+u8CYRxw4ASuuVo2pNWfuMrBL x2a0o3bFxz4BbjJ91GRwGkjmqO2tP2TEiD2ofKBn4Ty1Zf0exuuAxynSj8QU2Df9XjYb eBTTrmhl9y9fXYGhCWrJqpbSqKzrJcT/qWdw65kcmciDNN5n7Af7VvpFAApz3sYuCH2W T/edmBwKjf0keVw34Z6I8dhJal/TR2g3y+DRtMuNAfKxKUr7HgOKJmK1L8YOh2QE2no/ bzIUrZaArEXBwT1/ZJ/xXzp0Pz5XezwGmre11d94esJiOIqQqQHz2FWU7ITiNdZqH4dM 1iVg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=/Us3gDn24dBYuosxfDsYZLOr2lwZwvc17NWnFvh3bAg=; b=PBxV2GhncPv2EuoiknalwMIO1ssMj+EfdcV0LgdVxt5Lmemav/zK31sIBOJk9+IT5j yggtB5F7ZUvTJhhrJCBMs6ST2Gr550eaTaK1FmK4HCvuCFN3zXSrL/0Ynn2E8acVr0Yh RdEq9ARBpfFS0sj0YHvtrui2VuThZua72sutxcMmmCYOJ/Uij+GzTTGPr7NvTczL0j5H N7WS7S7zLnDAZx1aDHBI9PWMKUUxmRMyNW9O06FIAOF5TN+P0mBO8jn3MwjRYia7rmtM /QwimwRp+vKANGVWMGDfxr9ZhUHMepjugMGnQ1UoW5wP21TC32pE4Dyw2I/5wt1HFGkk WByg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=REN7c2w4; 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 v6-20020a170906380600b006df76385e1dsi1699216ejc.701.2022.03.18.11.23.18; Fri, 18 Mar 2022 11:23:42 -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=REN7c2w4; 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 D5C2668B074; Fri, 18 Mar 2022 20:23:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 251C968AE56 for ; Fri, 18 Mar 2022 20:23:08 +0200 (EET) Received: by mail-wm1-f46.google.com with SMTP id k8-20020a05600c1c8800b003899c7ac55dso4949401wms.1 for ; Fri, 18 Mar 2022 11:23:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=1ZxqYZQBKWVXdS3NlDzjDyYqE1hiDz/x8sGUkyYA4Os=; b=REN7c2w4+ZgMLUGXHMLr85a90L3QurpguN7N4OZQgMZ4OVNYWC2dQfp16OS0wbpahs jFjYqzH5o6bFbyKG2vgHCDgCP+PTKOCwCOQ48SKsVX6q9zAD0C6UMO1fVQvSFouq57GY FITF1bGlbrWBNMN8ZZMs16nTX1DY6BeNq0o/xyH24EvFLRv8ERDciwIG10WM2t5IyMoR fhSXItEAJaKcJ3aNGxbcA1c40OVlNiFTDogHraPwYtYSmQ2Mj2mViYnVfzeLqxJOjcUe 3AmrjcwAF4avgQndN2p9WJ/z8suVq/o7uw9UCr7XM2Iq+ddk/QP73NEjQ0gmGZU3sPlc 496Q== 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:mime-version :content-transfer-encoding; bh=1ZxqYZQBKWVXdS3NlDzjDyYqE1hiDz/x8sGUkyYA4Os=; b=nOX5nGvG8MRUQgFlcC0Gfx8UIz26IT1+iK8jy8L+Dvn68HBRzEpDSlQnw9XCr2LMUD bkT6je4Coa7hWbJAerlUiYo0AEkCmWFYfksErzOfQc7wSmI7gqjjzAeEqnIYY6PBMkit /dsJosZS+6TywZVRE4LSqCZ+PHLUh7PpOvlGv/3THLQS3WiGBc/jxdXn2qa77jcGOyYC 4R7cr4y7pghIuNwWvOVmdPQgVqXrbbVKlreLAKgLykwtNFqtoTH8GrRZNwGj+HxOU3TQ 6C20qBpZC+X1O8HoCz/N1qqmuq/kx00Daz0eGlW4tgu9BZUP9iIJkIcY0S69nqVH0oeu 9uXA== X-Gm-Message-State: AOAM533fB6udqMmWqlIdKuNCqh1vbi5wLLpYE1AWSGJIWAcdw1v+zN2V u2jebY1anMeT6PHkyjmkmkSJClagB8Y= X-Received: by 2002:a7b:c205:0:b0:389:a4a6:b5e1 with SMTP id x5-20020a7bc205000000b00389a4a6b5e1mr9044313wmi.128.1647627787395; Fri, 18 Mar 2022 11:23:07 -0700 (PDT) Received: from localhost.localdomain ([212.15.177.6]) by smtp.gmail.com with ESMTPSA id g3-20020a5d64e3000000b00203d9264605sm7041538wri.25.2022.03.18.11.23.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 11:23:06 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Mar 2022 19:24:58 +0100 Message-Id: <20220318182458.64311-1-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QA0IIcEKMbqe 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 }, + { "ch_layout", "", offsetof(PCMAudioDemuxerContext, ch_layout_str),AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, }; static const AVClass pcm_demuxer_class = {