From patchwork Thu Sep 30 13:40:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30772 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp698911iob; Thu, 30 Sep 2021 07:00:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyUVvYBytzxXzW9kfW4u6iTCo5I2X5mMGMr4F4QYvp8IMJweP6xmSfMytT2NVqOk1ejsgs X-Received: by 2002:aa7:c78f:: with SMTP id n15mr7526811eds.338.1633010440735; Thu, 30 Sep 2021 07:00:40 -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 8si4156341ejn.389.2021.09.30.07.00.40; Thu, 30 Sep 2021 07:00:40 -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=M4oDjBQ5; 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 5631E68AF49; Thu, 30 Sep 2021 16:49:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2094.outbound.protection.outlook.com [40.92.90.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7E3168AF4F for ; Thu, 30 Sep 2021 16:48:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T3BIOgrNFX1x16+ZaghKi+D7qILp0Vj8JnxcYQml3SOvV1uKqSJSk0kjh/NU/0mLX69Ee0pnEqfbz1qpAr8/6Y3KU9VWV3DejfP9pMj+kJ8uEUGgoYYfXFFd6+Wb3xsEas0+GwCZh1lFgFrLv0I3HZLi43ryjAesUipYYpQjDwokK8e6xr11mon7YFyrXPnAzsF1wV/7LeuyMUFM8w7J00D9nXPCW42+c13DJ/rCasv8MXGDWkfp6z08f0RHXKrJILbsxzovj7vp45X7WXNWKFNIMVuiKo0522a/gYCn2d1qG4CFMbGdfRbMXJ4vSBhSHlL/VnQUWB+UK81OsJu1IA== 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=9Etv+WRJwYfhpULTmn2qee1XX+f10WVWumW3QnLT7rY=; b=PicvE+JSpRV7bIj9wdhayy/XrStLJmR6bw/r54KiWSHJ1cMXx512K0y5fRIWHYGkSd+KBOKDQHdUTVhSQGJUxv1qufB2DItEIUeA0Dl/TuMJsMmmoxGYom6BOU+lXCHzjBXXu9WHHwqsvM0m6VpNauCN794aEwh4f1LmgR6zCPsfVICt5o9Y8o8HjkiZywyleojN4LqPgKO+JO+cGRmTrZG7/CTbZaBns0c7mMFP1eRGoPKO9X0CWR/oleC6x+ITcVZhos9eqkpQ9hcuGud2at+crYTUwJXwWgynxBp7MJlfkA1wMLYOq/l15ArCfmeSlZx3O4i5EuzPcCdjIeashw== 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=9Etv+WRJwYfhpULTmn2qee1XX+f10WVWumW3QnLT7rY=; b=M4oDjBQ5UIsEEARWebsA6QsDCOYEFZqiQ3Uup0GKr8bTk+b5CgfD/z04Oobc9UN+D+5CSmQhU/IEbD037aLY7k/28HBaDn+C8c8VxvMGib7pxCmPxTJbZBzF/SRiUVqJaqOLxjOcm7U8A9P4T20yRxSoD0f6b9PnRbV3TNnAeidvcNboB1XrSRjcDdDkH1Kr2CJHmyT4Ph8RNCgu+ZKXGVKg5/Lv7WrMqogarY/oqd3NHOrFO4BmBg0UdIQm6CElmRMlXBPElhELmqlIHBoJH0HaDsLjiNYwSQLFQn/eC9Ah/gmc3PZS/bmIx+WbMRuMLKuMaMt55LHGKjDYiWHjig== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6490.eurprd03.prod.outlook.com (2603:10a6:102:7e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:48:58 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4566.015; Thu, 30 Sep 2021 13:48:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:28 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ZhathIaNouPVbH4Gk4d1LrJSPm+pCEqW] X-ClientProxiedBy: AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210930134239.2672698-86-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15 via Frontend Transport; Thu, 30 Sep 2021 13:48:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d63e585e-9e97-4642-6057-08d984190d4d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZw4tXvfuyeM3+HaJfuV4WdGQIBbsp4OJPNWXBZCahZIU3URRDED38cIbLbK7oipVPRunRdkLaGXLZXfJ+QxOV6yXrOlIVv71PRsqetW6bIPBW5Iha1are2vo9BnQLyHnSAq8oFVCPvj2f3dUVyU9DUflohJosQ0BHf/bd/FPWVsSzQIyJWwpjV8KUf05f+wA9iVbMYoLWEg2VuSQPAQmWbLJmaKqTILA2pVaCP1IN4d4DnoxAx2SIr4DnaX8idhtPGMv6BuR6w/acteDGhL0loa1i10+7qj0j4kK70EF7vBcWdwm0YsTe41f+9xEvzFqUi9smRL6RkKO5NofOhrNKwEXyngc8aXIxQlGjEE4T/BStASn6WlAlD/GiIopvuCT/FOWGoxH1WFJCY6CSi0oNoO/0qSKel5NysPfnBz3IJz5+FSXANn/mJw6dbnDgd3FV7iK+kUwOOFRxyW2TC9Tale68jsU6OV7FKIDtxlIMoB1xfZTWzRzsPmvWcZjbqEVuXe0qK+wiXaA1eBgJFU4W1CHq4M6Azn++8Slz1WWC8IoWSjYIMV75meFWNwl26oJtmr707sOwTa89Au1SmQpRJcV5+JardENsHPvZh3leC+2GT8zoyjfp8qIla0Zo6cu1ZSsgKqoNr205rOULINuJkmkQ3mYg1DcUCcKEH48cgdB/UKA/x9RhrOpterYi85BY= X-MS-TrafficTypeDiagnostic: PR3PR03MB6490: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9tesevjz/mo8iQuyoScSMGz6nUpdj7RfYvS1Y3PImxT+LLoQwATgxU0VCvpdr6kyNT6iD4b9dReCsdCrIV+hC+SlXk/MiquzmZYDEMfEDU4tnjOZ4NS7MCDvEa9emwzznWqnNuZ3MCN+s3g/mmjBgKAGx0DF412V9pEmLSWcf6U6zjwATghTNuUr/S8N/EfOkfI92gFI9rEdc2mTqLb42kTBX8C9cdfiaa9PQewoQFWw+OE5e6unxbMQQ57oIAtzPZ8D0aL3v51uZYg9n7nTE/WOT9D8GwaofHEtkKFq4vcLN1tYIzmxACXniiyMLxXHG0fp8UuVe24SxmcyVmdatOF1dBCLAdlhOtxjEXanH3HJPrYngy1W/aawf1vmF8w8KRYen0gD1BuqDaSExZsR7Gc9fqwFwT1zp7txnxvoS3S27+YQ6PHIcAO4bdiJKGYG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DI6iJA093WttD1StMSvGe1V80iXVa43wm0MbR129aB7JzxA3HFedMJEANyGrzFPfFO5W2+81baqfI8SanbMc3SGODPnhMgAAHQV7V92M0CF+WruAvJ0Z6IAkzbQtMiP4JMwHvxqnON3iKrNkPxsT7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d63e585e-9e97-4642-6057-08d984190d4d X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 13:48:58.7066 (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: PR3PR03MB6490 Subject: [FFmpeg-devel] [PATCH 087/218] avfilter/vf_xmedian: Use formats list instead of query function 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: w0bH7molflPn Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xmedian.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index 2ae4132b44..04d807527e 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -55,8 +55,6 @@ typedef struct XMedianContext { int (*median_frames)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } XMedianContext; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pixel_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, @@ -86,8 +84,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pixel_fmts); -} static av_cold int init(AVFilterContext *ctx) { @@ -396,7 +392,7 @@ const AVFilter ff_vf_xmedian = { .priv_size = sizeof(XMedianContext), .priv_class = &xmedian_class, FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .preinit = xmedian_framesync_preinit, .init = xmedian_init, .uninit = uninit, @@ -480,7 +476,7 @@ const AVFilter ff_vf_tmedian = { .priv_class = &tmedian_class, FILTER_INPUTS(tmedian_inputs), FILTER_OUTPUTS(tmedian_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .init = init, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,