From patchwork Thu Sep 30 13:39:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30702 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp684575iob; Thu, 30 Sep 2021 06:43:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxs8QouAutOAdZbxILfs0CvUx08xmbiSBSEHG+9MIsj2HN9rK1iuUEAIXYwkn/8nUJF2leM X-Received: by 2002:a50:cf08:: with SMTP id c8mr7180068edk.86.1633009424960; Thu, 30 Sep 2021 06:43:44 -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 l26si3277473edv.557.2021.09.30.06.43.44; Thu, 30 Sep 2021 06:43:44 -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=rXsbC9gG; 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 DE45A68A877; Thu, 30 Sep 2021 16:43:21 +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-oln040092064022.outbound.protection.outlook.com [40.92.64.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BE5368A7DE for ; Thu, 30 Sep 2021 16:43:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OGF1eXEMD2gd4EX3tpov0MCFJKWxZD9ethEpVpT9FgeB3Bx3BrRqDEVdsm7MUgOYsu7FfaT2RaM5dr4Waol9JCuxd8JNcHHvxzVWB52R6Jcl7kybW8Bq0jGfIHp41Wu6BP3mm5hFKwblDl7U8zi9SUAPHo0D9xFv11hqyNfi81xQz3X/QY6Uu/u6e5CPP9Z2TZSHfQszmuSxEIpQqfpaf2UXYblA/zE7kGqFxghCgrF9e5FGTZfYy2fKO+3zn4rV86wOhM/zOHWJGjmUb0DJUoVkGUDg9c6UyyUCypJJ3Dmuaay+I19bQ8IdG7XKSVwUWAsINiglVFtpyGTXTrVVeg== 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=FKXLYGl22Cd2RZbziLxL2+Rab3aZq+q44WpgvKmOuiQ=; b=JeI2pu6NCVoKmv4KlDBiO8ppnjQLOjU03HQe+X8xwTF0DXaJ+v7IEzREp8LD+ZcLKXpBHawUlyv54+Db5eZ3Nff02ytl1TgxRoYXbeWxlhhIkEjCEciMpauKVr0uUR3j3wGlx3bHe2/aLn+rqPb4YyYIeU4wCXcZ73dUjzFRrSLe34rb0YRQychWIFikJDHJGllD/U5wbYkfYCH9qDVU1hFOmm4eNqkLr/gAjpIack/CyEColLZnc5j5CXfrGm4UeJKxrXUGtGqYeFNdnZPP7tbb5A4Pg86CUtq/lgGuQYtKAa4aIKITwwzBPqZT+MD6u/+DOPlVAoM60J7H+UYjIw== 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=FKXLYGl22Cd2RZbziLxL2+Rab3aZq+q44WpgvKmOuiQ=; b=rXsbC9gGwotmJloqKgZSX4AX1AJdPL9UtL3dZo42sqcov+yw4F94dNUgEe8GUY3hdzhfR0tIr0YoAgFARJYgyWIpxHZP2nJPavKfvvmiCkWT2q7zfDq7ZwfVamJx1/tdz8jP+Z5SePruThVzoWkXrhC+SHXWA54FqUVLClqhIA5q7ubGO7Hy5H/goMgio8Zqd9/KK220gnb2sakSvmE9LACQoNtiuoXaTRwKbDwgu6vgH2gf7oNqq0UNHdS43RIjfSUfv3VV9aNgoe9NiGQQFONsQMX5pT2acH2y6+qRLbYm7CforlSxfZCJKbChTTSywzTqfj6xdLh6xEQqEU+IOA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Thu, 30 Sep 2021 13:43:14 +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:43:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:06 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [i3CBlZrfKMFiEZstzgW71tIEciD6qDDP] 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-4-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:43:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5a629a0-63e2-427d-8eaf-08d98418401b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbNM4ubwW/IaMnGXAYk84TKFD/kjTFFmOAnDjwgPIunMQh30+PWt7LZeTOUcw2tZaNGECf6t7ff7VHhWS1MLMceeSrcZs7qYKFJbmcYrasZfLL3RuQzpTMtj2jOBak58Odj2eU6LSTE4jS9SJHh7UXTf+aAtJykC1m60XG4qKQcvQApZhPwn9SIvggjYVNgEfHrtDh+0ycCwWr191oEWp5RoiuH9nG+SrjMUj++XQO0Pj6tcuLE9DpF9IXlp1RfIkqQ2zRgJ9yfROflFity04+MfhBsJNu/OIpG5DX8dKeJPmi/nxd/hKjZjv5pWR/3IR32QlEzaEaukhwrC2SdZfhCGknBbvHkkTQT5Cr8AaIWopbJ0xS8SGsAASI90o1Jx6nBeGBO/FCFg8pg8a7ikfrApWxmm4Pfdci7Q2oBXd0cpfjUCDZbJhX1u17sS+yIlQbO9QKiSNJzO9Z0sACBZcT37sfvWwD3KcwP3RLEQ3Zvh14cJC4tvYdNvl+/NhPseP0J1YYdAl74QiTw2KjtkACzdGcKyXtK/jdXuCgSGkJgc3hdykDd5KeDHYDdpGrZ7cBmCVEJFzDnNonl40iyQafHhmMw9l4T7U5GO5TcJL/pieKvcXS7RSwFpZ5Wkf66YZhtN1/zrsqfJNWm2XTKZ921wQw2iAj7fHUduQFngfYXrwSQgoW8zHLsWH6bcGWt04dhWEeWLzQq8ozIba/8upOB1O4fg3cGp8D0= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f9IOYr0OPve9qUMUMyRyfAfrInkwAuSibuLhiOXxVCSDyR7c8kxxBSSMshuPoxiC8D8beleBXoZ0HXNVnux4vX+C0ESJ3V39pJ572A7m+WekurKtWLHaY3NTePniWxO0hGljD+duPXe4n+xlYnsVOo/433XvOOBY2uPo0Ai1pKjFNjR1nsEvU3vB1J/+PI6aqEfBUQUYEx7/VyJFSePztU4FZAk68+3gIgZWof1HMTK23Cal2HXbZjP1pbnOCkC9lphzJHmEfqyt9N6EXGU0B2YSYkLkMJlI94RGHp8TUbOmtJUSjDSu11A0SWWw00DWZ7vhdIvHputvKj7dHfZNSpVk0zzgjcTFffBSAgDUphF7YW5EL0RCWTGqT2Hwo+UUrwBZGmjfIKqbF5Y9IqjdZZ0JEG6uYdCFZb8WSao298GGwoAuZ2WlZTIYSeKtEMYl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LmOGk1toTbVv+OYqcDVq0dq4jnW+/CmnAtRtWeFkYzKZSQq5y6IM92eV5VZMTpqwtlOT9et/51xCHBcj0zQXfMubXbcV2JRzhzihhXSk8TJ8KBA/f8i1IFXbuT4eBPiX5BULh5HXxPrSLot/BAZGQg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5a629a0-63e2-427d-8eaf-08d98418401b 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:43:14.1455 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 005/218] avfilter/af_contrast: 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: xqycGo78XRH0 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_acontrast.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/libavfilter/af_acontrast.c b/libavfilter/af_acontrast.c index 91c4ecd19a..db7ff79d25 100644 --- a/libavfilter/af_acontrast.c +++ b/libavfilter/af_acontrast.c @@ -42,26 +42,6 @@ static const AVOption acontrast_options[] = { AVFILTER_DEFINE_CLASS(acontrast); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret; - - ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static void filter_flt(void **d, const void **s, int nb_samples, int channels, float contrast) @@ -203,5 +183,6 @@ const AVFilter ff_af_acontrast = { .priv_class = &acontrast_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), };