From patchwork Thu Sep 30 13:39:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30725 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp691489iob; Thu, 30 Sep 2021 06:51:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz30zrbceqfWzD8rm0f2ycQjS34d7LjQMqLKyPxXrwikf0jfUoLD7kEDd0XQ+3NZMF068CY X-Received: by 2002:aa7:dcc2:: with SMTP id w2mr7264564edu.192.1633009916267; Thu, 30 Sep 2021 06:51:56 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g24si3385713edr.84.2021.09.30.06.51.55; Thu, 30 Sep 2021 06:51:56 -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=@outlook.com header.s=selector1 header.b=f8ZyVOwY; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D841A68AC1F; Thu, 30 Sep 2021 16:45:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2046.outbound.protection.outlook.com [40.92.89.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EFD568AA68 for ; Thu, 30 Sep 2021 16:45:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h9M4xDjGsv5fMPon7h2AyLjArmAsSoAVEa9cc18SA1RRPmv0yhOd2bJpFn5FaGIbv8vAgcA1zkoLGeBVf3x00tMI2uBSZHI8VGBf86x7XgtAbD6xYt0v8Obwsm4yprGZ9Ndfz9efql7/Hf0S1SgF17rWgUjnoBNxCAzbq9Wp04HpkWqq8mRjSlqGf8/8Y++PnSJ5ZjS2TLndTgyK+TG4hjLIrbxcJRqI3yt5yTw9g2Jwwogi5bl5VY15bVNPIya/bW8nhI5GZVSFopa8PZ8XCkbX4gv1Dl8NQgFuWCqiw9F0k7SP5yWW8/aVgW/JNnK2bcdnaaSDy7xoIF3h5aNVUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=zrsNQBQwghk0Psu7pnAUGxhPGHSmrbqMtVnuwGtbEpU=; b=EK2KlMMo7MiKzRFp9XS4+dRRzK2OT3Iwb3MqvoGele5hRv4gY4GWcS8Gz4X/Uve1l2IFLN/NVmUUq1ZbBAmFq1xeg2iLcTulDjP4RCsdp8gHWp6IuUNCEqAB6qEr160dxJpxWUC0BRGaTXOuiz83eYP+iCC7nq+gYTXAdSF+uLbqlQXtwwhOtfN9lWafR5H6Po3lE3EwAvLk3f6vT3cLlpGT5X2ds5SuXZuoxv2FRveO440KL13i6djlFNuqP8y4HugSLO8t9Qa0JiQIIlS0ssemwPkJ+txjYCtjt/hrrw6nYirhrLtvg3gUC66zP/8OlZk7t4WVRL51mk7Qv9y39w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zrsNQBQwghk0Psu7pnAUGxhPGHSmrbqMtVnuwGtbEpU=; b=f8ZyVOwY4+zgzyk0ag5ZQAMiFQ4NzH9BNPpo1bihyJCRpwY1Syr1yGVjybnanDn3Kh2DOmmv/5lNipQeh5EzCj1VNACnHVklnr5W8Dm79Staa9esSEmMdO7Tn2l6sWxq/0KLZmnLag5MgKgmdeIzrcCgYceV73HMeTplwXdWdTW16Ny8bNvj07T6b85UjuZIZw6bi1xab4FgWhXWjWZCKZEDN854TWley7jwwXRfKslhnWxOtCLrn0iSIZlmgJicRnAWSThH2IuBzT0+frEXvqEinjp5p0yQ0JX9f/UzKR/XDQySUWEajv4wY5Tipnahmg8yP5WoA+OrBpEYB9cesg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6428.eurprd03.prod.outlook.com (2603:10a6:102:77::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:45:46 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4566.015; Thu, 30 Sep 2021 13:45:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [8pWSNuBXOx9oy1XaMNzoBT/wEbuOlg+V] X-ClientProxiedBy: AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210930134239.2672698-44-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15 via Frontend Transport; Thu, 30 Sep 2021 13:45:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 861f7eb6-85c9-4ff7-9251-08d984189abd X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FDEU0cQkzOOhj4g5FyTbw+XuYuVM9wLG6U9Kct7RvYDH6YjUpj2y0co0Qfw2UKvgzqBGTjiyC+Hc7UwG3xiwFYA9Z/xR06pgS1l5SJeQ5AEN5k9m6jOFpJ40rW2inC7nzWeDOJHUYE/l7gKknxOxlZ+BhAbCDxd97Lyokhrv2E0envA6/qycc1hA9y1bZ78SIE8ObGmRV+Zs6xFyfIJEuhS3F3nXqHtQIfSLKhS0htbJ8NL/9AcD4aO3PdpjgthO4D74CfGwmb1gL86pLUYEHkv/058nEgp1cNd4RNyn773OH9y3pBpTNE4+pzEeymRV2Kz6HrZEiapsbMyVASpGDkYFNaymZnPov5nS+TYWRbs4m+GTsRpSis0PBQvK+4qBB57HcQnUTn0WB9WjQ0ItgfrIbd44xZSJRK6Ie6gleRIX8DEOF6DPtJkyU5U9JmL4FfBxzjmnzGssdF7pFdkjwyb1HF9iC8sLWNjhOozK7OLn+OeWpA6tf2OxZkdCZNensLMcxm/pcCbSIq5t8nnTx00tL40/0cZ+EOzNPJ/gWKM3GeGh36ZdS4EAKRhwjMXW1iyh2ycM3wqxDyi3qMx6fLpvWDr/WD2s/BjPZoRPCpkAAPcFzd95AcwM2vHPDS8uytMHCUjufr8bARwYb+v0PmUxoVrnvxbDFtYqfPPSCi66qO26S8sWjSI= X-MS-TrafficTypeDiagnostic: PR3PR03MB6428: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wQktCyoHnUgUx58KZtze7kb0+c4UrXotIQ0TTcgrsKwKlQl+h5yvrFNbUySrx+AQWlDxuQgY6Gubkxv4KJMioAGHs3OZx5fbSrvr/iZ3gRpXrmL8mJHMTjibUPxo6wU/OJ01xnvedi+j1pVbgycYZPEQ7q47HcuCSo8+lvh+rOS8pJcR9c3o2d6wTS6bhvSpuMJLbm8yqzaXRSscvY7P6Tk53wQGQKxGqxUHaDpcPOUxUHU1jOHzSLFEOy6rg8i9OCQrBq87wHKhISrB7rYr0cX6GOvjQTOxJNcHck7QTzbFBhaLo8tPKKSeMhH33C8/rgmaH04eDZVLriJ4KQwLPqpjLHdJCpRp5HL5X6BiHsuiEgjVL9M6kcgfon/Y0Ut5PONdtVjP+c2Ou1Ul/60dd/hHzHJ8Lk52oWFP2G0sLGgewvR9GdVnkmtwytp2VkKo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ONX6oD6hhw9kY/kLB6MCZ2PaV8a/jEhjrAKG8lmkkriMd8Yya5quRiPxhOEpb1553tMrJAFVfwScwQTK/Xwnn6LRlYr3cvUcgH9xV007KqH8fewn+RzzDhvg44ixuKI6Z6hAemcbMG4CYfcoaes04g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 861f7eb6-85c9-4ff7-9251-08d984189abd X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 13:45:46.2082 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR03MB6428 Subject: [FFmpeg-devel] [PATCH 045/218] avfilter/af_sidechaincompress: Store format in filter, remove query func 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hMpvXFcy8pjj Signed-off-by: Andreas Rheinhardt --- libavfilter/af_sidechaincompress.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index 7359ba8e7e..c0ce82066b 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -406,23 +406,6 @@ static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *in) return ff_filter_frame(outlink, out); } -static int acompressor_query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_DBL, - AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static const AVFilterPad acompressor_inputs[] = { { .name = "default", @@ -446,7 +429,7 @@ const AVFilter ff_af_acompressor = { .priv_size = sizeof(SidechainCompressContext), FILTER_INPUTS(acompressor_inputs), FILTER_OUTPUTS(acompressor_outputs), - FILTER_QUERY_FUNC(acompressor_query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBL), .process_command = process_command, }; #endif /* CONFIG_ACOMPRESSOR_FILTER */