From patchwork Thu Sep 30 13:40:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp704256iob; Thu, 30 Sep 2021 07:05:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyf+CKGGAwc0fBc+gihoyaBTQIGDu/WK0vfj1MGgaJhPw1lWTpiPLmn6ZabE4qbY2Z5cbt4 X-Received: by 2002:a17:906:144b:: with SMTP id q11mr7376308ejc.78.1633010739246; Thu, 30 Sep 2021 07:05:39 -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 oz20si2263186ejc.688.2021.09.30.07.05.38; Thu, 30 Sep 2021 07:05:39 -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=UIeSFmiv; 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 60E0F68AAB1; Thu, 30 Sep 2021 16:50:30 +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-vi1eur05olkn2037.outbound.protection.outlook.com [40.92.90.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD9E168A9DB for ; Thu, 30 Sep 2021 16:50:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W2WIR28yaIQsJVv8VmSUTgAnG9MlcumZSiKcUT5wt94b95UI9k/uirNWC7G39PRWliz66RF/ZCeZ4oKR91AwMuwsAKYZn3oT9ojRj4r1FesfEQL9hCaEk4LxnCXqXpAJ2bUXalUl/rrBzWz7LoZU0QrrF850Ab2UxfiPdLn7KBnbTyz2GMU9vH7NDnCWt3M3JOhSujTpTFPsR6R8saKhM5FqY3VWwsrVqo/smsYnhESqePs8wl4KwBtVqTTlT578Ln+UzMLiLyzAQ0j4icnab+zYh+LGlK0SxD+R7jU9YpWf1sYtg0eLABlTwYwZw1io++EJrLWKhniKDxC159GMLA== 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=q2O2pk7HoE3D8EYmRX5pA8ol38XPsdgC5SKXj9GZ4vU=; b=fIiaC84DHzbGFzNe8zfi3y8BJNDtV18FHAXsLV22l/I7IxEDf6WhrFrBPsje/TceqMauM7T8r10GI+gqxn82wjRMyDL3sgDTNVLcD1vY2tlDNIToR1XF4kS2FWlHn0RHqDt6HKIYRDqQF+RosWu3EXp5cuCMt6wmZ6lXZ93vg341KM/frRXJscTbJ5orCq7lwpHNqfYZoobyc4HPcDy/3jltIuw9LVWYp1L6CGauhllMnXkRb4VbvqNaBF6obFH1bjx7JKmZ0JYGRSL4nTRaM2xAjraRSIoanWqCHz9acZA8SwSB27knXZnNSNbIXCk3w9F1Ud47Qw+oFJpNNmtI6w== 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=q2O2pk7HoE3D8EYmRX5pA8ol38XPsdgC5SKXj9GZ4vU=; b=UIeSFmivnVGwUObI+q1pIzly055dj1ZgQYZbYe3WBm2Z80mKWmiTukhNgfD4aU3gwh3/2kaGPDwigpgc6Dy+nG5woZcgI9Jl3kN0uNoXOWrL5GDMOjc/JgYwhBdLUyY2x4/6sgeEST5FePHJ4fPAn/TL+8eVXlkaCqkI8+48vy9OaPHzhIBSQmQlr7lvWI4pXkwcFr6gKEQd+NoFPEZyMnYD0DVPcfog0EnsYX9m9PsQVv9/N0ub+Kqb8iTG9auSoYIDG/HnjCmzNEZlLk6UKP+/cgavM/jEGfmiAuQCxHo+uZgBj/MODQNA7AH1P7ryHIpNNrYbDeuj0/9JnIRRVQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:50:27 +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:50:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:47 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [7DSab0cnXVyNPhNJ+vUO9BGX5b/u+6nZ] 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-105-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:50:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88bfa7e9-c4c2-41fa-4173-08d984194288 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZvVltC3d/coff6IrDjSVhS9k0FxPPW4rrtujIzS60qHwpD5sVLQyRBkBAUvCbIQO+ZzFIXeCbefRgUPIAk2Wa5/Iw2Bs9Om32t3ZQr/auM1H9KwUtjCYFNU/Q1/oEkUGILsGUQpF5mkTfdWgSPRxSka/WkX5AtSvfljeztjEY3HizHOvyFLnpYPZSd87gt9DT2h0jUQ+jOJiX0F2EEdkQlGKI0TJ+Samw7Tw0uBxk0l+qmi4MR/0nwA1lW+acjDtHLve1CfgcdTa/K00XTn57SrQY2A6hgYx0JLTWi6S8GMVb8+wGJLusf36ySZRRFY9bq+VRw04lwowA0pluMDtH+XYBKrTwHFyWff1MIXlMvmsI2xHecrG6SCdKtrTkQJtF2aBM1HFwGXeSRnzon1BUjnXOdn5JUdquf1Xlk/06c837WNejz1bi9mayGYdLw/4p9ab4lNc6FgoNcjxldOUSqacwxEHJALOCQ79k1fsPrnttPc6rbzLPLIt2MHGhY0XE4CUEYVmYMgx40CADUHB+Xhjgzdpp3cFuHsCnr4okKpS6refUQivxF3gkCQAiZ9KB9SCyWUGTIXV0sH8imhkrHQw17Q61xzhTWcjgBebwaV2LnKXv+Xe2GzhLiSR8bV80goV2OAPqZMJoPz0sPAyvODVRP/FCTni+hMsBmMYrkr0xJLaVN77+7rhaHVfQ+2PY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E0/VYohjCBMRcJtLJIqagjPfbj3CJJ35qcIjB3F3SuD10d7b7Q6s28vFCmpElTTpSIgyY+tgaknCEjrSNQtFTPyEdnyynnLE0/IKDIjScD+Ig/oZEQIEmQGZAZYJJKVOzGCcOcVFFojr8bbMxW2zKld6hMjvJTqmTcNRumBpB/PQ6eN5ge3QwBcjdkSaNYopBDFAsIQuXSJ6sgbxUrJEz/zJjxhHd2DX4AbQyba5+FTuwPj8jn3IH48AngbXNKkk1143o9hoFvKDKtJogb3ON5XKYDsOcAfnuoVrocJDrNDL0/C99OvoBfLKgwzXp1QpbPmuVNPH0hUqFU4mn29hnArwjYmKoTnlmKfC1+sPkSDTA4Q4MKEPR3RWOl2JtMh0CgODCKW1PSqVBKChn1XzbAzGGPvvYZoN73bJ3t4M4XP6ELjMeUxLM97Y60VsnuZh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FTTRTGJq6pXoUPfKiSc9b8EbzzJ+8c6s3ieDuT1g9AsP4lYTcEAYyxJfMvJEWcM8c1xUG8xvTCcKzmdbxS1SBgibeyDOSYdjaa6qBQjK3oKiUDwy/xpCafm6G6s4I0jwBGftPeQ7B5W9aojM7Gbi8A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88bfa7e9-c4c2-41fa-4173-08d984194288 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:50:27.7280 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 106/218] avfilter/vf_sr: 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: PaiOHF8IFpVL Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_sr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c index f528fdcad4..4acf9508a3 100644 --- a/libavfilter/vf_sr.c +++ b/libavfilter/vf_sr.c @@ -66,15 +66,10 @@ static av_cold int init(AVFilterContext *context) return ff_dnn_init(&sr_context->dnnctx, DFT_PROCESS_FRAME, context); } -static int query_formats(AVFilterContext *context) -{ const enum AVPixelFormat pixel_formats[] = {AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; - return ff_set_common_formats_from_list(context, pixel_formats); -} - static int config_output(AVFilterLink *outlink) { AVFilterContext *context = outlink->src; @@ -200,6 +195,6 @@ const AVFilter ff_vf_sr = { .uninit = uninit, FILTER_INPUTS(sr_inputs), FILTER_OUTPUTS(sr_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_formats), .priv_class = &sr_class, };