From patchwork Wed Nov 1 08:35:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44464 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288362pzb; Wed, 1 Nov 2023 01:34:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESnY0om++uIY9//IFjZz1253EchFqUL/cWjz59lEVMjUEfO26euIg3Z4iqJJLe5EaO4wPd X-Received: by 2002:a50:9319:0:b0:53e:ae04:40ec with SMTP id m25-20020a509319000000b0053eae0440ecmr4720386eda.18.1698827689050; Wed, 01 Nov 2023 01:34:49 -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 c18-20020a05640227d200b0054395969fdfsi506593ede.444.2023.11.01.01.34.48; Wed, 01 Nov 2023 01:34:49 -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=OI2y4+x3; 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 280E668CDA3; Wed, 1 Nov 2023 10:34:24 +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 895CB68CD79 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=lrwQ5jaPLYw8grQ9kSNgeAqycVxP4hEUOdOY8rJ0RnQ4E3hQB3K0gUeNok9ZcrAYrykGaoTBnyaXNZzWoZgp+D0qEZZhnYV6m2uOQI8flfLfVj9KhZQiaxi3g1dt4F2qZk+fa6DcQA5Hu4XrQM1oL3gdcV9a7DD+eUrIepAYABcWt+THGQ3/WdXBrV0iKW3eahiFYL8xMBGvoJkCOelEnSShkH+dzQZoQ6C2dRBXfcYeejNw2uwkgehekwy+up48RqvASsSU/2LpDD51rPK4JqB1FlceF0M21lGH0rW9ApYawmvBllcEqzHXMzUHj/qwS/6YIdq9fctPg5WvlTX82w== 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=/4a4qjk0RWexh/h8aw4/PDy2wan6SNj8jewNXWMk6K0=; b=ajton/rUxFprtwBbywNq8HBR/tOalV2r8VLiiVgvm/gk3V0yp8cKZub9BImnOy43cyEhUMPOrKDra9OwAvTklamflfoRAwhPyYTUH07OBJ2jBa+eZOUV8GKcNmGJnGlelqtFFGCaAiJ+C7x1EPCR8gMsVowTUS6s7MPZApybtTcANUrcVubvudQZOgMa4CMBcNTbH9mvOgI95RcJq4xsQA7qCoRljDpegPxB+F7LHRghtSXDJk2JothHUWhZcgoGpGR08ol8s8O1egjGxpdBwacC3pzPD1f0mZYGYHvDlmPmFKEuCTKA2Uz/LBicJ/xhNbekX04xYBeGBxuA9jAIVg== 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=/4a4qjk0RWexh/h8aw4/PDy2wan6SNj8jewNXWMk6K0=; b=OI2y4+x3EvkxT/x8UoqJSHFfGZGM0mM6bPqwvkwtq5S0Ad1pFV1LW9fOpOD//K36X3pwGGTo9vzgWr9t3DIlhPwB1/eHJPC1yjLfiPGQSWtrCe058gSidEgxZ6OIJ1BBONxk91zMqOpYL6gppIdgWMdj6j/t55wQGZQnL0n8WtXpsF3aqTNUOGE5ZvvpAalvwCPTF+hUlvDLbyOOSM4ZkDBvuWkc3y5RI+riZrGii4DehehdTxpHqO1dfqAHDNwv9hoMWpKTX9u1Ovp1KwU8olNrsTKtaVfTnd5rHr2+yeDGkOxxXhPEgMFjNDRR+XhZUJOxZVnAfn+mAu/4tVzHjw== 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:16 +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:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:07 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Jp51XgbrNNpZOc8+ZAPhowNupDBLMcUiOu4wtxtnwVQ=] 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-5-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: 606ef577-0500-4bfa-a3fb-08dbdab55561 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4bly44c+t0104kiH/soThbrI69EUBVtadLfT2LNF45hByKNFmTiml9af/y1z/kH08HB3KpzIB9SeV9UkVHRdMULAj8Y5hR+Zez2y7CbU9kzaVxRU78huQ3rD9B4Dowjt5q+vvgM2Zt4o/4WAX1qb58uTBUUVLGEXRa0ETwYY4H5hTb1THTtK4gpEWaCk+6qyOE5xZzIqGvlDFx9qkPc7slhJj+WFvuh+ibw+o1morrGF8dpvKDvnLDO53D6e5829SgIExoO+e+ur9uXYqnA6LXLDv0+Lkdu9rNibhRUSYeVnYihi9/ZKRL6m12uIR3c+XNs+aLs5RRvNJ/RavoR4/lSLvPoLh1WRKsngWEJw1NMBQ+SIIs9zpNv9WYfaYqDeOrXGK/zCjLWVhGI/EhmkHkPwEbLGKRwg5yycjkqiclYGx1SdxLjOw5P4CdcsBmnDrVg0CqqKfuaPyWPeKq/PTNLlVxohYlrTL0u40wOmTA2v6f7CTgus+KASDvrKudMRrbRUa9wLxcwnYu7hKB1vN8oNhlBvfbpP603CFtnXknOT4UNquS/iEAdVnu1vC8Cmin3KHRNWKw63WiZoAvhsq/kQc/aRgMOkWe9dPyYtQ94/oRGl3PrIF7INLNhKwSmo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7EVBzX/VRCN1ONqDvYi6v7gy5cl2Zv5EQWl1YaK6+lC0ULNRz0yjOhl74JqQpjzkC6ZANcf73UR0lILgHnDyo7+2bJoz7wJzaboyaa23Oi9l/ef0Ckb3PJ8+9lqMrWEb/4zK6GAvEH6fx8BfP9Atv8SW3KPr4iKE2gB3I6LMk0AEGIBx580tuaCu9Rm0gOXCmDf7hlce+Oz4oNfNe8MyK0kMzXubYJcBI4MlCiGTd94Y7o+C5eRrV/gv8PwvFEifVkLxVoyL4MEiGt1TK1yTVzdlj0vGQ5+3G+T9lCpe1mhCNXZMhhnSjduf31CLQumOslQblauvukTycaONPzuCuiSC9dQqzeANMaKgrA34GxDEVB8LJmgk6ywGST50+FaravfOTYq/156LyuTX0Hu6yHVUFFlKoIRY2oU6czzbpM0EFpg8+mCCSaESi03KwGy8VzZIefCe30pQxu1WMBN6RXyVWrsKDG+NVj20/6TTpIxqO8erC0ebLt8tFD82AY4wbOkHI4lLOy65ioWJDd3AnCwWN8bLr43enL2mPt+nIwohXkKv87kKyCXsguc59hcAqNn6Al3jaoevzczdcT8WK1dKEkmVvs0HvHQE5AxP4PV0ulRAEIyx+fF8xEvgF726WfRu0PJP6ZDM3yVOjWTUZcygwbqd/YQmfGsth+7QKKDDdrN2W24aFAl7TrJTOeGJ4I6f6EYdGW/RsO9JEyy/6ZeyBjNSuwfrlJLX9wrdl2Q0eMHJSpY7G9KC/JwEUmxJIhwveBL7crX5v+bULYQ4EQEr1DZbkJN2NKKe4K+7svWHjZYZt9rjw+X5kNSkD+Eiq/C28pN3ezEgL7ThvMNQh1uVa76fk3zknQhxP1imPHTJ1qjOdoKP6V8ESd4GoFICRlsRim2vDwup2l6MPtJH7zInhF/0dnlao4BUWfD0zXCokNUw5TKUsiypI4v7X7XhSHgTO7gPmK9qzqQCi1crsU1/etuLEfCY6cnHEJQcVHU354Bl6toW5VPJ+NtDrP3NLJcya6+hs2aKJQNglG0Ht92BTkkCV4iAR+/HrsdGyVVxbqTGyjFVpU5FQmnBeKx+aAU8Wzk3xanNSLyhUMP4PILxLDUhalrHr/An9s4xcHrGgkcua1i0Fy+BjUPTYxXCNGl4oygNiw5voq5DcJgoHQkRFFxPOCojGyP5oG5RM5Z9eRmEKkFY6jcUTShrBMs+bthNhkBmV3INUJzqM4E/4R1Mu0YlOYmLlMLEh9hvahC49WWgSaDs4xidV/u3Zuhi X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 606ef577-0500-4bfa-a3fb-08dbdab55561 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:16.1697 (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 06/11] avfilter/vf_chromakey: 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: as9LIEWLkVDP Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_chromakey.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c index c204a58328..9c0918bb4d 100644 --- a/libavfilter/vf_chromakey.c +++ b/libavfilter/vf_chromakey.c @@ -323,7 +323,7 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar return config_output(ctx->outputs[0]); } -static const AVFilterPad chromakey_inputs[] = { +static const AVFilterPad inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -333,7 +333,7 @@ static const AVFilterPad chromakey_inputs[] = { }, }; -static const AVFilterPad chromakey_outputs[] = { +static const AVFilterPad outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -370,8 +370,8 @@ const AVFilter ff_vf_chromakey = { .description = NULL_IF_CONFIG_SMALL("Turns a certain color into transparency. Operates on YUV colors."), .priv_size = sizeof(ChromakeyContext), .priv_class = &chromakey_class, - FILTER_INPUTS(chromakey_inputs), - FILTER_OUTPUTS(chromakey_outputs), + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(chromakey_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, @@ -385,24 +385,6 @@ static const AVOption chromahold_options[] = { { NULL } }; -static const AVFilterPad chromahold_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .flags = AVFILTERPAD_FLAG_NEEDS_WRITABLE, - .filter_frame = filter_frame, - .config_props = config_input, - }, -}; - -static const AVFilterPad chromahold_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, -}; - static const enum AVPixelFormat hold_pixel_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, @@ -429,8 +411,8 @@ const AVFilter ff_vf_chromahold = { .description = NULL_IF_CONFIG_SMALL("Turns a certain color range into gray."), .priv_size = sizeof(ChromakeyContext), .priv_class = &chromahold_class, - FILTER_INPUTS(chromahold_inputs), - FILTER_OUTPUTS(chromahold_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 = process_command,