From patchwork Thu Sep 30 13:40:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30728 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp695678iob; Thu, 30 Sep 2021 06:56:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAJD9IiuCLVju7dGVAhfO6P5sdhsG793GdB8SA+PVRJnhIziP3o5ZgvOZJYKkku1EaF1Y3 X-Received: by 2002:a50:dac4:: with SMTP id s4mr7064026edj.374.1633010209758; Thu, 30 Sep 2021 06:56: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 l11si3489858eje.503.2021.09.30.06.56.49; Thu, 30 Sep 2021 06:56: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=mt+iQhuy; 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 84F5C68AE95; Thu, 30 Sep 2021 16:47:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073014.outbound.protection.outlook.com [40.92.73.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78D4C68AD3D for ; Thu, 30 Sep 2021 16:47:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jjcF+k880De2yju/P83VKjynEKYTpQPQLqDokcA5CFN748Np9t6hLhOOKidREuWaKuAQSn9pZcgnPpcbEXJAqk8u+fgSPRw5RJk8A275zRtvpfUJvmnEF2GcQGloVgZOJiGHz9fANrtOf1MQbCV89mOp3F9GgCajeNJsaicVJmwNAs6YM+e5thuoRoY5ZDF3D8mh0JGvEMuYm1PTzXn0Rsbdwpkpyodz12wUC+VctV3nDsatNMabYAUGg3jHx+7pmRXy0WW6LdDovEkrPX0pEg4ilw32+tyFZXucnDB8Qy6b+9Not/uKCpwLqfSBQYIhi9VPCIMEbBiggCFZ5kob+g== 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=5uS3O1JcCapji4VTpGwbwS9k0txn/aex+8zILbRpE0Q=; b=L0PNoLKwlDLkYg0RTQzV+OWBL6DiC+JFi/xWAzyTbLltkVnelKJKnPiHlUzIea0pfuYqYP1KvVp2nkTlFSS59WAs4Ej/PI1x1SPPUIgWZDZ/S1QU/6N7NN7hcdbhVIiadBpou4BUjIeFB2ITNI4hk8tXZOg0nQ5qa6x3FQNkwtdNaTt00flIAW1qNTFV7WVbVC0mmc7H5SeE6uTabgQNyJ1DbHPA3t5cqkhjurh3Z2748++BIbp6EUWGzS9LmJwnCtjLqZSzbMZfkjqSki0jSyAHxWvGNOk7KTX2UKKM4sjHhB3e3Z7LhgfHu/1ukWlNu2Mrod0ZQE8QtMzdm0QqNA== 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=5uS3O1JcCapji4VTpGwbwS9k0txn/aex+8zILbRpE0Q=; b=mt+iQhuy4S/021FcEYw8/4rWesPZaO/F+H3GGnY+7iI4pZp+CksPpLinQ83kEYJCuhQBQdhpVDG2qpahMu+L07/5YEUAk9IEB5jDI1w9aCzxgXPjdbU0Vi7Zn01bLq+9NB0pZAEarMSmdbIolUEo5m+sHcUsY4Ls6Ulfao9Yv5OLncvZiqeXgSMUzrGl3zv1zuI58wOIltTg2x32TnY4mv6hlvM14wFXvP/SP3Tj/OMtzbY6m4cpPZkRcr4icbzuiF4NXbpHRsWFYSVTw03ZsgWRc9BwpaqWkJXxtHVXTWJeDSlAqKXsYZhpwsMCuCGMJiE7yNCSuYo8rfZz4/W2hQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7071.eurprd03.prod.outlook.com (2603:10a6:102:ed::6) 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:47:26 +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:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:08 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [dtanLHvXbRa7+va8wIoZBLAU/u92XM4W] 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-66-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:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5df74831-79b5-42c4-12b1-08d98418d666 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymIOARQAbZ9l0m4fLPROwslL2UWFApWYcmp54OhCRto/U9myA9SP3eBJQ6YmP81cClwIxOtlicwTInjiXA8pAiQZZpCJKp3zbVvgINKe5MaG/6Zxz14gfxrms04AtB/fk0Y3jttXa68Adjt61CRPjcyitdLmAXzZSNQCYkNUOlxeUaI+eK+gYfDpmMpTpvl4D09QL2vwetr9iwrbIJJn0zjNZExN8jWWj/bLwm0qI1y2VpxEnZoSDF3Dq62qbU2nc+wKbimDaAQAHDeRvYR5Z11TUviBWhSKoRsfToMenuN0igiNttagJ5NQxFITrKNm510xiqkuJzVoPPxpYilKt59X95+39lyqy+KITfHRUS/fFTDg0If8oxQUqM2fmIErYhbUht7PUlMSOpNe36sZBdWhVk5aXwwPwP1qJ7jOG+sn1aR2rbQ2FsxJxJYf317bH0+I7dkA7zQ0TH+an04lc/uom19NRsN2pEu7YPP309guw/jceiaUHzIDJJIbklH/7Ww+SuueH/aqyyo/+Ab4GmF4mHWG6nHx0b7aSSWkef5pBmc/Ap3w30jwD1dvBsbffJnn+dBqeoW1YxW41cPTn7CkqqtZi7R3OjfacRRLX6mPfwRrbvA2T2UTOfoEx2azhPN0CVlqlHKAx8Z5yRUijbwEoJHfz0HuF1+L2fugpQHwbTSCt1W3OEDf5nZ9KHBNaIt3m7Olb7t9hj3Y2xRG3D21WUAaCJOvcsQ= X-MS-TrafficTypeDiagnostic: PA4PR03MB7071: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n9dodHdgxzoZbeGAwo/UggKsjMcgO5mgszpbrm0QmO3btDU4tHoDLyaMPjFNlM5wpHKpAFPNgaYtCW4O+x+74a3JY/ADn+anTqjm/sXzdVtpU2P86oS4vnFI/CE86U/z/g1GXJNg2WHMhb+fXvx773VEoZtEbKt5lxdIVaDO0sKQJEw/jiW3eMmdUlZ4DUuoW6uiq2Qq3WxtHSBhL0fNnO0TOsCP/87GyazUOpHvL2vHod4BAUeO35wsYP/5Y6plNIsqPSOXNTpJtGhz/PTkK/phzZ44oYoesHhgm4h/QIR1x4NRuUsgqDHv0Deanmfe99+9DnH5TtybG6RfsfyouloVaPgn0tDxgkomiMCCuRoNmkkZwlf66jhtqHvskhr7qfZZfYoXjEs/rl5E24amv8Xd39sQQI1LTx27LK02AYjT9Mxeb47ydXIrJdzGVq+j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gVMELrVf0NLxDd3uSndsvFvx5VzpxXw2yPNs5Y/k7/AVWDlMGkjUmaf4esDiuNrF/IsSlxHth4x8I68m5ZR240joSTd2jnSRFYtf5hIreV/D8vvPc0Qk1M7rk/WOLhTaCJQIxdAL0XSKMA1mdvruKA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5df74831-79b5-42c4-12b1-08d98418d666 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:26.2871 (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: PA4PR03MB7071 Subject: [FFmpeg-devel] [PATCH 067/218] avfilter/vf_derain: Store format in filter, remove 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: xAfpfoHYKYqy Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_derain.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libavfilter/vf_derain.c b/libavfilter/vf_derain.c index 2950527f69..0eb7da18da 100644 --- a/libavfilter/vf_derain.c +++ b/libavfilter/vf_derain.c @@ -56,16 +56,6 @@ static const AVOption derain_options[] = { AVFILTER_DEFINE_CLASS(derain); -static int query_formats(AVFilterContext *ctx) -{ - const enum AVPixelFormat pixel_fmts[] = { - AV_PIX_FMT_RGB24, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pixel_fmts); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *in) { DNNAsyncStatusType async_state = 0; @@ -136,7 +126,7 @@ const AVFilter ff_vf_derain = { .uninit = uninit, FILTER_INPUTS(derain_inputs), FILTER_OUTPUTS(derain_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_RGB24), .priv_class = &derain_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, };