From patchwork Thu Sep 30 13:39:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30830 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp411512yba; Thu, 30 Sep 2021 06:49:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwE6hvIycYrum8kyEH9Bix4rq2ixw3eneRhdYbBjnmbGHoepkz6N/BZEVIyJ7Ipdiv36fU4 X-Received: by 2002:a17:906:ca12:: with SMTP id jt18mr6641592ejb.451.1633009754451; Thu, 30 Sep 2021 06:49:14 -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 bu1si3641484ejb.482.2021.09.30.06.49.14; Thu, 30 Sep 2021 06:49:14 -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=X+KiOvdc; 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 97C6D68AAD5; Thu, 30 Sep 2021 16:45:00 +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-db8eur05olkn2099.outbound.protection.outlook.com [40.92.89.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1EE968AA64 for ; Thu, 30 Sep 2021 16:44:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mYjSU0bUdz4Cj3qA7Y6n/WP5B/c3yvfmJU3+wIB2uaUktYf3uut34fkpRu3BVCx82n5E+8q3MwjSs+2a2emA2Cg74G3Ky3QyeI4cPahtkgvouHjY4EiJMscW6sOmx/WMz3MxZSo29GrfbDKKBVuvEjlhnJCgDA9rsC3Rc8BLOTC+E7MG4aYMUoSWkMJFlkrE5SwFR2asDnNL4m/ndE30AF6epMeduOASnblxI6WFCX1cgsVqj3Hi2a1UdTuseWu+rNjFKbULZLCnSgutzi7YYOQI3Sb1SDtFhMbIAuoKNcYn7qmRUDN33t7mRiK+MFUtg9W2JW2t3Tk4kiyFKqwS1A== 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=26YTd0YtudADBoe4QjXzg6IggWXOEXj5MEaQ9apSkuo=; b=C3aAeYht4Pveis9UfcymKD8PL3tHIaKjYpPLea5XhmZgHa09dXgxlsUrbRmQWMAOMGWLVdpXNVzsq5JC5SGSPozJMx7Dz2jEXNnHInpMLPGZqaioz00y8dgj31+3NGWa7OI7wMnJjC7BZcQNewdn6ZHM0M8HU+0iKt6GNT0wnKWjbJZTKPhybh0SCw7MhIf6F+FZY5rOF+p7J7IFVctgUvW+yCUz4zBvK21xR8uJOx357hytpsrYS1jj6EjwZhkz0X0wfhTFQkoLmGGsd00qcpkF3BTFTUpN5fBmBe2xzZzntp+Uh4GGDTtQHqgHj9+RvxgKYn6xsGE+IN6MoUplAg== 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=26YTd0YtudADBoe4QjXzg6IggWXOEXj5MEaQ9apSkuo=; b=X+KiOvdcj9Qnvqk7tdoMmO8Rd85I+jua+oYFDUIcDhSGcStFZ2taDVBdhCAt4dGpVX4R/5RkDLhjbkr24FaGLQc12Dga7HTXqMca8DWPrvBPyfHhqVOpKo18wYdD3pl1SggMHOFTVH2EMuZ5iQfjwW4br2sv0M3S9c/qgCCD0AsnUetCMkml2oiFWJkB6ZcLuMEspY2Gpf9YtWHZS9RVNFnW/nfo7lJYYzb+eFWI/CPSc0ZEKjXO0kU/4px6b6M2yjIXwOScGPV5A3gMrOOFWax3ma17AqWhoIf8zvY7s4Won/vJ3hyWYlyTmMQfBgd00ebUoz3ufJtXam8lJncZWQ== 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:44:57 +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:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [E7Zsr3mIecC1ack7V53Swwmbo4MDJJF7] 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-31-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:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ad39538-7dfd-433f-c24b-08d984187dbe X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV7GPXw1na9nH97T3lNsxOfz6PuF4tbwznRBwAyryY5h7r+zElGQMoZProYyjC1DYii61Tu7AgT63qefQWSBtGMFsWXvisFvwl14ZypeXKJOUKURIzh0UyfLx4nDmnp912QbsT5Cu0ep3ff4ws0idGwYJAJuT7SZfQWhCSuGTthJElc997+CtWPC5ryfHUNxMpKFKm/q78JBSuyBYpb9VoRe54DOI+pvG1Fms/0KttgTRnd7uXo8kHkzJ0jQuwt4q0nmA5iUDkVzjEu2lCip3w6onI9wvgdq/RsOrpQ+s0LYeLptlNDBUSWPHdsC5lez7OzP+msF8f24XyyFBrMcsVn7LkdHIlnlVw/c7yA9WvY+pjqKdO1WNcFl8vgICd9nlOWK5eoHkRrhQ7RFOpiAeoXtzs2fD1kz4NFEYEQNAh9kICPeTzT2nv85qfEJibAOHfEyjcjMCoo7lqywmw7AZgfGyX9XmIdVXmRS0A0N9JMj+Xu/w+5JUAM8B4nW92I+CM3K+ayBIrXTjNAtS2pjdWFjQiFbbVbzOvjIURHqN6o567HwycyOeRIVduRHlxLJSYVlco05AlW4AHPB2NtVaNTSs3WSBMzhjmLhgLpt3FaX1yllpeAkBpYv4lToMprpqreUCiRbFDHwIDMU3bYn66NXzcQ9SHqjPc0w6Xyg5xBg+XVtDzMDKSOM= X-MS-TrafficTypeDiagnostic: PR3PR03MB6428: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PRSgSnyFgJAlj32BSfTdtS2VvdqaGlFOC+vza6n1r8w41pb7aHmR8wzW3FY0hb1Pv8+Iq/49sGPsvf3u6LfvRc6m0lzc5Hda8JFZ7sxBgRIoJeKIMn0c+4pSrFNSpiZ4Tfn76klh0c0qVhvHU6iIn2xrln9aqN4AN63DhnvxG0lVfG02KlafaZhVhrKjyg1/FzwwKgF03pU094l31BPxtRv7fOYMIFmvhX99B+8ipv+J/x/hbdfpPxj3bashSBlGxP3XXqYU4CPxKmi+wCcc7qq9UEeWXn7IiIQocJ81beiDPPpl17aTEk0u91FCK2fdkK5Rz2tMR5B2QkpDmEKy0OBQT11iNuOWNcV7hm0DgSEcbyLLPO8FqCLHwyopk02RkCaJrRREO2QFXXz4xYd+PxttGbZX2O/ETHjPBmU80gOD05HVZ0jdy+iWjvi9dYaq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PG/9fN4enXCp77XGwXLvtVumM/HDVlMhEOJJLNLY9bGBc2vzIXXubwp2jLquh3V4MNqIAfn4yavvvAgWIAp15XAgI23hE35AcQ4gvSSZNd3EeMxzqQNwDawgilaC4hRoO9Ms1AVRJzIOyJDV81HOdg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ad39538-7dfd-433f-c24b-08d984187dbe 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:57.5700 (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 032/218] avfilter/af_axcorrelate: 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: 1Otw+nlE5Pho Content-Length: 1508 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_axcorrelate.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_axcorrelate.c b/libavfilter/af_axcorrelate.c index 1d9c805b29..8c5c429127 100644 --- a/libavfilter/af_axcorrelate.c +++ b/libavfilter/af_axcorrelate.c @@ -46,23 +46,6 @@ typedef struct AudioXCorrelateContext { int (*xcorrelate)(AVFilterContext *ctx, AVFrame *out); } AudioXCorrelateContext; -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, - 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 float mean_sum(const float *in, int size) { float mean_sum = 0.f; @@ -358,5 +341,5 @@ const AVFilter ff_af_axcorrelate = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), };