From patchwork Sun Sep 12 10:53:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30185 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084800iov; Sun, 12 Sep 2021 03:55:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwc8dbKHa7LW7sr8+te0D0qlwJTbfuW1631b0X/Vs0+VANu4xEdgI7axXYddIKlP/sC+197 X-Received: by 2002:aa7:c80a:: with SMTP id a10mr7472932edt.174.1631444140824; Sun, 12 Sep 2021 03:55:40 -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 m8si4291407ejl.358.2021.09.12.03.55.40; Sun, 12 Sep 2021 03:55:40 -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=aC01jJxX; 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 EA86168AA3C; Sun, 12 Sep 2021 13:54:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2029.outbound.protection.outlook.com [40.92.91.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9834A68A9EA for ; Sun, 12 Sep 2021 13:54:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G3/vbAggGGaV3mpRihQ7Ysbl634j7L5tYxXOkTE0vjOxhKnYzQvpLrRCtDfRts1B2CVnfzXrx60ZDIuDn1wJG1MIWnixrSfrka6ucp99mFwdxx5TvTOtCl9GqIEPl4g7cFKhV5+xO1v8EMaNqAeDxDPo+uV33y2DbADdzQQDenZQ3nD74LvGLGrtcdfGei4fbmdSbKKgFNIJ2ecH+8wzdNiXDO3WLAhqdUidGRRRCV8Ja6iS04vZmqxta33KsvHdR82oCtORdBY6i90cqnJLwNHiqXSQ7MAzn6vgSgi6A06tyNfiRJ4Fiw74ZZRs2byh/AIZvebE9+nU/oMwY3jcjg== 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=DEf7J0HfCx/Dx5jyFa0bHwH4vNyjMCStsteZLC+QHpc=; b=VQC53lJl4IGHasz6wX3DxOHIAZKyMzgWmsoMA/PXGkMzJkrLJkDKZ7A4X9qRaTN1TZywnfhbjEaNWAXKN/wiDPGKsmHGHriNKMZf/yzYsGucw1zkeyIKlUeluCFqD566/6kccbHl8ceolq1NP2va7UY4OzzpS85R6hquLGYn9P376LHJV/e5eEbxDqbYIJi4eG9Thv+hnNMoCG8hFujxQ5XgHF/I1nVCdvrdyzFs1UTOeGANNLRt72zNyIsx4O1XwKfz+U5q6IESgIwY6Ns91Y0Aqn6zSDTFVsQ5f7bKr5Q0krWH/pHqYIULcNoGKTewQh7m/piro7sz2xP+7o5RGg== 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=DEf7J0HfCx/Dx5jyFa0bHwH4vNyjMCStsteZLC+QHpc=; b=aC01jJxXHSuDEYInpR1V3TyJxS2JmD+5RRoVyckJEWg2CPx8Y88GIxgySL3H2gj9rv2Y9ggCwtgbFNuRcfhTZpumb1R+psBF9eosAojCsT01f9HGlwPBs9Rk8E3oGj7dZlRHEvbXEWYez7ESPfokUh8wxgbSyNt9C5zZmuqyim/+BakMFCmhPXQyOpYSdsQz8koToVfPYxNnmlBILMthh4XoTXBYiUgixlaFLmsLvfmAzHst/iUO4+Sc35UoWolduZJUrPDYevxfoWD7lbHOove/1qCEftc0QPNNCM6YDY45T2iBaRL5kAtpEffo93WAvqGNXfduEXhD4TQJH3QOEg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:50 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.018; Sun, 12 Sep 2021 10:54:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:30 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Nf+45cuimZMf0yWkrK0UrRrP9O+fyKUs] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7753a64c-6011-4c1e-2e38-08d975dbbea3 X-MS-Exchange-SLBlob-MailProps: vKxeIzzER/OoNofSaTKg7Jt3BsrGee2zQnRmQZxTslx0HlyvYc0gWYpmt3xvafjRLb3ij+71Ay/2OvFMXug7BiXQe4xkDP16HvMj3geWdSeMQEqcBSH5BQ9FfmfrWwY5xOmMkcuTmnvF9NGd4+YkUCNYBQzMR3dxVt4lPyCKKV1GQn5yBNnKYE+tWf+X1WGAv1BP/4m9deA8w4j/c+xNy+IAHv87Cej32vGMEu7BZ3iBEUiQsJHdHf+rz1sOWOYaJMrWxmAV7V1p0P23Td1DM7Uy0wSqHuiU+2ADoCUdYu2ajnzfkqleR4BzYhQFPmwecyseaUahyyLmm4/jWxyxV9x5c7s6Dj/P981GJm2QK89blSWHKuXmed9z7rsMXOpkIsRvYlebd8s28UlJp5uUzrNvoeIHwyeWqesKcJd854X+qgHdtxZdiMeaFHnnMg+8M1yJSTczsucp4W/qoa7kF9v6ZxKOqIsHhsd5Wtl/jaNsBnILdsHTL0BwxAUMa97e713eiQLRKYEFiowI0tDVTb08X8esq0DG2l9lpYgACcAm/yqSMKR7Xigzue9pEbwXApAnV1VVP0dzj9Sxnso0t/XLvqJFx7+se8+07EeAzBNQg4JF7qZnjpHDad6baEmPKnNRt1PfBhGo23uedDbbSgda0nDbniZZ8lsloLufEmvPTRxA6Dt4hNN5dXwnZJpVAhA99AIvCiA1pDPLi61sITZyI7v+SABHV6DkepLnszMoukKplwdwEFh5GJkNgnnC X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AeMY5PysWHzmDCGpTO9FTjBLbHMR6ipEIcBwj7/aYvZI3QBx5O3YMkV37DxCOf2MEvGi8B9xzSttus9mTcwsEjUsgfNEoN+n6j7kz5hinN0GyUcVPqnT7fZIufYHMKLNWGHDkG0s9NNcooCOpR+z2ZRFgwjuZdhl0VutTGMcNlgbxpgWYMgrDupzGBYEVRCNZ+a1zEgWbWAlKwI19NC2eGt6h8mwSHToJtz+Mg9jkQRiyM7M4+u8jXEFeHzO9ew5Tdm2Rx5b+Nb7lmKhB7c6q3chUQSb2C0MZK0VH0zKxQgQhbAaoDNsjbbIBdFSVyJdcthaiU5UhX/02J3DrmyQVleVPHlJjlk6Ld0luYmOxQF00lJu97vk0fCGD5omqQnMnOJE7z8mKwNb77QrYWbS/trwMgi4lO85GyUtR//bsMUiVswZUZfAjaPwED/TvBKS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dRdCp0lNZWGrlsNNt4rCUTbmZsRNGtXNP4pMzSuNbTXg/PpA0VNOZe3v/wQF4ZweS8FN/UDZfJnofKdYMFoe8dU9NbtgkWE/4Yb8Svds2b7xqRGd5OU68kS34u+OWQcl2XRXgKzeixOfLKtiUweSvw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7753a64c-6011-4c1e-2e38-08d975dbbea3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:50.8359 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 32/38] avfilter/vf_grayworld: Remove empty options and AVClass 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: 6Ya+vl9EiW31 This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_grayworld.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavfilter/vf_grayworld.c b/libavfilter/vf_grayworld.c index fd424527e2..b6b39af677 100644 --- a/libavfilter/vf_grayworld.c +++ b/libavfilter/vf_grayworld.c @@ -26,7 +26,6 @@ */ #include "libavutil/imgutils.h" -#include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" @@ -42,20 +41,11 @@ typedef struct ThreadData { } ThreadData; typedef struct GrayWorldContext { - const AVClass *class; float *tmpplab; int *line_count_pels; float *line_sum; } GrayWorldContext; -#define OFFSET(x) offsetof(GrayWorldContext, x) -#define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_RUNTIME_PARAM -static const AVOption grayworld_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(grayworld); - static int query_formats(AVFilterContext *ctx) { static const enum AVPixelFormat pix_fmts[] = { @@ -328,7 +318,6 @@ const AVFilter ff_vf_grayworld = { .name = "grayworld", .description = NULL_IF_CONFIG_SMALL("Adjust white balance using LAB gray world algorithm"), .priv_size = sizeof(GrayWorldContext), - .priv_class = &grayworld_class, .query_formats = query_formats, FILTER_INPUTS(grayworld_inputs), FILTER_OUTPUTS(grayworld_outputs),