From patchwork Thu Sep 30 13:39:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30731 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp693092iob; Thu, 30 Sep 2021 06:53:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0yUiFaDyQvqOHCcwzuNlJbpMgUB53M45/KetsKOA4ShYKPn7sHQuvDbKjeDFLjy5449uN X-Received: by 2002:a05:6402:50cc:: with SMTP id h12mr7617429edb.112.1633010032386; Thu, 30 Sep 2021 06:53:52 -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 i11si4663349edb.132.2021.09.30.06.53.52; Thu, 30 Sep 2021 06:53:52 -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=N1oiRQNO; 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 82FD368ADF8; Thu, 30 Sep 2021 16:46:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2058.outbound.protection.outlook.com [40.92.90.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C25568A581 for ; Thu, 30 Sep 2021 16:46:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k7jZVT2odvUaSbQMqpf2/r6OF05FTQSG3PEaryEWmITQFnkMjg4KQwrb8mffXAoEooOEN8KtUxrWn1LQ3E3HUSrb22OnbMDRDxecrFzBfmo19JKtcLbWINua3GcQ+2Li+ejWMMljbLDSNJwqau2o6p6wF2ikRA+01XmBR28rG9MAKKR0lepr4yrNqwp5F1oICaNvegS+wdAL+5m1dREQ+YciEN78UfTYPtg2a0zvbVWZmwuhjmWqpr0HDFoRPIxA/f2iORzaMm9zgenFwffDQuLZ38mliUh+zxzWAu7pQLCZ3nKx00XnXLNrkwhzPnx4UEZ597iK0bsFLhR5h/JERA== 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=OXHT7NUMykAb2Bajq333PQTfBqJb35Qz7WvkAbAUyME=; b=UUvw3UL9YDdayEPbNHdeaZdZ4mhGElMrO8lAXwa7dcZ4WMIT697Ij9FTwWj9y3w84FmakiDFAUp2p4Osum2kkryomic05jho1eNXrOYUfYQkwCRAz39n+GQ0KI04BiA/MOBGZlLhkUe7yH7RfSl85GYfIamimhyYmSMWSgV1iTWHPzoTaWPtvqtFcDtAlV0n/oWE2WDDCJKrVIupC2tJkhduNyGnFr9e/JUIz5N/a5zh0B3Jg9jh60IaqCCBrQlOL+KsE3QsChYi3PWvlCrFBzZnC+Q34xAsNPAPQ85KpNGHE+Jd3c0w/52YMWfJhmFXvrCeT0tS9XSbUapm7m/F9g== 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=OXHT7NUMykAb2Bajq333PQTfBqJb35Qz7WvkAbAUyME=; b=N1oiRQNOGGbxoFQwnxcUsdiZaYxq5++Fu4+0emDCTi5VDKxrd7qWGuvhcQQMu0DNT/rFz2W88GDj6q251LnIuDfrGIxNzl4y+ecd+kfTH639yzvJmPRQshUZbXnimIUcRLA8MqCLu3q7E5+18Am4/8tFa0qhHxXhDFTS9y351ulq2SmgCl7kXoU31P1HtXB/cQa17v3r1Sb72QOIIUYHYTa8eo6pK/3Xefs4A+2u9Oy/DD080imOr3WMiEdrLSasmf84HuDi/YXWohmNexJyyofq6fRvGqft20ZaZM6IpHMJUaBKs3AFJkRa+S6ikaDrUdVdB7v0hV6QW5EbueNHeQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5163.eurprd03.prod.outlook.com (2603:10a6:101:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:25 +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:46:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:54 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [jDi0MkZin4HOXE9ihymcSyPJl1YVNDNR] 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-52-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:46:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb205f9f-41b6-4925-4a13-08d98418b20d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymIOARQAbZ9l0nWhlQq8d0Q1nB0j5z3dVvN3NFKdLxVEwAKRi5U85ao0YnIZCLHYrLV3G3cZyX7miw+IBonLTTxuSH3MtokrBjU/MBAOwSXq+BFFKmhulKH1Y8dXGxwEYgstQVilKUVsiQY38x30iAzgPeIkx/yv6+rLBMX8iIobvXwaof7DEiyhM6G/b9jgpjsIsS5dambMtgqWxKwHEDaRCC/kSn09cYfqEUBPjRrEASwtJVhJ59NTZshYWsp+4TT6y4boaaEESzqSrkJzr73hj7lsveYfYeP40X6j+2bVrvmY5zMd4jk3NNiITRMMgAu3SNUz6QmCS8RrPoThbfqU9vJ+0JXk4x6AF0Tq/nY4vdAQ7w68yGXzXTyEnnQ8mySEIXRcbRmIqcmWhZ4/mmJzJ4ITyfhtl0MjYMHWWqhQCTbPySMBE0ZMtSfVYXozHT6sxtrqeAjhjnOXZjqFIVJ+g6qXiEtl6uRSCzS3Btuztug8ZdvOyJ/v+j0ILjr3sDnU3XZ33D+ADyV0teshZXVjFIFt1OcE28KZGNGFFwJLl3nAkdo9pSiGv1zESd9OoRHmR0yNbjBYu+B97MUeJS1PL9S1A3EOl6BpwwTNdSEWVOBPxrHMV9trqWT4gq8K88QLPZqCKQWL68EmfhO22aIyiNXcJeJ4s0tMjoUtofNLAyf8h0vVNElegB0SKGfEIaWihdGimfOALhfzoDblnLZWI+Cfnm8r1Lw= X-MS-TrafficTypeDiagnostic: PR2PR03MB5163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6BMlBhYQsTbdJMuAJcOcJV9pX6/2yfDHFtUXz/Tj4zz5hDAo63xnmrSTkX56iKWY44ci8WQCzRZ9I8scH9RXKPXRr1bNrA81AUwwJK5kWeNtVjl9eaMv9BeqXsM8RqSBctiyAONxXOJ/B6oysXEf/w4TBJpgKtJAUHfpqLQA1QtHqAVJRHtogsAL6SRnMSWbRxoI8XtpdkrnQKQY0BwnizXlFC7bkV2TYIUTsrJs1hv35E5xsEsB3I/d2W7HCiwflkU92RIzLY/6y8KmU3qvLrU6LHTgo7aze2zIiO9Jo08O1YQ7gNT+9cknOt/5WZFvhf+XvIRz9QtYYjftpt6NWoCWctWbARzNKGPunthan1ociQOJ6zxDKKbCxXVRwRedFGJjPfLAYWxX5gdCOwEPuL0PfqBpbAoiD24HrfkvPxKPZ8KUd251PbFvvvSUxLbW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YFms8CqXOpa///et7JFMJSE57C+HvtJ2MiUe8CN9I3akTcOmNetc/dixbv5KqkeaoTT+wroQ4hmR+ShrBpE0MtjoPqWsMGwpgv9qDFxqMEZWFRJWxRORc03SjLJe5WDPlzOpzm3yrHxItcjhe339mw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb205f9f-41b6-4925-4a13-08d98418b20d 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:46:25.3152 (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: PR2PR03MB5163 Subject: [FFmpeg-devel] [PATCH 053/218] avfilter/af_afftfilt: Store format in filter, remove 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: mCNKxUa0xjQo Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afftfilt.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_afftfilt.c b/libavfilter/af_afftfilt.c index 7714f1768f..a135a99d94 100644 --- a/libavfilter/af_afftfilt.c +++ b/libavfilter/af_afftfilt.c @@ -417,23 +417,6 @@ static int activate(AVFilterContext *ctx) return FFERROR_NOT_READY; } -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 av_cold void uninit(AVFilterContext *ctx) { AFFTFiltContext *s = ctx->priv; @@ -489,7 +472,7 @@ const AVFilter ff_af_afftfilt = { .priv_class = &afftfilt_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), .activate = activate, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL,