From patchwork Wed Nov 1 08:35:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44466 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288618pzb; Wed, 1 Nov 2023 01:35:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHv9aLNbOZTGZzTlg5o9+PpGGcI0VNmGJJ8dLVGbeFH9a5M/CSLK1b1PeTk9VBJ3Zok9GvM X-Received: by 2002:a17:907:9620:b0:9bf:8e1e:b229 with SMTP id gb32-20020a170907962000b009bf8e1eb229mr1312885ejc.21.1698827730576; Wed, 01 Nov 2023 01:35:30 -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 ga39-20020a1709070c2700b009c44822540asi1446764ejc.557.2023.11.01.01.35.06; Wed, 01 Nov 2023 01:35:30 -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=XATAw5Ex; 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 2BD2768CDB7; Wed, 1 Nov 2023 10:34:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2027.outbound.protection.outlook.com [40.92.89.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4B9668CD49 for ; Wed, 1 Nov 2023 10:34:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MQQtoqJfmWEEocRdSeQL+dzg7oS/pgp93o4tsh8cDMWjguC4FM8f9/TnJ/FEGfcKEbKy2r3bwalL3KzGn4YMHzsceWlqvPCBG5p7chvS5MvO+quy0YxzfPMSGtY63kBmDv6qYjGqyr+cHRX7tBiguah6kgd2ryBVmLUpwd1YNHSg8iDYAo5yHQvcfKze9I+RcUlPLY9Qp+5QBMSCnHKbHKTWcmkjp0F5bmIydCgd79JO66gRBOSWhGdZDY6afPZVOTXFZm22WSBw5gkegli+lPabTlYb1ipGLNxwE0xKYd2uWx442sCCKWVoPLFG3T8hccBG8qdZ+7LrUEg4roaMiA== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lxggWYdLiasLy8ehaWWBTRm+8Qvs/xvyDUMU3cYJqeQ=; b=SGB6B6165+kNY6R+oGACt8H4EkRs+6UToV+lcaiJaz0v4MzlEz4cZRhYHizIVo+Ja2DaUw9HD8X9+9ugMGAwwxBk5VSuNxAmZluBdRJ+al7rk5FD4Pmr22OhQ+hKOzl1A43y1aG+6s6wwLis4DQ+IyW7CG0PZHW16TwncKcBrWoo/9Gtx4gE91V8Y3BAHxd13IOSnkcJyXhAbqAhjCHZNBD18OXBKG2NK83S7cIQCjQoHdpcKMlf2T2PuduofBpzWJtxcp3+xjWYhrsnxZrMBI2vMiVXL4O3j7TTdl+2Q8vmkRmEuap/GUikfHxooSDzswL0TUYPFwMmraeaH1lqqA== 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=lxggWYdLiasLy8ehaWWBTRm+8Qvs/xvyDUMU3cYJqeQ=; b=XATAw5ExVSOS4Ar/eXpIBrWfCcYVgd8rOJwZrunEIBSdKrwYrIGDX5R5SiP6ooqxmcF8b+LQSl+umzFCsIDs4Nivqrxc4egG4CyCe1h5tHlLIUstYAi6f69a/s6ujMUjF5ohCKeeeELaRdwwHOUfBjKx0V62fQo54mWQktqnkm6Tewf+PKCgNToUInifKAWOQ7mDwhy/sXwirIcj/g+jQed62KpZKqdZUdNZ7QBjBn4DLN2m4wnBp6xzcCprg9dGDPoNp6A5vwVoTJBNrw/hpS1oXdkvW/rZNSFE6t4vrPewP4qILAZ6RwHITasiwtYliwHyd7I409q1yHwlnn9ALQ== Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) by AM8P250MB0215.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 1 Nov 2023 08:34:19 +0000 Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::54a8:bde1:da41:a768]) by GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::54a8:bde1:da41:a768%3]) with mapi id 15.20.6933.029; Wed, 1 Nov 2023 08:34:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:09 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cHG58iVpu2ELlfnyRlsGvgZ0EUIpO2UQd/JTZbVHlF8=] X-ClientProxiedBy: ZR0P278CA0193.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::23) To GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) X-Microsoft-Original-Message-ID: <20231101083512.3398680-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0033:EE_|AM8P250MB0215:EE_ X-MS-Office365-Filtering-Correlation-Id: f0180458-363c-4a23-c799-08dbdab5576b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SxKz+1B+OaBauqjTsa4bizGB/r1ISfgRfa9AKus4BdsQRMd1OX8CHD3skbns+7Lk4kj2+xpuPDaGq7+2gffLJeYT3YSTxZWe0rbWpGDU74f72SFAgfrA78+5QxHQxELxow9yuqVYyovce0KYxlHZ8wC0SukMJrfqiKw9AMBcpnKeHxUueQDjRjcBKEmTU3gV5D+WfltrwirlAW4uMOfxOHA72o5luJ/gxGYYWNTdAESyaRltGK5ijrxu2GV41flAki9M/sDEsco3Ey3SAHryWUXxCFJbrUgnXoF96YPOwKkB2qqwvdmlWvG8gQfTD0pxcjkwMQsyizuNpouc3IeCef4huW98Q5PiMxWb9jjA3j2oVOS/gjTIZRJLkRLDEaz/cl8Z7pWsoJoso9qvlbShNX24CtvtDgMsHl7X1UDVWE1ViIHxgTGSM0oSfWKYKA+FY+T8v9CDjNk2N/7sAndEcLmw/BarZZoKN2WBF0vEoNP8KYxwsBRXb3EAOHfmWxHUn6KLUffbDLaTs9iGygw7e1+6wcM9cKswGQoN2ZwIcmj/x7yGfJLSxS6QbMEymNRUahJkWXUIh72jZZ9do9n1kNQw4IOYN4ERw09yeMLSbWZtTEsfUHBB4CMwoxdQUbfu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pwOM/wTkK9HSpPHuKBvWHNXOARF45gpUv//M/dN769r+7yv4tgkz//H+bKG7tN8O7Re/GMIWWwerNNhNk1HD+oYruS2srmfehEkgY/uLvG9qkOcA1FUaqsUsZnsInFdw2XjnH3QiKQg1Vixph6qmewM0BeiW1EkqZwLC5Xq1QzyWKAgzNfbsWCIYjrqlNiTiFC3cNojn+URcwGOhO1lGFPVXyaITG6MFNwHd6KVRtAy9yU23qYesLWRNVU3C+QNB+++msuPICnob+db7VVD+Nmb+TeXYXQnUrfeun4kLj52lIO3IpzYYXtblEP5u0u6pqS0s5FwDiGEGFbiIKkTW+QFBbyAeJfobLGT0dNIjbo0EAORLqBAS1+dfWc5cK4m3ezqOqylLUixSEm60aHzVu/5m0NmZ/US9YTTa742MeeFHueYvg7zC+R2qVmVR+T0cUmDlqh5ugf4Z0NVD3YiWP41+/bmYCcixDwEcxdS6hfkcPDZtCFwt3NGCiFJTNbA63y5eVfw/LGiyqbWIT1aFwnDsubcookPtgFSPAQsTG5tqXUr73+XmMDhcqXQSJYpnZ38SuLgBiJ9nShx2lesv8J808Fb9mE3gzFwJ90K22fwMpecOOQJJ5Z4Fa+0zuWyCEJFWvCxVi4pcMBHzWZnCMnx+KWzO1RahJI1S/yKzFiS6KUT/e/1lrwli5i6O3d4d1jLZ36291WoLtVSMbue7R0FeBlKHKGXPFbFoIrHmf/gdhQ115JscS8gk8saG2meBvdGtaNR8hELqd0hA9qsVXy5o3efC5judaBWvpfY9vKZUOU32gU1McBGgi64HpJGxGnF9fxpFh+RgV8mCWErMtLKPaK7Ooqf19rRJoU41AtLE6R8ICZIcZnOpZAxYEBRvt5eT7A6S+GFE8Ka0PprJXEIoQnjeOSfgBI5M6J1pOAXmseVkSYknDQNKbAgpPlKod/xRB4zCStDPwfEUNE21lF5knLBBqpjaTzWwyZq/LC48aPvxpb6w2VfpvSPgnt07Sf0wqUHiy/cNsOVzlSLKpoNZOajIm5NQA1QlO3t8hWu7ObOOL1vnvul/yPIy41Hni//O57foTFURkegE7oDAImOvMCdkjjla9br9sS2YtE6P0Or/rfW52FaLvV44a0OeIRil8kn7OqotV/QkCqA5Q1T1KgQXHWmCZams0w3BcBofXbrD5mZt7EhzzLOK63Qa1WPKaIElIpHKK9iEeWIyd/2KXMS80qB40YTQdvAsHwcSTnoZ6Jb1ZeIT+zJWht0R X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0180458-363c-4a23-c799-08dbdab5576b X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2023 08:34:19.6104 (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: AM8P250MB0215 Subject: [FFmpeg-devel] [PATCH 08/11] avfilter/vf_hsvkey: Deduplicate inputs and outputs 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: z9078YiVx3Di Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_hsvkey.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/libavfilter/vf_hsvkey.c b/libavfilter/vf_hsvkey.c index 542ac1f3b2..0bd8cace37 100644 --- a/libavfilter/vf_hsvkey.c +++ b/libavfilter/vf_hsvkey.c @@ -265,7 +265,7 @@ static const enum AVPixelFormat key_pixel_fmts[] = { AV_PIX_FMT_NONE }; -static const AVFilterPad hsvkey_inputs[] = { +static const AVFilterPad inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -275,7 +275,7 @@ static const AVFilterPad hsvkey_inputs[] = { }, }; -static const AVFilterPad hsvkey_outputs[] = { +static const AVFilterPad outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -302,8 +302,8 @@ const AVFilter ff_vf_hsvkey = { .description = NULL_IF_CONFIG_SMALL("Turns a certain HSV range into transparency. Operates on YUV colors."), .priv_size = sizeof(HSVKeyContext), .priv_class = &hsvkey_class, - FILTER_INPUTS(hsvkey_inputs), - FILTER_OUTPUTS(hsvkey_outputs), + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(key_pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, @@ -337,24 +337,6 @@ static const AVOption hsvhold_options[] = { { NULL } }; -static const AVFilterPad hsvhold_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .flags = AVFILTERPAD_FLAG_NEEDS_WRITABLE, - .filter_frame = filter_frame, - .config_props = config_input, - }, -}; - -static const AVFilterPad hsvhold_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, -}; - AVFILTER_DEFINE_CLASS(hsvhold); const AVFilter ff_vf_hsvhold = { @@ -362,8 +344,8 @@ const AVFilter ff_vf_hsvhold = { .description = NULL_IF_CONFIG_SMALL("Turns a certain HSV range into gray."), .priv_size = sizeof(HSVKeyContext), .priv_class = &hsvhold_class, - FILTER_INPUTS(hsvhold_inputs), - FILTER_OUTPUTS(hsvhold_outputs), + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(hold_pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command,