From patchwork Sat Sep 11 23:40:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30158 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757124iov; Sat, 11 Sep 2021 16:42:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQcGj7mGnsGCxVm6pGOKT+xcmgqAUwOPNx5w/u2zqxnB9YFW7WlnPaV5bNG9WZUj6mtVbq X-Received: by 2002:a17:906:2ec5:: with SMTP id s5mr4752948eji.192.1631403756316; Sat, 11 Sep 2021 16:42:36 -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 l1si2928316edt.613.2021.09.11.16.42.36; Sat, 11 Sep 2021 16:42:36 -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=sAu0CkBV; 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 4AF2068A8E2; Sun, 12 Sep 2021 02:41:48 +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 3A69568A8C1 for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NzS4wHoUZfelpCx0jdFf8yIDPApokNkrR+PXrlwZ9k3PPX/NE2zqsoXuYVn8O4q2ReBrOjhpbhujSRE19x62weFfB5lF/795/kH12oUUxcalJTNyi/EYKEtehfp+xf49HuwjC/plYQAv5W6NU5NLKazBLtqroHUxO7nCB1SdoxqBYSiLdTsm4/1pJmysozJCa0Df6BreqRQH0qKeGKjEcapWrsei+9eDKu/qqtmawVHG6tqnLP413iTrv0HuWpyX1/qwYjT4hucA0OxvmvBcXaDDEcVlZwOhlOks/HMK0eO4/7j4X3fvzzC15VHgqbYdzMp+ac6tk754+2XaezB+5Q== 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=4KDKLQZBbuMldZp1Npl9Qnm3G1GJH+WK7DBDNG+frkU=; b=ffk/WZwXyxgIMVlPPYPVwZUaTa36+p18Wgq/0RT9p17xj/TINds4g13DFfXnEZ4vfQQnXgmvybMpzpni8/gdYYjChMsep2tXl5HzEQtN1jkJrmazrAKLBF4AxBAcDp0RZqSpYxXg62gONOFFza3SpywLuvJunWgwpQYgkab64FJEDyaiJoBPmkkfjFj6Z/lyqvWSA1T9oa831AKYZhsRyKNZvgA5Ab9JFwc/eBzJInUu0gKs+notyqbYKMOuceRz+tGefhl+NLZ8O/2V0W36UqKl+MB+luq/l02yYbqK3Gw0NC7LnD1h/cyCKgLykhSJO84vqRnSsysdUOTrX6+g2w== 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=4KDKLQZBbuMldZp1Npl9Qnm3G1GJH+WK7DBDNG+frkU=; b=sAu0CkBVQLMrkIdi0ORH6RSkyAjk+Oj5crL4+/wPVGKD7jbSiXTm3xrArMn+CbogzXIhAQkZTIYhyBv06fckD/nHEC3UZTklUMrhPToKz/858yjk5FeC3Is8kgL3vdHrxzQg8P6IIW25fsDz03ilZgZYPOzfHsqt0tLgtf9wPDU02y1LEDHJGSbt+E85bCNf167WjDs6ndxJN7iAUNaHGBeL+DAS2WCPS4zYcTrsdfLV0lseMJhLjC79ZKZ1oPVGkAgK/4POkRm9oAeXy9ZduA8mfJws/qCV21yuDigunvXg/kvqVaBHiaXBCQVwO69yZx7icChT2SOS/Hc+P1gJRg== 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:32 +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:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Q85AoLGd6Mk3USuORY6rm4qt1hsI4ic7] 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-7-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:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 494f4251-f50d-43d9-8e73-08d9757daf4c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQfmMn7lLS9s0YsFf7lSoleIXum4T9PygVeZXrBU2uDYeqpq2FP9Zl/fygwK+q2wFiL7mND3RrDEzQlTdig+c2G8/R124hx1/GoObQmtVPmPV9w/AaUve+PrspH7HaYz+le34iG2ajosDssuIA0+c5SJclXA3f7y3K6fq6Yn6vYr5Hl5wOKPWDw2ajYeDqsTlLImwi8mrNju7kdmh8+wGHrXqRFiYENqZ0+t9ofsrn1BxDvbCompzMffXnLWVkP2VeYBPuE3hfSIbDn8cPDVvOtQ3fgvM6DGgIwmCIXiFr5AkPOmRxih+azT+pnyK1PJqIbZEnqlvM/71tJfsZRUVMxOOjD9f1P40tOiqPkqNVB+NuEYm1etu67dfGtTkW+J4yh66IW47ho1y9hU1Qg8nePsHejHQrIAGMXWS+2ozcKcsyF431mh/d7YyH+t/3grlB/nDu5g0mej3ric1cEoQ1Yjdrt5BDiLmPps8PR3Zj24snnrbyUHm9b3L4zP+PwWCnVfBKLXafjGTCas0EwW3faVnf1ZYZMFsNIfsHzbhG0ugzLtysZMeD/cQ022G0gZQlBdbIQrfMMC1NnDGCjnAkFP8wYHgNh5aGCxe1VFogSUX6rB5klM+PwBblCZHSw0ciSjtuwg0/axv/Wl7PwaCMJfP9jXvTM/P2b98ndz/UKCywNmguoHjbogKGTw/joZUZcSlLg1BVNVtNozvP0wc7lJgcvPD1QeDKmHuvCftbjRIGvfnmoflBiaTQvkwhrmpc= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JMGc38Nyzai8XrYlNq8e9TDCff2HhXjxWTtpeK8i1igCM9IU689Iu4EnIXUyE7azc3XJUZ14OHjY3Tn5LXFN+OnQroHlVmd8QMkhnkEU7Nb4LT8CKxFX+TZt3bDkqalI7TIB55ueTlTsbCsvP5ASeAvjFx7oHJzZzc8xNmJ4NZXZcETmcqZiM8kbx//gppW2qU+pcDRYn3O2IiE7pkmAjJKELUshl4sIaBByltBySAxHn3Ca4N60V9c4M6odkJqmhsi3WCRVMdrGr+fcG054MXgEJvvK8vWQW1Ul/tBjXdsrVQFl0uUgyoG3uSXmjGe/NMzZSY4qEtkEYrDU+Q/cwO4NwR5GKLKosExxSeeoy/gfMpB7HydkA2lz9tfDO5l74CxU0JTzB4amJwg8s5R5qhPpM9z9TB1lEaYN8BKjigrN41N0fXFDCFO2TVD6J6vS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JU1Umo/u9ZYM9cBiZmOSZlIObielL2fWUJ/hn6txydJJbDS6Y1ggtCMjNnvnmLWl0PmyEUcVpKiqRBvqy1QOlzgGzyaf/wLgx4By2CbnXy3VyHUSgtZkGIkFdwxWVBc6PuNNBgH2rrbqrzg/h5JMig== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 494f4251-f50d-43d9-8e73-08d9757daf4c 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:32.4068 (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 08/39] avfilter/af_sidechaincompress: 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: EKdIRYbV1v/l Signed-off-by: Andreas Rheinhardt --- libavfilter/af_sidechaincompress.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index c964e0d27c..48d450fd50 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -93,8 +93,9 @@ static const AVOption options[] = { { NULL } }; -#define sidechaincompress_options options -AVFILTER_DEFINE_CLASS(sidechaincompress); +AVFILTER_DEFINE_CLASS_EXT(sidechaincompress_acompressor, + "acompressor/sidechaincompress", + options); // A fake infinity value (because real infinity may break some hosts) #define FAKE_INFINITY (65536.0 * 65536.0) @@ -384,8 +385,8 @@ static const AVFilterPad sidechaincompress_outputs[] = { const AVFilter ff_af_sidechaincompress = { .name = "sidechaincompress", .description = NULL_IF_CONFIG_SMALL("Sidechain compressor."), + .priv_class = &sidechaincompress_acompressor_class, .priv_size = sizeof(SidechainCompressContext), - .priv_class = &sidechaincompress_class, .query_formats = query_formats, .activate = activate, .uninit = uninit, @@ -443,9 +444,6 @@ static int acompressor_query_formats(AVFilterContext *ctx) return ff_set_common_all_samplerates(ctx); } -#define acompressor_options options -AVFILTER_DEFINE_CLASS(acompressor); - static const AVFilterPad acompressor_inputs[] = { { .name = "default", @@ -465,8 +463,8 @@ static const AVFilterPad acompressor_outputs[] = { const AVFilter ff_af_acompressor = { .name = "acompressor", .description = NULL_IF_CONFIG_SMALL("Audio compressor."), + .priv_class = &sidechaincompress_acompressor_class, .priv_size = sizeof(SidechainCompressContext), - .priv_class = &acompressor_class, .query_formats = acompressor_query_formats, FILTER_INPUTS(acompressor_inputs), FILTER_OUTPUTS(acompressor_outputs),