From patchwork Thu Sep 30 13:40:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30774 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp704022iob; Thu, 30 Sep 2021 07:05:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9aSWxPAl/Vow89AHA4esv5OvGh1IuT5VAxddWE9SYA7/FCRESLdb0C6FwLTzSC95A+lLn X-Received: by 2002:a17:906:d541:: with SMTP id cr1mr7297631ejc.81.1633010724664; Thu, 30 Sep 2021 07:05:24 -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 u4si4520299ejy.271.2021.09.30.07.05.24; Thu, 30 Sep 2021 07:05:24 -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=Pr2gXV9c; 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 7587768AFE7; Thu, 30 Sep 2021 16:50:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066075.outbound.protection.outlook.com [40.92.66.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DD7E68AF7F for ; Thu, 30 Sep 2021 16:50:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bRRHEw5UPGxt5U5EO1NxU1eSAIei/oaIG5UO5UpTWFTF4QrU5cRqRAb9mCjtsD5JUnJRJpkbgAfjNpxhPROQwBF07akAL+J+oOmJpoLGvPUjaZ6xcWaUuOl5Dsfs6UAzUMlnSTDWIUVABl931EjJr0V8uwo8v/D6XMrWmgciLqqxmAPjImBEBztBQ/DZsA637EY6ZITct2UJWjOYWYgesoWjP+UJqLHhbrrJ8rg0A0sPz4O7UL5sMw108++fVlZpYs01AG1yNuIKlqP5v6a/J4qwfc17TmqU4gnwxGYhhTPkuds5J0XT6OAtLhTLZ3ZxUTgcSWH1d5nNvUN7tGtMWA== 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=tk27HBniglHI035aDg0qHwLH2VoD7lqsbpJjvHTr8nY=; b=OyvCQBxm4hyqk+o10qNqs4Nje9ZROsXdsTizNCAfdU7qwcKq+ZxKDGqzS4eW2ajYzDjO/Z9psiTYFevibkZQaMliLekEwOXtRu0IxFO/q6TtYbSSnf3ttwY9N9QL/3A6LnzzusjVIQnGVum825L1IDzzFOrHOEBEiTDmB0NcjEdTg9JqqTzb09HSIgn/WICBwTHtd0oYo/m4M9f18U7z18ts0dLc6lXxrvGAeUD2aTrrIZ8p5HQHukgKJaJA86piu8v4V+gG4goov0vaUEvCfd5O9eF2BZFXIpVoE7wrGVNDlAXAMGkZKelGgKrUdhCv7yFRZ2annUL9gj0RJxkr8g== 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=tk27HBniglHI035aDg0qHwLH2VoD7lqsbpJjvHTr8nY=; b=Pr2gXV9cyvTGPneNQUYMssL0sXWuw2qbjTyNjB0/r9ShuyZYLqCrpT+uTaQcdp5RFB2kK1fRoSKds+zM75eqK9r/Ho/6o8YmjFKUkv0FiqSjCpfeC+x3i0e37OGtKA47W+P0vqhR4CI3wY3Bw/yTfvgWDWqblEPqfkqF0jTxrpRNMHwgEbZerjdbxmqgUK2rPlRpM8ltAnjZcNqPRX9bY/aX6eA7MT7fZyVXwQ58BJb+xnoTZ07aYIqMUfzPNqIWqB4gHkYlOew59gYuFHMDhc9nE2UGjipsTAcTGU6yOXRioTOxx5FfJuwPYHRaK5cxlbR59Ij5/M7xpYJw4cMEPw== 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:25 +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:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [eup7UnlNJBPgadt12PN0eQ+0GsDsyxup] 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-104-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:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 74e4de94-7f70-4cd7-26bd-08d984194100 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Na3/Yp5vS4YWZqVQRo3ABRx9KVndURxiTRuvFNdHm/4USQzA6My2mlGp+eMNm6RCSb2DJcGFf2Ta6dj0TnrFNKi/prR558NX9E6IZzl+a6I/82IN7ZMsrSkXBpjZYwOwV/Ou9RLfaDSllQ43mK4tSZnGlT8UMefI1JC72RctBZK3wwU1VgE8dgUs3SOJmITXBJqrFqlmqdlY5mFTTl/nSPu4z4V9I4xCUIzXO30jaAvlIxOP+MRnUviG9LT14+3++O1eqxAd75CBWsHS56p3icQZli0UEG2nqZ0QJmm7inNQCa9T20BADuv6102ac3psh28s+CjV6h1I0IejD3CemReTiv47LQhGdiagNrMpdplJaTiL/4UI15XiWtKglqi6vXg1Z0LxCUuaBAk6qDm7axDUAGW8rnQvsTwxwaml5B/6nZHZSFl1In9GwUed/PQoscdDHVnxYtwG/0vhASTX7ep0tdsnHtn2NdRKxbV8aKh1jWM5Eml7YYOt9opXOgm5y0PVLbiY8PrLpNmQ6tigRXALcPrelkQ8UdAwqMkPqTpMdNZUlk6HDcmn7edNdEZWzSux/GGAlEh+TcSgnfEDp9gxrKSv69Q5xR6JBe2T+ofqHGz4k78ILmDRpIlN2DhjCLXVPhFaGtL5H5JxEBRhR33AWR98v3jmYUF8D/6/RVdIFsKRmSbmVJtQZMW8/IW/8g= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oyfDrd7DHK4JsyEgnLBJr7xbQ9Bn0N0BPzKJsSNsQwIv15/SdCHkcqBIk9RCTtPAtjx9I0KUS2NrQ3tDIHfaY0hZWa0ASDmErhUKpIQFEQbK1K8zpjw08VrGbUVzGdsLC6hPWb6y5VAug1rKSdX5YKBo9dAtD6rzqW8oKy1DkkVsX19jaWTENPIimsYQAd0+8cGwUb2B5Q6JjtiobtW4ZMYpmd9dYIHDoDLTrLIqShAYCpPxX3Yo/JeYQrvEcDaQjuML4gojiM4GfFzsLgG+2tsf2+r6Js516LL4OK0OC3uj6shzNExxFStgLHg8PB7ObQjRQh4mwxkPIM/Q8bGgK/rMCWxf1F8F/cvNfqM4I6/pXTOQEGpsVOn9YhvvhooV2hwA9I89IzI1zBuyTB7ty5zwMN+2dTk2R9xC3284eUzhuP5zjaubhD2V7iGcHmnd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rTZ/oVZGEI7QIlKOAZ1XYjkH7+s2Lz8TRNbfU2cVXCfo9GExB3CJ1T4eaSiyHbbyVLlLw5km62uUfT06yKE/VVbzR/5IjgRyWXc5ZKIS+k0ceXjLUtrIADQnDmTeUe8EdQS0p3qEAewDfTJCQBkugw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74e4de94-7f70-4cd7-26bd-08d984194100 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:25.1583 (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 105/218] avfilter/vf_ssim: 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: 7MV5hZ/jW0V3 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_ssim.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index ba0f18df8a..bc6671e49b 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -420,8 +420,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, @@ -435,9 +433,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input_ref(AVFilterLink *inlink) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); @@ -596,6 +591,6 @@ const AVFilter ff_vf_ssim = { .priv_class = &ssim_class, FILTER_INPUTS(ssim_inputs), FILTER_OUTPUTS(ssim_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, };