From patchwork Sat Sep 11 23:40:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30167 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2756891iov; Sat, 11 Sep 2021 16:42:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZV+kHmoPBp9iAoduXEfb1BzdQnnvgepr9/KMng6kNZ2QlXwoBDvDDn7dpPHd1Fs5S/N22 X-Received: by 2002:aa7:cd92:: with SMTP id x18mr5305148edv.325.1631403727745; Sat, 11 Sep 2021 16:42: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 ml13si2903583ejb.579.2021.09.11.16.42.07; Sat, 11 Sep 2021 16:42: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="Efu2Fc/0"; 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 3EED568A8B1; Sun, 12 Sep 2021 02:41:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2068.outbound.protection.outlook.com [40.92.91.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D16C68A8A5 for ; Sun, 12 Sep 2021 02:41:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MVplJQHPZrT6KH6OVNMdrYfMnHL4YvXTEaA4IP+UVc20tDTUrePR/ajLZfIgsx4KU7eNBHzewIjqYx1hM/QB7TSALZHlMhriVlrh2w7D425+WqoCsy0SPYoJnTZrelxSqkom6j2J1l5nGSicnanvMlGKXNZ9f1KwExMFOiJ8ZZpMPiOY1f+6rhBErbjZw6VtfY302Cl0OJapgN0B+RKNLangJNC2NO6YO6Ht7xySgwn8dXdFKuJspuErAtA45y0Uf7pfkbUTQ4m2bKaNf577pH+qdb3hz8OHOJ0RglwD96E3BfTPnrHFZAs4/3aPzYsyH7U/9fTdAbqQh2rGy6cfxQ== 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=0nd6Mf605u0e4TLO+jbUYuIBpKJHXd1DwsttucCBWAo=; b=eJF6btaiUHUaewyJ1btciryxxzxBDtRu4wH6Rgo2PkIjhEhsE5DMMVef51dTrGTFEwQ5HC0fX7NBG/YGSpXjMUY1hW7bUPH20ecQrUzbZ7MRZYcBj/xfxI5MtkdYCYB3i3y5zAjoDTviUr2HDaUpgHiC1xiDsaC/AVUu6bwvT+ruEmFY0AAJ1WcXWMcviC3i/wFro8xUgX9qP7Xwtz7UBc8hFBWuhv9iEqOwZ7jxbRixLwexE3/qvDH/i2yLJkbPKyJ59LTcXMg3zh3hRJo9jZiN+sw/l70//dxKARHjyN8qnDvaNhLdm86BsIvbJw6HE0sCilwulG5ZC4R/x1f5fA== 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=0nd6Mf605u0e4TLO+jbUYuIBpKJHXd1DwsttucCBWAo=; b=Efu2Fc/0cxve6gawA8YIbez7QnFWKWiM6y5BEc4Xa+pEd6xRS0R+5qEVbQYsNCD0KhmBn3FmQx3eKDidSHpF8ziRn74mrZ123WPzQBmNf+lrbsk+uV98Z4A1H6nbIF7bqeuN1G/49StJw3+gmIJp3ESLXuAW5Q5ZdQHTze0UPxgePrGc4phANyOrw2F0hpP5i3X+PIxxVHbw4Xpd84Cs1ej+Rqr/Nvht4IYwfAdcXO8YXPhghY/DS2weW66nzfzmneNUflLcwR9wVLjFtYLmkj2W1Te6SIpPKoOAS0VwNr3okwAULaTUr/L/Fdzof1322iZn30+cpmNR7LLofTanaA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:31 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.018; Sat, 11 Sep 2021 23:41:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [xiLZYEI5Ov8mXqG0ejzUbBz9MZyZ0QDz] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Sat, 11 Sep 2021 23:41:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3400e4e-6be7-4725-447f-08d9757dae70 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQfmMn7lLS9s0YsFf7lSoleG9SoayymTbAJUK4SoWPuIudJP5N4fgWnHou4LjbDiJh+ru29wMSL9iRNKCT80+bYppn77dAyssx/I5RU65eeswb5oJraTut3B+UVOSk+Q7Sl6r4IsRTceQ2mFtlLfjegHh4KnE031c4WraqudGyjoeeqkZB7fx3wND7BgfKSlXr6mUui0bJe3JbKUhYU7IEdPGFBtJbZBnWy1zPFPTeNgUJ+wi8p81w4jAv8L3WnZ9bXvdEHoOTS8Aoa6m1d3sMcibG6JLtQWlS90ESayd7h9LeQNMUuOm6Xr5AR4gyHccC6QkJ8iSJ1CZYnHXRjgcKKhtcinoRABRXJq6K0OQ11LMXuKoYFTQIl0oAizJUNhv7cdfa6LoJDWyOqqKLuUQ6TQMXPQqM3Bc8vp6vL6BwiPLxW44zMs4J5eD0adSFd8rMYJItYkDKiM59tfgdwYlj8TbJrUOyVw03izCMJ9sKS4SZux0LW/SR0hSZfCcZVhOC7kFX3I/5lP1604WXKz+BDr0Krsn4tMEF6q0IRgcvSbXJA0Yd7jmlhGAMZael76ueX3Euefs71J12Pii/JLOfc92FvMGtRJ+SjHOc+tysCfaLi6BMQ3lE7PJ2t8aXQyLfN34zO3ABBz4rLEYQ93MIIvJujs7EKY83asCIvFkf8jBpdFwEP9thxbVVggoixtGXrneInTSRhVnXqEcb0FrkHRXF+jLE7nxfc/kIfP6a7YPpGvmGuRn7XduqUEKM7Z6I= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5uDJawUypIlM9CZSucjfMOjCRIC3yIpnEj9WIXGtmomum9H2OUfo1VgiF5yCI6YHCNSGDnzz4M1uHmta7zy3rKkMzvmxuUDCLh6QhcJWdhShcUvo/lgVSxPg7lwSZekp5xUJqLA5fnaQjNPR+6f6Nic69sXCIaZtTN9asAaQDjRDcMFuItii6bXIgl4i5DWVJ4YFBrxkdjWvo5fS2GnWTP5YCdtajIeA8tyRQVgU8uZjk+hrJIZdqQeDdaI+lI6QCxBEBdSdTSDx5DHZQHPUKgOYAgdPNIQ+s4RYMaWb5jRr64GIyFajdrsnERGe3pyUPZcDBJSnSljN7TvSBhq9Ci20pXQoYl+qFYR4FXHcMTJ74o63u/83mfXOqCAwX5Y3FVpaCVN+t5sFKeN8kYD2O/9Jl+PHPu1iMvk3sN59Sr29gpiexzWIAJNVZD16LsCT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mf0Bks24ysAWnowjz5cK1yOwfIHbUEVlM7D0Eo+0z61psd9dPIGO7KsNJfTO8e3P4tj3C4r0iLMTFodJrEdE/u/Dgj/Blkvz49RlWGUJfJzQTXaWs1/ISu7duHkaZxE5LWQbK+OxOxa0rBDBQSL85g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3400e4e-6be7-4725-447f-08d9757dae70 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2021 23:41:30.9562 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 05/39] avfilter/vf_convolution: Deduplicate AVClasses 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: oLjC/xQzkMq7 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_convolution.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index ccb3515bef..c1ebf4c791 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -974,23 +974,23 @@ const AVFilter ff_vf_convolution = { #endif /* CONFIG_CONVOLUTION_FILTER */ -static const AVOption prewitt_roberts_sobel_options[] = { +static const AVOption common_options[] = { { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=15}, 0, 15, FLAGS}, { "scale", "set scale", OFFSET(scale), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, 65535, FLAGS}, { "delta", "set delta", OFFSET(delta), AV_OPT_TYPE_FLOAT, {.dbl=0}, -65535, 65535, FLAGS}, { NULL } }; -#if CONFIG_PREWITT_FILTER +AVFILTER_DEFINE_CLASS_EXT(common, "kirsch/prewitt/roberts/scharr/sobel", + common_options); -#define prewitt_options prewitt_roberts_sobel_options -AVFILTER_DEFINE_CLASS(prewitt); +#if CONFIG_PREWITT_FILTER const AVFilter ff_vf_prewitt = { .name = "prewitt", .description = NULL_IF_CONFIG_SMALL("Apply prewitt operator."), .priv_size = sizeof(ConvolutionContext), - .priv_class = &prewitt_class, + .priv_class = &common_class, .init = init, .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), @@ -1003,14 +1003,11 @@ const AVFilter ff_vf_prewitt = { #if CONFIG_SOBEL_FILTER -#define sobel_options prewitt_roberts_sobel_options -AVFILTER_DEFINE_CLASS(sobel); - const AVFilter ff_vf_sobel = { .name = "sobel", .description = NULL_IF_CONFIG_SMALL("Apply sobel operator."), .priv_size = sizeof(ConvolutionContext), - .priv_class = &sobel_class, + .priv_class = &common_class, .init = init, .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), @@ -1023,14 +1020,11 @@ const AVFilter ff_vf_sobel = { #if CONFIG_ROBERTS_FILTER -#define roberts_options prewitt_roberts_sobel_options -AVFILTER_DEFINE_CLASS(roberts); - const AVFilter ff_vf_roberts = { .name = "roberts", .description = NULL_IF_CONFIG_SMALL("Apply roberts cross operator."), .priv_size = sizeof(ConvolutionContext), - .priv_class = &roberts_class, + .priv_class = &common_class, .init = init, .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), @@ -1043,14 +1037,11 @@ const AVFilter ff_vf_roberts = { #if CONFIG_KIRSCH_FILTER -#define kirsch_options prewitt_roberts_sobel_options -AVFILTER_DEFINE_CLASS(kirsch); - const AVFilter ff_vf_kirsch = { .name = "kirsch", .description = NULL_IF_CONFIG_SMALL("Apply kirsch operator."), .priv_size = sizeof(ConvolutionContext), - .priv_class = &kirsch_class, + .priv_class = &common_class, .init = init, .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), @@ -1063,14 +1054,11 @@ const AVFilter ff_vf_kirsch = { #if CONFIG_SCHARR_FILTER -#define scharr_options prewitt_roberts_sobel_options -AVFILTER_DEFINE_CLASS(scharr); - const AVFilter ff_vf_scharr = { .name = "scharr", .description = NULL_IF_CONFIG_SMALL("Apply scharr operator."), .priv_size = sizeof(ConvolutionContext), - .priv_class = &scharr_class, + .priv_class = &common_class, .init = init, .query_formats = query_formats, FILTER_INPUTS(convolution_inputs),