From patchwork Thu Sep 30 13:39:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30721 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp684740iob; Thu, 30 Sep 2021 06:43:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUXSTMYi9y5epptkIgsWIqlA5hOxLRj65PY/MCh7fEB9k/K4lI2mTt2qMdqtuDD0tF8oBH X-Received: by 2002:a17:906:1e11:: with SMTP id g17mr7192225ejj.154.1633009437256; Thu, 30 Sep 2021 06:43:57 -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 ec26si3185168edb.116.2021.09.30.06.43.56; Thu, 30 Sep 2021 06:43:57 -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=GyIvit0E; 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 D17DB68A883; Thu, 30 Sep 2021 16:43:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064022.outbound.protection.outlook.com [40.92.64.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E31068A7DE for ; Thu, 30 Sep 2021 16:43:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jj1jP2t9q4yep5fNBnVAS/xJwJsFp05g+xuMGPYX+guoidla9LJ0vEF6RO/gssxvnHiun9xgo5nc+c47l7RAxpba7rOwfwgNR3aYKjMxVNCEvnBAN65dedIjlI2mympo0IHJrHy0Huo2dSC+v8MGy/cgs+LNb+YXu5F77Z+6/NRGQgOYCr4jA6+clxvYg/MatDOj5JLiab4ouSlQBB0vZmMZVftSiVMwka6r3gR3kEm3MuX4eqxtuCp9wLPqF1DNGqz5Qo0oc1PLwEqiMH3Lkbkq6y4WS1/2Ztnlrx/iYqCElgVl/gH5izp4KFSBOagJNG65j1Jgsy2jdcpkXc3PsA== 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=6KUi2QC51lWCNxOp5jcLHVMw3JMs5HcJPOS8eUyLkiI=; b=iv+mXcYZzOz1SALWO8+A5aCCXVaU8iHA1ghQCYadJgSHrzLRfs6lcIEPLQYtBfi9VePzkSrFOsZz6c9WAOMFUdNTfg6FpOms4YlbbKAAxxzGCzX+HSo32UuL6izOYpsJSKHM1EnCIg0w7k6m4f3am1+GKzUvzEDOFsfuiGCF80fnm648n8lTRt1+jCageTvcrM1O9oTzH9oiCXOOaLd+/4DESImidRXxHAxrx5fzW6HI2Gof7DyYL6+aum/XihOkFI372QzYeNE6JqsSvTXvj22GAmOBYT1Bz9FCNY58hIWawgrCUZf6IXg3mRKwYLqhX5dDAKPSojaNrvGnI129AQ== 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=6KUi2QC51lWCNxOp5jcLHVMw3JMs5HcJPOS8eUyLkiI=; b=GyIvit0EkxVKwyosMfWjWbdlqdbdwWEvBzOLbtElWMw7feiJsFhQlWZFvELfRCx73U0iG3pMKgvLMPmtVppF/UHg0HeL7n0GdzwSJorEqcPCewNZROFWvqauU846zeOASjtZln6/eNtH9yC1X/VJoRONHPZMyMX6q2cF/yHcj3A+9Mu8DTJ+l2x1dqpo4oXMASRimORPfYg/HD6MM+UnDR7MKJaBDyXPuxD3smESv/lr4EMOuuObgUlP9w5fEUEHB6gBX1rCW7zh/1covsbQ4KStE6C4TjHWPXeb/GSv4WS6MBIGLFzvRZVmuoac0KHB75loum0hBshVF0xVLtBVaw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Thu, 30 Sep 2021 13:43:19 +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:43:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:07 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [MfYAxbuSX4DkzMIxejoke507aOokIVMu] 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-5-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:43:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9b4f340f-0836-4fa9-6d4d-08d98418431c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbNM4ubwW/IaMiaSCT4QfggIEqSnRGj0AOPQqQCfySNwVUIIdgpdgL5L6BohHjciyEW7RTgXTwZJoQFPOTdgXlYPs9UIj9ZwZ7Q1PKqgHdb0yjGHttb/9Jg/cND/Styuya08LZWuMzFbt95o6s9v0KOwXbj8dosJPZE/HSAWqUd5qT3lpyppdpa8xulrVQeoDEqvMdov4h5TNsYZHAthRN5k892gxqa5duJCia/Ck/bI8R4MAvWB3uCBtkk3FEBdGqGWkV51qn1RnpCcO0WD26euJF/zWSvRJ5gI5VgUfX1ENaWV1+9lLlyHie4QzWlwukDxwGUzYOFZIsMS4Qyr6zuU7YEID75DDWufLPyvBgw+EKUnZIPxOezh72jwvG2hXAcQL/3hF3t2yR84OKcXkmJcmc4iFdqVFU8pqsfmE2WzVT41no3Vfzi6oruP9jG0KpI+eD665/KPB+D8tSyNqe5/3nBWfZkPy8S0OuEcCkzCN0uBHKscWsK2l8boktuaglvh+WkD3hI7HytPWL7zvvUFi42uKX5z6uS/Muq8jpzHWar8GHKzU/ZFx/yvrtWTWga4fboz1japZZ6YGJROuJKRTNCwZfGy5ReUXRBtFnGyjZbEdRl1f5CM3RYpkFd+DVcFEwajo45+d9SLFqs+uPBe+erMcnnnZMzeqagHL2V+z151rPGo2Z4aIw9CBvqtK7cmvAHZ/bgVkeBw54I3m/9zzAYl9aBjSPo= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CqzkbMkuFOptuAdh+/5Z1B42bg9R3T6afgkk7a3xxrJdn3onQVhXhsUFKBSLxij3cggmlODIKLQSt7zSaHmd+QOUf0dDPCZkaG5pELDMr+0/OJo0uBWSthb+DPfvgYt0UnSVtgydfwtTVEcAIHR1+lG9/GB0f/ZYIq+acghF/rPj3uvyaZr9il1PNWnwL9nOvi8THpJ8W8Kk8Uz2xQ+5M6InrA8gx6H1bIFspJDjVl7o/EWsoG1haWcVmukrvD6/x900ovf3FTn4EkvSTJ3VaMkiJZkFxe5Xrmh4GPt4Ap4Mqbddpn2BhYGIQGU6qYYpSsX/q48gO/1l99nb4my0PtZWT5nkVHxIvaGky822m0MWjnMTQ4ZltR/j4ZQ2dj6/ZqRpDITvoJO7u18APhjCePOz6q/AfCCqHNpoTykT9IJr60OWf+uhJGnyGWq0Kq8q X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 82NEyk/24nsPyQ56+gERJglFoEBssQsHrj8gfTH89ABMk5vtVggTJDL4PhlBG07X/dFhDqpb27e1eVy9EiuH3/Ds2Hk/OuhOkMVGaCBE/arUM+DcatMxR8/qM3cz4srs1xnXhVXuf2MK1egBYBaxsQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b4f340f-0836-4fa9-6d4d-08d98418431c 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:43:19.1834 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 006/218] avfilter/af_crossover: 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: RkGK8IsAPaL/ Signed-off-by: Andreas Rheinhardt --- libavfilter/af_acrossover.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index 1ba847d31b..9c00e1ddc2 100644 --- a/libavfilter/af_acrossover.c +++ b/libavfilter/af_acrossover.c @@ -301,25 +301,6 @@ static void calc_q_factors(int order, double *q) q[i] = 1. / (-2. * cos(M_PI * (2. * (i + 1) + n - 1.) / (2. * n))); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret; - - 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); -} - #define BIQUAD_PROCESS(name, type) \ static void biquad_process_## name(const type *const c, \ type *b, \ @@ -559,9 +540,9 @@ const AVFilter ff_af_acrossover = { .priv_class = &acrossover_class, .init = init, .uninit = uninit, - FILTER_QUERY_FUNC(query_formats), FILTER_INPUTS(inputs), .outputs = NULL, + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | AVFILTER_FLAG_SLICE_THREADS, };