From patchwork Sat Sep 11 23:40: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: 30156 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2756652iov; Sat, 11 Sep 2021 16:41:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHhtY9IFeNPcg1TNPwmm0WRG+aBMYa2bxE+SuVD4FLYWUxFUxywb8ReP877q9YkfWqXsg3 X-Received: by 2002:a50:99cc:: with SMTP id n12mr5480326edb.53.1631403698643; Sat, 11 Sep 2021 16:41:38 -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 t21si2766557edd.127.2021.09.11.16.41.38; Sat, 11 Sep 2021 16:41:38 -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=ixFILbiO; 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 9AD7468A888; Sun, 12 Sep 2021 02:41:33 +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-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEAB968A76C for ; Sun, 12 Sep 2021 02:41:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KMKSMHfkaPIjyOsILMIhD5HhmyT89TIUNhbjC+8Jl+mVwKHjZOYYFQi2yCkrlCq6TtU8FMax5840SNnqhJG2bpAJXtOsajjSzWsDN2NaCL/QunaOady40fJE0yVzCSjZUQ63OIdI6GKmdThaaO+6UxsMjFMcLjQRG9ZbK8kscbqhG/JcgZZV+pCPFl4AMEd84t0xnpRnvMGTD/+BzImNc1wAgKudaaHakPNXgdGqt1gtrsz/RDOGAEVDHOVF/J4O04xauTBNiqnOmKdr/fnUvLZL7fURVoXBfSzSAOeLB5rOtgta+A63A8TkUy/zk6mNJBLJzjNh79L3qi8alvyoww== 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=Zu8nhynwEfPrfXBU8S9j58otXIeZPoZxR9XXb7toptQ=; b=AZyRloXEJwuNw/vrQEyBoDTqU1goKrmyeWPBCpen1wCEzLMNcOXJ/uP8n0Ul2DvA2jZn0gmdGGyYjid6tqKADikGYnZaKE331HPktMtu9K3fdMa5VIHaaoGKQGWIfHAFrfZUV029CYTOVEFkWbtRNj+7nUvJzmZCKrdLDykdWWy9SDUpaLcT7+kTytqQ8ROy3uZFGH/XvJipWtjr6khSFgZJ2qOWw79joESxM+vIfhUe3/OnoqA3rf+OiZLbmSqX/AATdqal6mJ84YeynIQJQuCol5SfQOEaUzXD8hb7vzOTSbh0GfapQwLht76p5QNfr0yCZqWFq9nV5BBDfdzTJQ== 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=Zu8nhynwEfPrfXBU8S9j58otXIeZPoZxR9XXb7toptQ=; b=ixFILbiOO/W97Jq+rWLSdXkKu9bQxgbZECDz7Ogs4Xg2QjDbEdKxp7o2TynozVj3UWkDWvHGRHPZLNwXkbNWSBeEnt4VCZvDdGXKkXaNdi3fby+or+ZZqXRjES2u5ea6oFx0GthcOP+lDTueKnAxpBc7ifheITmNJZtxQBHqmPN/glseyuoSBD2IIwIyOqprZmcRAQL0Y2pWIR6eE/4usWMSHp9sD7NGqUfmsDbN4n9qxy3wYMKmWHzuBm2AQJuYnOJWRqUfgkC/T4nqejNThBKwaTDHgnqm+2u2YaZ6Pg6FfxAuz4NrC3qplinGH4Hc5b82hBxZLA7qzxfG7SGMNQ== 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:25 +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:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Yt1ee9wU/qH78ayRSpxy72KSmsNXV/ur] 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-2-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:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2aabd058-cc21-44f8-9103-08d9757dab42 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMksTRFWjkHU1tOV0rHPy0B76my9+ZoIbcvBSyI4zdGKv6lPKAWvpPWdVlyPcw61mm98wb2r9qIQYozVybrb6oJhkUysbAFr0NcaHOFQUndq7NtRb8H4JSj4U7oMJl0PBzodBEdfvM+i7th6em80TphdAqp80BxfrP2Tyv244/+qS1TyazwK2nC6TOmn1pw94KNe3QL9uZUbVIGz95F4gO4NJegWlw5wg63HBn9+/AQJPyEFOc4+RDrXXxLHpCqb05v3/0/42mEck/E4vvXarv7BlR0sBqwt4wpA56y3ZsOM1mWdYsOEBt0ai/lxZ9fqTxXg909gDo8ZP0bj+BLdqMD56IAOGSn+RWxt1o6zZYSJoySq+Ut387dxKJy0xM4YEerSoLIl3mM+kc3R0SsTGtKBunpujrsAuhTiXExuvKCdjz2hmWcW73uOAGwvdKwbVxc8v2kZKs5FZcVXllBN2M1+cz7sX5DTeFypsJhg0sOFbJJQKP7UsM2j1xbLR75Y0q9tfQ+wVnwnQu8L0soHhOQMNONAy/3nY4PLqy5ERcJSoWJv2SxWuNN5HFVRibUAXvElSlZAvyvtxW72vmjA2kC/xsZOPdeOn7PVfQ5yESk55TlZf11qtYjgxHpcgHZTRfm2jvNcTd5nSjw1/gS12+siB2s5jPzfz0q9Xl9evV/f0RN7b99HwFwQnNFUDneHHBPzOYQuJWVK8= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4n5RfoGvOE0c6XAyLVi0EzdU3DlfjF6hrjvqW4obWPSdydF6nf6GdTrhYw9mF7vHIY1Cu6/QvB8DwI2AhrH6wYuYQsv66yIdwZTMW+Vru80FgaqEf+AskyVZ7tl+IJiwH3pnJu2t+4drNQf6j5e+s1z7GKiD7PSWRCYnYipiGBacS6Gu+ebvII9LLT2JxOyBDnWMB/AIcNMuO3GEqUC+GWXmPHJJ+3spD1ocxErtY2K4rdz1xfohKF3mJcr5lPZPHAwYIDosJMj99cS0ZGksPehyegRH18bvQeUjGz+B97/FF98CJtdq6fiaB1/DSc+ZQBFFK41LFXqhiigW9fhoPpwE3g9lYcfucr7I8GbbUtvsfEe/zFsqa66y2o2U6BYrX7UNvq4hYQBe3KXCEy8OH98IzGeSO7gdW/jSk5gf7xeqq86ms9nkY7vK9BDO7Pfj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P5GjmqFlN/JGCPflkKAB2Hg9iHw2H9oe2xZiI98Kfd+1bNHa7pWpyJVZ5YjzX2zsmwVpFXNbN7PXMAYPuLCOivxJ2FOVDwZayTBLmCmeIP+AP0EjdUrDTJJ1rxORfwZTliOVVGNtzgyGgqJfrkdhVw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2aabd058-cc21-44f8-9103-08d9757dab42 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:25.6325 (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 03/39] avfilter/af_agate: 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: DifmEfjZ7uki Signed-off-by: Andreas Rheinhardt --- libavfilter/af_agate.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 0dc28ac080..284880833a 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -86,6 +86,8 @@ static const AVOption options[] = { { NULL } }; +AVFILTER_DEFINE_CLASS_EXT(agate_sidechaingate, "agate/sidechaingate", options); + static int agate_config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -183,9 +185,6 @@ static void gate(AudioGateContext *s, #if CONFIG_AGATE_FILTER -#define agate_options options -AVFILTER_DEFINE_CLASS(agate); - static int query_formats(AVFilterContext *ctx) { AVFilterFormats *formats = NULL; @@ -252,9 +251,9 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_agate = { .name = "agate", .description = NULL_IF_CONFIG_SMALL("Audio gate."), + .priv_class = &agate_sidechaingate_class, .query_formats = query_formats, .priv_size = sizeof(AudioGateContext), - .priv_class = &agate_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), .process_command = ff_filter_process_command, @@ -265,9 +264,6 @@ const AVFilter ff_af_agate = { #if CONFIG_SIDECHAINGATE_FILTER -#define sidechaingate_options options -AVFILTER_DEFINE_CLASS(sidechaingate); - static int activate(AVFilterContext *ctx) { AudioGateContext *s = ctx->priv; @@ -424,8 +420,8 @@ static const AVFilterPad sidechaingate_outputs[] = { const AVFilter ff_af_sidechaingate = { .name = "sidechaingate", .description = NULL_IF_CONFIG_SMALL("Audio sidechain gate."), + .priv_class = &agate_sidechaingate_class, .priv_size = sizeof(AudioGateContext), - .priv_class = &sidechaingate_class, .query_formats = scquery_formats, .activate = activate, .uninit = uninit,