From patchwork Thu Sep 30 13:39:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30716 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685665iob; Thu, 30 Sep 2021 06:45:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKpB9naU+HCjVci0KiA05Vds7twm4EHEqbCMI/WAB/Z4UOFP2nvj56m8TbgwX/92yvPQHh X-Received: by 2002:a17:906:32d9:: with SMTP id k25mr6884953ejk.290.1633009507358; Thu, 30 Sep 2021 06:45:07 -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 f8si3406642eds.195.2021.09.30.06.45.07; Thu, 30 Sep 2021 06:45:07 -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=gGrbsn9Y; 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 9F73C68A8F3; Thu, 30 Sep 2021 16:43:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069017.outbound.protection.outlook.com [40.92.69.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB1E868A8B2 for ; Thu, 30 Sep 2021 16:43:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GJDEOFU9t5C0ME5TsTtBpU5WS85nwYXyU/qexYFolM86tXAPSqy80Xpv4Hg6JvuUGLHJlqiuaKMo5TH0DmiCuAHAAgn6FlXTiCgvE6dV7FGpLK07xn1XLZICXDrirzPTWYTe2ZytGodQq9jcQKnyNs8pjaBmYhOnW2m6bu3JkTp6r5WrSS4/HF+2//zfQtkx3i3YcfKqiMVAwhsmlfWIgbM0mjckcKPnBwMPKMQUNThgurj2TEjfzGl2HZzKtAvGncOl97SJU0nwlU9K2YFt96zh1dTNdTdtZdMS0z+k/e/EEnQ5nDhXdEmWyPKF7U69XITbVdQpXQb3XqEdtnrfbQ== 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=ru8btT/XpJT+R3/8DNR+Ll4LWGl4gnw7Jvb7pTOoetc=; b=CmMd5a8Z7rC7XDvqnxMyvdsSnP7vjPXVE/74vGpqAx7Z2l4pSPiCaV04gISAHAJsu8dYD1yjjd0VCOYtjVUmszHf6W6vFhvQfe0lAYsCvugJJLUPUNj/7GI7ibP9anYRU/90I6NePO6aWRTNlG1fKJRmEfq8gXToSbjzIUTXZFbmnsj5FPUWDenvdV+X6l6NEvssDGE2MibZyydwLQ1C9bcBxTbMp8zVfF8+saouOKq/gji15aqSZJ6Z+Zv/TC5hSkN8KiG9IbyEAwRLorPsnSH5WH6a2TznnDRKWW01oNvKJSNhxsHqT97lRKMQPDL2gngOWA2+9ZxDxL2+Yz5emA== 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=ru8btT/XpJT+R3/8DNR+Ll4LWGl4gnw7Jvb7pTOoetc=; b=gGrbsn9YPnN8TfhRrPtqQFjUUJcgBXtyYppaAkOF6J7Gi0NLg32to0lGwEHow5kmWCgBJaCk2xpAhpE4NK+KsUJ/gL3eoBtw95BiADSaFouZ7WORYFAIkNqEdxcZXRZGhHrRIfT6ZFowU0uKYg7Dj47fJAhiW6iEDVpv2UcLKIRfUeyOHReUWXXXh0L60IfXrkFH/jE+s0JaMqMjyPLvmsWXOS5JZBfYNCrmNIJte9b68OtRtEz20B2anGn+jCf8V5KRF28VWlCqrRyUhzavsQqBxvs/tbrk4tOISbqxj2CoOV0eX4I/1Hs2wHD/nVrwHr8FT8MHsli3Wmrk8SnqbA== 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:40 +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:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:13 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [tZfE4wZfbCsvcCuydGkrg5k4OpdiEDGn] 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-11-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:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80170590-dc5c-4a66-8508-08d984185006 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZAhOZbxyPxDyUuDdmReL1a961HATbpTUYMfbk+YDf65Zh82dzDjLPEDh9Wu8IbneESRV7rdXKZ7BHhXtu3uLM6iJLU/3D6Gw+wxDcF64UlNH0qTvNeKmQOQNPM+pOx2zomKWBQkvMEU1oIv4MFY+MV4Ya4Qj2vFALpVQn1YEPKMFYIa2SIMRe8sJT/5frbcCJOx1oC397JkeYXK6JevmUx5XUPuVVWsssD6+gy/vc7MejdOOol2B2zxyk9RvVhwxYVIfsBcvLvYZQLljNyTuhUdImtIOmVeb6SzAMpCEeaNKtN4vThRO08CiHp/KDoXGGA1aNzS1AE600wdPa43Ti9BrgLLp/p0PQ7i2q1JPNg49Gh/n/sSmP+pFDMwnfTCGgGOrBpJPSoOkGhMAq+cr71oMpeFjj4jGC5RDMXfVPsgH7ti9dGzUcC7r3c+97fKhQ1PNO/3mrg4B8y5di4szHJnyuvQ1Hoe38Bb2FRr1t1TGOnkY0FLpOCx0Joj/Rj+2MmMGDJI/pMYuylxdbRTU/I5OCEkSYQdNLA4Txz7YSuo4KT71tsRWnbxr+YPVd+1rz9XrTM1OxwsCGJh1AKnAcpLMfTnE4K++nUU2kCq6g2BJ/nxQPlu89/f6Q5uMdT1FndV2HNC7k5P9mewoiVKLSvEN0KS6JiRdZPF+MSR4reerafAoFo5bnNJFQqI7xcbHM= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C55YtgVRSNm/NQj2meCCALChkrjV7Ivc0rGEKqTEgI3/CVOGmn4mxVRrwHfrn542DKxVOOdcYLBrXh9RYKsA21ctud21LqyCLZI0I2hXIBMUO5u9J4vZOtkPDkCVZP5cE4wJv833tbCe19Fjy/cPQAv7M7syX41SojmUSd1KbE4z0aAS3tYWLkJ7NgibpFuCo7Da/2KDAmKH82ysp6DiKDeoWJnsms+vo/8AuC+ziJAvBt2eRW0/CidLITbZcajxnrynmCt13X0MwM5JfsXGuHiWck9MK6/5KeQmsi1g9OQ/e4+dsxDuxBtDPsIVrNDSw95aJuvLrgP2elc9on6Ov8PeYcV0Mk4h9ugOU6QiPcC1yZ7ZH1dI1ZYquQe1YSm5sOaWRNvhx0FJVmwjVcUVmLrjKFDxW7IyS+FOAVj1+dv3OMxnSRotUTi2YWwvREJN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qKnJbFY6ScKwXPrKx53bC32s7J8S44piRcyMyjC+GEIvcKhDGSf0RsEsVQmeRmRxe0K9VAZ3C3fzmZk9Ae7uHklAXqMlN6SkkRAiMq68H8Bh23ePk/zhrwz7r6yFY7Op4Bl26JSyU9Se4spTivxnmA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80170590-dc5c-4a66-8508-08d984185006 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:40.9010 (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 012/218] avfilter/af_aderivative: 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: d0ZSL2wDBsof In this case switching to .formats.samples even allows to avoid the runtime check for which filter is currently used. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aderivative.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/libavfilter/af_aderivative.c b/libavfilter/af_aderivative.c index e37f978df6..baa272d609 100644 --- a/libavfilter/af_aderivative.c +++ b/libavfilter/af_aderivative.c @@ -27,29 +27,6 @@ typedef struct ADerivativeContext { int nb_samples, int channels); } ADerivativeContext; -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat derivative_sample_fmts[] = { - AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - static const enum AVSampleFormat integral_sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_formats_from_list(ctx, strcmp(ctx->filter->name, "aintegral") ? - derivative_sample_fmts : integral_sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - #define DERIVATIVE(name, type) \ static void aderivative_## name ##p(void **d, void **p, const void **s, \ int nb_samples, int channels) \ @@ -179,7 +156,8 @@ const AVFilter ff_af_aderivative = { .uninit = uninit, FILTER_INPUTS(aderivative_inputs), FILTER_OUTPUTS(aderivative_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_DBLP), }; const AVFilter ff_af_aintegral = { @@ -189,5 +167,5 @@ const AVFilter ff_af_aintegral = { .uninit = uninit, FILTER_INPUTS(aderivative_inputs), FILTER_OUTPUTS(aderivative_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), };