From patchwork Sun Mar 20 19:36:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34861 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1114853nkc; Sun, 20 Mar 2022 12:37:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweA72/C4l62ePizIs4Q/Fx6Q862x7aV0rx70qOHrg3+XyqLf+fJdyauCZmmaCs6SH331Xp X-Received: by 2002:a17:907:7b9e:b0:6db:2b7f:3024 with SMTP id ne30-20020a1709077b9e00b006db2b7f3024mr17511217ejc.29.1647805050478; Sun, 20 Mar 2022 12:37:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647805050; cv=none; d=google.com; s=arc-20160816; b=sNf0d+n7OvxCeIcZSzSmbtxQRfeF17bovRNsAP7913SmPumPCpMvPSV2wj+GTHigXm vtnsazDInS+FW2jZQQOhjy6wMVfJiRrMBLbhonGyizbRHUeddtrHMf31+RlsQpjgSGYH f90P2fTgroeUA678gNOnikVqmtpGNLgAF+NEhntxfOjNO8jd3WZMeAY6aNMouocuUJZV 96LEgahaqJeVmRug88f7Xq/iYdd9ccFHg1bqDVgsecCOLkwJ0TKATbznjvq5E7MDmql4 aX8FHPLK3BYhdSUkgfUhrrswm7OoWlTDZ+TTZXNIoDp8JJAVOUSixTZ3CUNcDaRdEBuY OjLg== 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=XL7TXxUHJ944FCqvW5b0nipuUNqyZh6ZNLMnbm8l9/c=; b=DVcFXoseil9pnLnQfzsbB+N2leAHByWt1Nq2PCUfe6SHXHtb3+JujWv9y3yhGOgQym 8WNZ2lfa+XxRKImFn4RnD95jcUPBG5auROqE/raOBOsZUb5++56pGoN52sZrLXiBDeJg vC9uxgV7UnZdFa6YR6YeFtS4CUk74ugm27CtedCtig/OHDxBTb87jmrvW3DrkAPXnL2r PbF2vbNy9Nvy5+Bq3ZmTMZU3HIBdh82YBtHhcM5zq9bAEVDlNNyQIRHiPHnwN02wIL/o rO7RPabLL56JN6sqt2TTviX1faoZyskkZt7yGxYtSCcskUgBBFp2Qs8aBizKY1PxmBn3 5Rng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=e47wGqnr; 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 n24-20020a17090673d800b006df76385be7si5436668ejl.135.2022.03.20.12.37.28; Sun, 20 Mar 2022 12:37:30 -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=e47wGqnr; 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 B630068B0A2; Sun, 20 Mar 2022 21:37:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22F9D6802AC for ; Sun, 20 Mar 2022 21:37:18 +0200 (EET) Received: by mail-ot1-f49.google.com with SMTP id t8-20020a0568301e2800b005b235a56f2dso9266007otr.9 for ; Sun, 20 Mar 2022 12:37:18 -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=qZQBzQhXcoMi8bQIDutwMF/kkh5c6MsMc671Sj+vmq4=; b=e47wGqnrHcb58WDYAZ+KmakUZdTU7VmV+3d6oVL40NV8GF02dh8dyQwOB6ZC6+6HwW yBGLqb0A5b6mhrn2VplRPc7ugohNBP3lkCtGkqZ6tn/Az18Xez96cfMx20Lr6GOqdRRG nO6AP6Rdeo9rjeNz1ne+0xi2uXJEH8LZdMvi2sAiqrQP7vC5Qyi+isuNhP1PJfV1sASv k6fYIxRH3ZwRWkRpIZ3pqt5yZAGR8Z2GEXYhF4bPCz7zA2a/AK4LCdwxwZrzyyxG7+71 ilas78apezqfuJMVDjQkvyVWgeoeKriqVF89/d12bm/D+reh0uzhDxqWqtKX99kE/M5f /Bhg== 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=qZQBzQhXcoMi8bQIDutwMF/kkh5c6MsMc671Sj+vmq4=; b=lCiATw0KbEomtK7/4ZpfixHMljlOzkMTWsf+XikPft02PFy1znVb21V8ZYJEGiIZxV LQeFZ8RSSKuP7lcii3zqopRRkcRTml8/Cpi3Th/unI3I5Ib3nJzdXqXbdBBo7KIeDTj9 GyN8ra0TtsXzLUVpDz1UJvFh1dSGrZU2/cyE13a2xL8/q+3BZ79zS1OvzuFHBWf2pMRC eBPtDmuuEJ4PQFZh/PIaXfUA3JhZVduHS9bKgDOG/HtWdrIp2DTqYhI3Q5wgoRvoE6xU pH6LQXv3BbIAlCYIwe6yuLf7vXc+wp/r7fmi7xOlePEtinjVQslzHzGl3aN9TXiXeS0d jzWA== X-Gm-Message-State: AOAM531cTHh7V/M7Vv0PUx0cta0KcuprEgWU+XmN9fF9MyOwu0/8LyLE M6iTi+jtBT6zLwtljLBo6sF6itZH7R97Yw== X-Received: by 2002:a05:6830:543:b0:5b2:5cac:6ce6 with SMTP id l3-20020a056830054300b005b25cac6ce6mr6878552otb.115.1647805036148; Sun, 20 Mar 2022 12:37:16 -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.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 12:37:15 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Mar 2022 16:36:13 -0300 Message-Id: <20220320193619.51185-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/7] avformat/pcmdec: deprecate channels option 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: LXtN1c/pVlkH And ensure ch_layout has priority if set over channels, until the latter is gone. Signed-off-by: James Almer --- libavformat/pcmdec.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index dcd13787d5..962faad4a7 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -33,7 +33,9 @@ typedef struct PCMAudioDemuxerContext { AVClass *class; int sample_rate; +#if FF_API_OLD_CHANNEL_LAYOUT int channels; +#endif AVChannelLayout ch_layout; } PCMAudioDemuxerContext; @@ -43,6 +45,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) @@ -52,13 +55,16 @@ 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; - if (s1->channels) - par->ch_layout.nb_channels = s1->channels; - else { - int ret = av_channel_layout_copy(&par->ch_layout, &s1->ch_layout); +#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 av_opt_get(s->pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type); if (mime_type && s->iformat->mime_type) { @@ -108,8 +114,12 @@ 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 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, +#if FF_API_OLD_CHANNEL_LAYOUT + { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_DEPRECATED }, + { "ch_layout", "", offsetof(PCMAudioDemuxerContext, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = NULL}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, +#else { "ch_layout", "", offsetof(PCMAudioDemuxerContext, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = "mono"}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, +#endif { NULL }, }; static const AVClass pcm_demuxer_class = {