From patchwork Thu Sep 30 13:39:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30693 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp687388iob; Thu, 30 Sep 2021 06:47:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEU+1dltQTbH0conneDbIjmmU3r7mQquzQp78q6ZVnM8yfYcIj0f+4VZ5TSg/muLeqhEa7 X-Received: by 2002:a17:906:2346:: with SMTP id m6mr6821208eja.512.1633009626457; Thu, 30 Sep 2021 06:47:06 -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 c11si4286614edm.59.2021.09.30.06.47.05; Thu, 30 Sep 2021 06:47:06 -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=KHI2CxBb; 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 D0C5868A33F; Thu, 30 Sep 2021 16:44:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068051.outbound.protection.outlook.com [40.92.68.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D282668AA09 for ; Thu, 30 Sep 2021 16:44:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KhjcwrEcs32RSaEK62ZM356qV4CK/j1klQO3fz5ljz/Nd6x7gPIuGetjC17FN2wiQz5s53O4VyLyYc0bDSONwReUZ2L2rKJC0aSuQCqGdqAg73fBehJOHAO1pNushPYRIFhkzPHZWXNkP0s8Jchf6ewx8Iyfyneb7GRRVvXuhI08oDpYdII+Tcpr8YZxA7NnCdj1olsOCYna38MX9pfpl26dhCg47MH2i7E3CJ7pFrAID3nlLkXusruknFfibtLwsP2D6ztrE4rXB+sby1eEi1rAM41cJpbX43ArLxvqoMWjl0vjywreaWuQL+npdNj37WoCyHRrZgMXXuxUrQ/lPw== 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=epGa5YQpUSUD3EplQCyo455fVUANWEIpmFNI2T1HTXw=; b=XExAQ17I0+e5qzQ3/uanBaskAM6SAIKRgcEPHks1v+Mk6qWJ0kHf3jXSQh6/+L+QYMsM0jvE/gwZxVJz7Ttf5FUyfn7k7Yy53/yGvL7j/MjbNkcwg+W0SF+a+D9T5kMi6UZsNl6SQJ+KVKgt3wdMyLxcJ1hzKC0uD+8UneFcQq2p7jGuheM2fwriJuQMJ9un7FtONc1rh86NE+qEW2yoI1sIa0td4lco51A65HFUsughq+nd4QTEo6ZjWcbOl3PRmRmUnL5LkXXPPZ41OHj1c5fmHWL5peBPEix8IDJdRbKhWEJFyDz1SrwGqHmrQTRDANrR5ibnpSA/+KbYV/0AEg== 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=epGa5YQpUSUD3EplQCyo455fVUANWEIpmFNI2T1HTXw=; b=KHI2CxBbb3YVhu0U+P/aFRMkB9RX6f53JVqk2RHOXPW0iF9S7A6V+Rrxz1M3E16ikna4n+P5XnO03GA3Ie9OkCzDCFsWg/GqgmBYHeD10cg3qb/naX0RB/VdD5+z2m2qagk6GJXVpHy6yXk+vy4p2d14SdZU1w7mKQXCS0Ool5nl1I1DrI+7/YHRVBQD/hjTGj+WvtTYl+i3tekf2fKmwjfkZTquUcFG06cG+2h3YfcMCKqiXSdruEVvl3pQwYkyilecpt4aYkjYPYfeRLSGZMcCJEpOIttKOVzEraANy7PToBuTWbdrNP3OpSSrfVkQ6dFAuF8M8iZY3yYoOmjxJg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6733.eurprd03.prod.outlook.com (2603:10a6:102:f3::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Thu, 30 Sep 2021 13:44:08 +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:44:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VydTv27yGZ4+09bixWIlrLzn+nL5m9mo] 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-21-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:44:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9bbeed01-a962-4dca-81f3-08d984186062 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FIIGC7DhbsGlWDlBOTo2PprYx9V/8/v2Ifvp7P3tWKRfrsriGA8tYTPq01/Uznv5FYOPJIbjKYd26Nd4ebWVxpVUwkIEO/19/Ov5/k3HJXBZFrUK/hRaSz5d0mlC2GiMZ/yieC7MVxnzKPN7kLgusRp7EqRpVGNLadKSiPuFEh1DxRAG8392sHdVgFtIcytLo8/7bySN9A3oo7MPrG0ARg2omStCEtLqM8znpPwQC5ocT086arbWcTAo7WtMKtxNATskxSu7WkaLD1p9HpLezmhw9tormxLFPEZNFnn/nZv7PxcldCtikSN1ygy4+xa2QXJT1tI8nywBpiGPYcYZuYAj0NbON0+ykGdWIzgJt48jFE2xi66hs+nJTMN1LGCmvwkUM/5+dtKMGcb+/49yjii4B3QwuXo04KWK5TfGQa272sSqWDii5IuNzS9gO/+6q/SmR+wfr05WdtmxCsQrkAE6mM2dq2fkZ/KTz/W2v1xsN2+CUBXVSMzuPF1jsMGNAb3MGzaC+EUP6xQhzg6OS7SdV5nRj/DN5jAEkITZosTNndaDbZswlwg7p1Q3ae2bN8QY2uYp+Ndc4zc+lfdQaW0EFR2aLLVZHw9odgB3B+As7xHOgzcqiP7Oi+4FhAzVNymvwkM7115Kzv36THxtSbL9QkSB0nbeo3P9STwx+w5c2zyEjG4Zqq4= X-MS-TrafficTypeDiagnostic: PA4PR03MB6733: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pFLhTcOcvw8ksVF1cciWXLUqfYPVbITXa3YW6NlXGYkR0EfWns8myLGKUssdjD9jHUx6B60Zoo6oa/QZd5Jl7zKkW3R7pPx0SdN0I0nQFoxE5jGyn3RNUe5x3lYh/e+Gq77W7t1sms86lzrHeHI2inldrA8r0IRZ4L+ABYVX3Ps8cfvDepJrgMWixbQohsZO7dHFD9W/X+M0I4fav0cGajpBQp2ElAdlx63XabKbDyl+UCUwVKRb86w2Csf4vx1gH6zpgDC7hmFaC0oOhsi/1qmOKqxMGRh7jc2WHd3Qk8FCkFr/W4dEpD3jfeLc/ulBFyTSJ0kqFB0UxxGonTmAcq49GlIAkCrYQl9FNY6AzCToLxS3Xfbv7ytAmiYR5m1nwAR3rz74HfNdyvvtsM5z7c3YONHNyS3C4d40rIRTf+ZGZFs+HzoRV8haId4UXAm7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: deMW1rahq5qDo2IUgcK+haVvh4eEvHLMoriB+gDz5fzyFEuEOdc27074dmUtBEgIrz5RgxZ7taT4taMoykFugG3Ioh3Dhw0EuZUm5e6v9oYyOkC9m1i/3U1/c2dBCZHeI+Sn4fDkCnOaP21WeTcsAA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bbeed01-a962-4dca-81f3-08d984186062 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:44:08.3065 (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: PA4PR03MB6733 Subject: [FFmpeg-devel] [PATCH 022/218] avfilter/af_amultiply: Use formats list instead of query function 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: UtAoDN04z+nE Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amultiply.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_amultiply.c b/libavfilter/af_amultiply.c index f9413c9fc9..5de711bade 100644 --- a/libavfilter/af_amultiply.c +++ b/libavfilter/af_amultiply.c @@ -40,24 +40,6 @@ typedef struct AudioMultiplyContext { AVFloatDSPContext *fdsp; } AudioMultiplyContext; -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, - 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 int activate(AVFilterContext *ctx) { AudioMultiplyContext *s = ctx->priv; @@ -198,5 +180,6 @@ const AVFilter ff_af_amultiply = { .activate = activate, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), };