From patchwork Sun Sep 19 04:46:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30370 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp394236iob; Sat, 18 Sep 2021 21:47:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypC2OZ0AtMSkWygSsFlgA6HquIUqy/bHT/JUKWIAP+us67hxA3blXmCre3ZyZtFlSr61Tx X-Received: by 2002:a50:f145:: with SMTP id z5mr22248663edl.4.1632026831542; Sat, 18 Sep 2021 21:47:11 -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 ds7si6288366ejc.302.2021.09.18.21.47.11; Sat, 18 Sep 2021 21:47:11 -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=kfzGyMIo; 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 033EE68B1B6; Sun, 19 Sep 2021 07:47:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2105.outbound.protection.outlook.com [40.92.89.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72C7868B1BB for ; Sun, 19 Sep 2021 07:47:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PEokVuJHO70yrpMCSFr/yxZQ3V7QWr+BSeqdExVYKtW/A2/S0XcvqsNuV79AkVxB1u5YzN6IfHv7/1MjXP8nyXWRXW9I9pL3NBor0yi/ntreS+pCQLd75o4BkTW0GT/y1M39S/Iakp0hGh2rtiEmh24BHrwIm+rWKGkSnMONrlMSCTnPpYhbr1s7VVSe6f5Q9eHAGyqlwSSMOTmxU6aEIgOi8TbTUZLZGIx+H52myLYdJOOgQ80NQ3Tc+UCKAKJdrFfJSnX+x/bJnAH20rx834M3d/Xayz623mqfKZhV7bQMCSwr8PR1M91IwUHRSlV3wNlY2Jm4I3zUggpPP5B2sw== 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=sEcaiU5cQyUB97+B8tG9Xzf6iwmcqSCk2oqjjFg+HyQ=; b=EM74pWx6MjnuXjjBVbhl46mE2kwrkN4CAbvOlFLuhjBKBSycIHNfgAeVgp4wai929wrvWwbSQsTofAAz5U6voV33GPDeix6FGmLxmk8/j5t9ZfkXJSg8GI12K+bvBFQFqxrIRL12Zq22CxO7bUPTNBs7wy1tBcS/qItQmBq0B2lb3Ct+tR54SyN2NpjSy8WQhd6hxPQet+wXqEsOGg1TieuborQAVA1IAUoG/z/HDE5amii6N8fM42cG9x7fj03SXebgKf71g6219ndlmXPwY1DVz1WwB73PDpUMFCKoYSSIKh/oxyIy4qSOuVqJyxMBXq+8F8wtBaQ+GPmWEopzAA== 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=sEcaiU5cQyUB97+B8tG9Xzf6iwmcqSCk2oqjjFg+HyQ=; b=kfzGyMIo+1U0bOaU33u7VC4fvWnZ17LnkJDA1xqKOukeYDmcKmfmt14SSx3tmqLyv7Xl+/+r57+Wzm3lplXDrtmVUzBpWPymbaDfHyzL1OPnOk6eM7eduZPil/bF5lDsseHM1YiKs+Obox/l0qlTGtDPpTocWD4TJjdP/f6eYCr/hDv0QVrshzWEMh2OGvzmslZp0RYYCZWmZ/QEV6k2WTvYvpuj20gjXM1zr1gZ5iO/izIgUR6rFizz52piuE6ymgghXs3OugPtOtX/MbEH5u+CYe0Jix7aM+ookaa4use4sZsj/rcTlDUtd6RA7zF9qg+298LRqra06ePVLyaGJQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7509.eurprd03.prod.outlook.com (2603:10a6:20b:2e2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.16; Sun, 19 Sep 2021 04:47:01 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.016; Sun, 19 Sep 2021 04:47:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Sep 2021 06:46:51 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [tRCXksw5ktPxz+zFIevy3BS1ntrMDT60] X-ClientProxiedBy: PR0P264CA0125.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1a::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210919044653.2671450-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0125.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Sun, 19 Sep 2021 04:47:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c63a226a-712e-4325-bf17-08d97b2884f0 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3VHo3jlqpVr5BFXTfskQ6AZswtnQD+GlWvxVUfa0dOGrjiy9uzuQExYUG5GpiiiiaTK+HPqumc13H4m+LCl6wumhQxtm7n2IXTyVfee7zliX91bP6pUYam71JB1dnAm5jznxucGW+XnEooF7I448z02uFfITCZfEeXbQWoN2/tY4XgqAVtHHwGf9f+xlhu2r6gt/moaXV9ufS6yXxP3oreoT9hQQzGrGBCAX+Hh//T7fyd8bESR71EBSPPfJkC0YOzc31iVSpumTbWpmriXTeh9oeVP5oJFIZZkeHyELyP1kAQvIe25wbM6O8SRLedUIOeVvgpYtrgbFX0d6AGu2DQ7Lz0FYS1Knpg9PFP04IxeFn1JwoieL+p7ABqwE4QnveukL+sPHZ8VGxLBvILXWpp9HjUunky5SGwETh+ozphy0D78ajPLdCrN4oTDdq2r0umMMWJCrlPAaDGamohj09Y6N2tmd+TIprDVJtE4yPPLlh7fMyWdEYv8+ZhzLOrKnIeEGJXk88KL3zkr5raTJY/AtaSFCnLgJdl1f6Jp2/uh1xEIZu2nEe/mO1WGtxXTV3aIMHUGOAlTE4ujApm6UdvLVPxEgvFo8qrBT9Cz6ntsN/gEIA5Uh4mvnOKKLXCX4CI5k2MTwjZED1eXsP4NBz3XeS+rayFhXAII17IrU7S1dpTo8RWUFbFWp7QnGMgV7LBGf3lTBqp81QciQuietH6ahNwyRAVaXU0= X-MS-TrafficTypeDiagnostic: AS8PR03MB7509: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NUNnMvLUPEn2E0dhxv/GAcGf7FV5OvIqUG1Ncx3uaTO+HRWv0DNjqKgeaAKjGl0/qvtbYGUILpjjjdtl1FESkBDi13cwmEjQIQ2aM/EL7K9b7/mmiicAqnfkLtROdZxSUCDjAZqPn5N+0P94sq+f5txfIoN+YLTca3yXigfkzPA/nbTvOX6mdjIdHY/dEDKo5M9HRI/U8P/aYDpC7P21UqwnCnZ10LRNUrUfTqpYUmp3z7VjJ4lYYNg+82K+xhOKZ5+oIEoySzm53SbfX94sa7koMQnx1dZJBD6XEhGUrg1Qc6MLP08PjsMqIFU6vPha7ipN8cnIwrCU00hnWH0sPZ43gDX61VLMV+NYe1iZ1I0WdsikOl3oFkgiH9kIyv+3hNOE4MtbJCFwTaxriqc9XvwLSQ72bDQb1Afg8fr05WeUM27kSafcIod9oLRZ37Dk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dU22phhA6G3QYF/2dmVDsb47Bkfrdb8SNZegn1TDg1o15wIffmft4znwZJDZhQtgG+aq9pSkFHVVkaUISQcO0AWZLTNDHnUWO4tjUG4cQ4n7vEul4GGYj+yDmGlp6M89NxveVFg0yAwuvVlpB0efDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c63a226a-712e-4325-bf17-08d97b2884f0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2021 04:47:01.0975 (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: AS8PR03MB7509 Subject: [FFmpeg-devel] [PATCH 2/4] avfilter/vf_lut3d: Deduplicate options 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: fX4M6Vcg1my6 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_lut3d.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 111e624dc3..9fbda833b9 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -1261,13 +1261,22 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar return config_input(ctx->inputs[0]); } +#if CONFIG_LUT3D_FILTER || CONFIG_HALDCLUT_FILTER + +/* These options are shared between several filters; + * &lut3d_haldclut_options[COMMON_OPTIONS_OFFSET] must always + * point to the first of the COMMON_OPTIONS. */ +#define COMMON_OPTIONS_OFFSET CONFIG_LUT3D_FILTER +static const AVOption lut3d_haldclut_options[] = { #if CONFIG_LUT3D_FILTER -static const AVOption lut3d_options[] = { { "file", "set 3D LUT file name", OFFSET(file), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS }, +#endif COMMON_OPTIONS }; -AVFILTER_DEFINE_CLASS(lut3d); +#if CONFIG_LUT3D_FILTER + +AVFILTER_DEFINE_CLASS_EXT(lut3d, "lut3d", lut3d_haldclut_options); static av_cold int lut3d_init(AVFilterContext *ctx) { @@ -1588,11 +1597,8 @@ static av_cold void haldclut_uninit(AVFilterContext *ctx) av_freep(&lut3d->lut); } -static const AVOption haldclut_options[] = { - COMMON_OPTIONS -}; - -FRAMESYNC_DEFINE_CLASS(haldclut, LUT3DContext, fs); +FRAMESYNC_DEFINE_CLASS_EXT(haldclut, LUT3DContext, fs, + &lut3d_haldclut_options[COMMON_OPTIONS_OFFSET]); static const AVFilterPad haldclut_inputs[] = { { @@ -1631,6 +1637,8 @@ const AVFilter ff_vf_haldclut = { }; #endif +#endif /* CONFIG_LUT3D_FILTER || CONFIG_HALDCLUT_FILTER */ + #if CONFIG_LUT1D_FILTER enum interp_1d_mode {