From patchwork Sun Mar 20 19:36:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34863 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1114990nkc; Sun, 20 Mar 2022 12:37:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyt7TO+nLQPQmOv0qpWZsibHQUCEzKDxT3aLxVgHh32JvjuU7wJ6jSHx/R1GpWCdbYCtyDD X-Received: by 2002:a17:907:8a06:b0:6df:e099:536 with SMTP id sc6-20020a1709078a0600b006dfe0990536mr6611034ejc.351.1647805067379; Sun, 20 Mar 2022 12:37:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647805067; cv=none; d=google.com; s=arc-20160816; b=QdRs+YbTWYtnfEhFwmTH3bzry05gSqZEdXg5sieTOXJ5NVrFGRGoYu9YxfAbz/dQp9 BIOEYPTCz97ey7vnyWqGhU9XPb0UYufSMmWtUC1kd3hLhqwoQnc0Q75caMGwlQ9sBTsa KOlKUENfe0jJzTJpl0/JL15d0HF4JlgTVKLXpJk94adCMEdgYrCHyjOVM8CtgEDvHiAc geXgCn/gn/XoyMLyzMHxSSQ7S9yjxnKQTmMLKHtEBzdZLckso7RL8wrJi3CDypGo2npv 31aumI5hiwM+8jQXWhUi8wA3yoiaPFkYMTx8BLfzcKIdAY2qsmsmTNNBsc1RiKJfPWbm 2wTQ== 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=R3DKCgTUe9AK69OVrdYS/Q3HNdsWunF/crXO3LgFsjc=; b=OaJURFhEAsg2qNeDI68Po8T+irKOudLQMYmWOeouqs5VswweZTcHw0LPGYxMSt3IUx K/azSHNoeCuYm8eWmlWdMhdHSrdko7MHBMGreQfT6Y6uJwwjmtrTCN+FwaXalnB/ZjjC cgNhNp41iIwzYcAnDr6gv5dINjzHKSTu/34Kzd1oS+raTARMFjS+qw5YE+11xNHsKz7Z 7EETSpxVdac3dbU+uwMWFjYPD/g48JhOfE0X084Wyn3TPKPms5hAmIdlQjdNtXKM0PIq rQYkvdWspe32dkbCtIik1oWADgnmfMhqB5tuSry8aZcSe0xdmw/aBzgvu8Nhy/He98GL vfrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LUrNS1M8; 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 g27-20020a50d5db000000b00418c2b5bd64si8622924edj.70.2022.03.20.12.37.47; Sun, 20 Mar 2022 12:37:47 -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=LUrNS1M8; 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 DBA7568B151; Sun, 20 Mar 2022 21:37:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0E4F68B058 for ; Sun, 20 Mar 2022 21:37:20 +0200 (EET) Received: by mail-oo1-f42.google.com with SMTP id q1-20020a4a7d41000000b003211b63eb7bso16856630ooe.6 for ; Sun, 20 Mar 2022 12:37:20 -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=qCQ6CCKjvING2gYwt1lLZBgCzE5HfOLGN19s5DpyFHM=; b=LUrNS1M8WVqdkwRIFPJW/I/OQeYg4UTa4rZkqv2wNAngKuecisO5c3iOZa/kdO4yXs 0HEuAGmAeDvtd7IjOreDsUj2pViO9FFRohGp1j1Vbim0Xkm90vraelHR6Li5HfGQg13h fF8zCVhTzqsWpEm4H/m5p93zptUEJP4hllw9+VJmRnwWr5nyL4eWwcpmr+30EBm9elyv xPAQHvbDeyKIJ6chM1+uDLevewc4bFlnUb307Kqv/x7he9Ebo8HmG46wcVscY93PEPhR FKqQWA7x4c2q+U0er7rkCs4I2oMYafl7QciG7GhNjCwFyo+mdmIzcjbAx15ub7fMNJap U0qQ== 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=qCQ6CCKjvING2gYwt1lLZBgCzE5HfOLGN19s5DpyFHM=; b=2Nf3XT9OD2pr61K++VmtrsG527XjMR0QLN8fE0gJAQvFXCdL0tnaPFBEGn14JFwwih seR03ll1eMhY5/Ha55Wbz0iVVAWjy9W439u4F19TlWEVSLYxAp9jkXdVqojNCEMxR+2D J9+CaekWIPAzpvoawy8dxWFeLlBIaD23K3brFqJs0G8BKMH1O4G95kNh0U6RBqVj4z7m /OyC10xPuSEmfrAtg+1w/FX/sAp6/PlYR/EI4PGIRHb5mo4RQe7w0rqyw2jPFvgI6V25 mo8bDS1sjw+rbkEbQrAPE4t45J7T4TVvmxejWXUv9H/X6UBGCI31o4oqZJtidlUUcIAt 6hDQ== X-Gm-Message-State: AOAM532/NAKI6oZo+KBy5hxCuXwJq/O5bu9x1j3IL1Ph8zOZCH4r6wI7 WzoCsRyHhxbmcTaGTeM1XxZ7+d+RZtT+SQ== X-Received: by 2002:a05:6870:5627:b0:dd:d3ad:c573 with SMTP id m39-20020a056870562700b000ddd3adc573mr4356546oao.46.1647805038915; Sun, 20 Mar 2022 12:37:18 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y15-20020a056870b00f00b000d75f1d9b81sm5418483oae.46.2022.03.20.12.37.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 12:37:18 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Mar 2022 16:36:15 -0300 Message-Id: <20220320193619.51185-3-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220320193619.51185-1-jamrial@gmail.com> References: <20220320193619.51185-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/7 v2] avformat/dfpwmdec: 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: jpp4S7SZh0Qt Deprecate the channels option, and ensure ch_layout has priority if set over channels, until the latter is gone. Signed-off-by: James Almer --- libavformat/dfpwmdec.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/libavformat/dfpwmdec.c b/libavformat/dfpwmdec.c index 9f935a422a..685b95148c 100644 --- a/libavformat/dfpwmdec.c +++ b/libavformat/dfpwmdec.c @@ -31,7 +31,10 @@ typedef struct DFPWMAudioDemuxerContext { AVClass *class; int sample_rate; +#if FF_API_OLD_CHANNEL_LAYOUT int channels; +#endif + AVChannelLayout ch_layout; } DFPWMAudioDemuxerContext; static int dfpwm_read_header(AVFormatContext *s) @@ -39,6 +42,7 @@ static int dfpwm_read_header(AVFormatContext *s) DFPWMAudioDemuxerContext *s1 = s->priv_data; AVCodecParameters *par; AVStream *st; + int ret; st = avformat_new_stream(s, NULL); if (!st) @@ -48,7 +52,16 @@ static int dfpwm_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 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; +#endif par->bits_per_coded_sample = 1; par->block_align = 1; @@ -58,7 +71,12 @@ static int dfpwm_read_header(AVFormatContext *s) static const AVOption dfpwm_options[] = { { "sample_rate", "", offsetof(DFPWMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 48000}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, - { "channels", "", offsetof(DFPWMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, +#if FF_API_OLD_CHANNEL_LAYOUT + { "channels", "", offsetof(DFPWMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_DEPRECATED }, + { "ch_layout", "", offsetof(DFPWMAudioDemuxerContext, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = NULL}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, +#else + { "ch_layout", "", offsetof(DFPWMAudioDemuxerContext, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = "mono"}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, +#endif { NULL }, }; static const AVClass dfpwm_demuxer_class = {