From patchwork Thu Sep 30 13:40:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30750 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp694902iob; Thu, 30 Sep 2021 06:55:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOXhu8veVQQhGUC1RAwREd9mokvExlYGFd5RKR93KG+keZMFtjSPjO7CB42OpnvfvIw/eh X-Received: by 2002:a17:906:8a6e:: with SMTP id hy14mr7006201ejc.366.1633010155394; Thu, 30 Sep 2021 06:55:55 -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 hx14si928587ejc.326.2021.09.30.06.55.54; Thu, 30 Sep 2021 06:55:55 -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=dF7ZUzbu; 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 12C8A68AE7E; Thu, 30 Sep 2021 16:47:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064084.outbound.protection.outlook.com [40.92.64.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC69368A9CA for ; Thu, 30 Sep 2021 16:47:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RRT69B+YoQTSNNrmI+cLUbaNBrhnTL2X1ROs/IrXPZ77mQ+h9YxV1sHeJ2WGYXZvpfDCYsCgEfhaMmNukVuMyXRsb+Ns83TlVbVrbLX55DJrejWZugnoFBCnGCFSFmxg1kDnMz2d2A5Ik8OKdBuJte06Sl/vkozkx/Pvt5pHnCroGHEuvUyEfkoR2wcWmTcv8Yfz4iFLS5+Lo7Pu70Q8RZ3EbVTGn9CTFvh3rwyJonTyJI+nyHUQIMtzc6sPo07qB1Or+8jE3n9nt4BvvLj3PB2uvZ/AxZLyRU4552VMoJiPYTmKEuf3aYz8GgtURm6eTNxBuTatNJ6QTnze4hKpnA== 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=shnq5dGVWyKws0UyOmGhnuiTmhGyNOEv1vZaJyJjH/o=; b=HKrP42bWPfFw1C4RqOUZXlzzVkhi3bLCHv9EOQ4i4vSof+CJL8L2jrAQTIOdBELaSiuZH/ZjeocV2Ccv6yW2siejVt86G9R8ubH9cZr+MWXr1D7AnFg22MVFxy1klzmZV7kMwDe+ihL6rZ2d/hbU9aGPczA2HYsHWcUIZKVTtWQndNXeSYmTVqyKIZHSH2iDkNQI2sz+9Z0mhRyRCrv4/fcNmgcxaIzUo8e45Twb3HD3G8Pvzbv+qH6c9CzVksIL+JQyagpERgzghGCNOro8dVbEHfkkxTiJXG2AxhBUDrvrDeYduY7hC1e6VRCXgwj0IeHgnyv/PaQ62+irVyZTEA== 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=shnq5dGVWyKws0UyOmGhnuiTmhGyNOEv1vZaJyJjH/o=; b=dF7ZUzbuCMfTsi9z5Bz1r6556gVo95tEfbhUaEgIcQ60hr12Ud2YLkK3BpZdqtQtKQeDS91ALdKz+J0n+QTAUWIu4kY5mtXGsahML0YshjdqR8FkP2Ve2SBkQmaLMD+3DhzboFxqzKvqNY9LKn2x0m+0Kqv9jm17foUUeX7cNqDePRhUeDjuhoelrVLzvFg4/lXaq3FN4gtUhyOhFuyda03Aq09p0sJuVPnq+tC9IKoJUNebivm7iqolJj3VaeoXvcIkQ91VF79L8T1lZwMD53HpTaGRgLQNj9oRon1SL99XPkeKtVOXR9lg3bNAfejps7hloSh3RwhEgEAxk1xIZw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:47:09 +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:47:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:04 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [qyZ0BMw19EcM1bERgbv2mIctgp0C4nSo] 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-62-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:47:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4a5e143-8167-4899-45a6-08d98418cca5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOb9dbQKGMX4cGZYJ6l6oXCkoa6kj8M6HWgt497DxO4Tuc5O0jMmyWEXMDZkfFIkdy/6Ic7j7osdP2kRrFDtfqj7uKBmzKRGT2yBBJ7An1+uoaqGU5iiUy0J29TPNquqBnL+9e+wYWoTjXJt07h1OT3Ay5yZ2fTJe8S+UZtXWYrirsxvIazKerZteik1eToC1FiuxIWx7EFocVrhcxwFWQkcNZ9Lxh7FxhjKRFPXYr2gDxO1K9yCfGNLWduzuARsnAb5FzDuj5R3EhlZCubSPQGly5KfpjVm/5zHtxBPfL6sia2VxIGkcqC5OI8321NEF5JMVOQPmOD4WP5gH/zH0R9ALx1QZ+9HpyfNH7tYa7FwlmeAXidmVUdX/owvlrm+rdfj/DqJHR/xfSMWZShdbiaNj5pDpYbY7RNJ/2bTT42WnJVildFlKkODOwCF10NCb0DnygWPtjGO4gZKMbx5TaDE71IZXVQrUjY9bEtPi3NjWwYpngB31Xm3OGDiedI1wyqTJ1dAGcjmsfPDdyXY/919+fMI/mwo8RxGRiFpIJBw3ZoU7HXtOhXLcuH+FnpD7Ed2c/TpE5GuTPfQg67LnE09WyiBhFvfr7gLOJ+BVjtEPaeiyA4B3Y2xt1w/WKJSmE2UnYWLliATvF57J81oq7CzAPqB+O1WBoFj47k7410HmGx1InwK7BWYs659xeejOegsecyBIlYJbE8Mw7FxVCaqnh4UFXKsD8= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EjyXqR6H92WuD/f81yKikB7e85TP8ZIv0gkiTxkEKnletwndhTELly2++GpfWjNA9Z7bC5WUbS7RjYR5/zCs+PnojpkRBva5XYpI7eBtvVm8/lOt+uTAtjJz5eq5WfSgYsOB8ZxoOLgFK3ZXZoDTwSktZTDqOazuHVdDGHsHDgioxEe0hi9tnmAKQ8NiMebI7wPs37u8w9/SVT4ZfxCJY8ABjxxJTBuhMFJJ6U/ASs5BaSdaC8TDPggY0aE6emn3StsluydFHFy7EZfgVIOD5Z0VckYXNmIqqXA/yaWtepedGOC7ABHpl6H4T9xyMeJT50LIVtkvXu/QeZKCrSqsQHUP6IVXmxcKND7cTNlvlirpv7rnfznhrpg/2qXlT7X1NYxZOq8o7ptN/85aWkFJ7K7zSNjUjzVdXORrF3Dxalp161EcWURW6xUUBJYT6k3P X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TKUokWpSpKTkE0ehq3JXc0bMkDIffnzq1RrpW/UTUp6u6xCehshJn0yXlvyAs3C+BRRU5Z4XIrKsLYkGeO490Zam5cCzsCZd3kKQt5tAuxhMRD7uR68gA84l9IUbFYaXGFPPZuTvxvdjLshRjx9FdA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4a5e143-8167-4899-45a6-08d98418cca5 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:47:09.9281 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 063/218] avfilter/vf_colormatrix: 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: 0uhXD+RzXteg Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_colormatrix.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c index 73bc0e9cf0..bee80c69cc 100644 --- a/libavfilter/vf_colormatrix.c +++ b/libavfilter/vf_colormatrix.c @@ -404,18 +404,6 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_YUV444P, - AV_PIX_FMT_YUV422P, - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_UYVY422, - AV_PIX_FMT_NONE - }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int filter_frame(AVFilterLink *link, AVFrame *in) { AVFilterContext *ctx = link->dst; @@ -509,7 +497,10 @@ const AVFilter ff_vf_colormatrix = { .init = init, FILTER_INPUTS(colormatrix_inputs), FILTER_OUTPUTS(colormatrix_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_YUV444P, + AV_PIX_FMT_YUV422P, + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_UYVY422), .priv_class = &colormatrix_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, };