From patchwork Fri Sep 17 02:07:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30297 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1784643iov; Thu, 16 Sep 2021 19:09:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6sDliYFz9HTP0/Pi3k7F+lko8jMfofDNDzGWHzeikWOypjzZbZgloz44exbNVVG5oHeaT X-Received: by 2002:a05:6402:1c95:: with SMTP id cy21mr9843310edb.397.1631844554982; Thu, 16 Sep 2021 19:09:14 -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 r6si5638407edq.273.2021.09.16.19.09.14; Thu, 16 Sep 2021 19:09:14 -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=aYSThSQI; 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 0277868B117; Fri, 17 Sep 2021 05:08:36 +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-oln040092073103.outbound.protection.outlook.com [40.92.73.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5F7168B112 for ; Fri, 17 Sep 2021 05:08:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X9H8OGfX+1A+Ms4orNg6IhfHVjOzWYIYzp7yXA1MFC1vDGbaDy+bfcPdObnhSssQuJYf3FfrRkZw7SmPjXy6uzCw9krcr9fmV6rkmpRx9zQiWd1r4A+VqMb8uenW4btdGThEr9Tk552nRGcMUGOU7/COHsyAzWLRBPqtZOXpLR8tRyhbi7V9Wxm1JAtKdefr3dJhDQ0twv39eJq7vySzKLTSOHSmO6UV4O9r04pt6EfVs2ibb4mfjXVUOzXoW+ZhOwE6P4qlUpHolWcO3om80K1L3R07epDBa9N+kYVNf2Xe6wiYT4icSPv/JVNV4FtTGoRWxl5GnQvlEcYoyvXePg== 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=VcoVvmIShEuVoJRzGzTkHk2RU/iPNGOouQgLMfa/oSY=; b=dBJJBbNSh8WAuhRTgnDGzKuFFA/TJY42HUG38KHsPKYXnKWEWwZB+kfkjd0DwHyo4nz3/E55+sKJQaV2b6auJhKU8JYizFqzhY0gtMatF9xf0hvvJFD8vgbTjtncTMRu8w/1lH6+wsbrHwb2+lCBLRUJu0v1tIpA5WUskkKMuEAlxfZWeb2WYooB0KWqq1aR3ON6pgPwxlg/94y76dzwjj/tge+9j/SaFfqy2E8usKbf6LbKwyVSyV6pXVmlYkcr0si8CDbY6iBMWIzr7Jgle70j+IjHpRoaKGJvEY/h4brxUoR4pGSGfvyrqlJ7fp8SeBBhVqPKyVkhOksagvl9xw== 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=VcoVvmIShEuVoJRzGzTkHk2RU/iPNGOouQgLMfa/oSY=; b=aYSThSQIV+yX0Nd6tpBAEwAM8OoecAAJVm6Ar1MH14aQhIB58nGkO8Q3cjCttCgpXKtMLwv6s49gZmEb/QebnfEQxeXcY/Fr9Nh7c8UDK2wKAdRxIaRj93f8hxU7ET5zxUMps6ksq+gQRWaG2gdCk6QqivD8D3TnIo7TQuGlbfdo08nXZQRuE6/eJmeRQPiZ9zaa02rSE4SBPeoDoC4VbtjdwUrhAZH+0eTnaJakQh3Wr5A0wW3PYbfsJEuueTmmn7b+DykeDcKEgkn+YskKmZR+9k8Ax5SflVDmLHe84fT9Zoou9kh9x1WMPXPWPnZN4BcBZZTZT6X1yog1plDlww== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (10.141.218.86) by AS8PR03MB6758.eurprd03.prod.outlook.com (20.182.229.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Fri, 17 Sep 2021 02:08:19 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.016; Fri, 17 Sep 2021 02:08:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Sep 2021 04:07:59 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [+mdG3uMOlgl9liyVw05vp1duoh2cN9KV] X-ClientProxiedBy: AM8P191CA0018.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21a::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210917020808.275498-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM8P191CA0018.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Fri, 17 Sep 2021 02:08:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f7a924d8-6daf-4dce-83ce-08d9798004e1 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEv5Hy0oNvS+VrPA90rn0AJxvYe0+rOzNQFnirmGK7jxxcnGzhjrILmX8lSSzZzL3R/U6BRuotUlZ3bgs/XID7KcZ7bQwPnpBGq8v7XOqqyOR9OJY8HIUG8QV5C72IAO4gNY6DX24878XxL9SDR/MiHOZsDk89fC2UlApiCkcZGzh3dUhuG9j9D/BEUDYdtfKeiknHNWssjpNWziSihoua2+y3tfPYraOh6Ee0fYvA24TtzprlQaTDoMF6HF41bp2oyMJVU8WKJhs7iDBw22+/A8wJV+ut6GbX4WTj7jnlqFip3cpxfOK71X9/9iHNs5Bca9dwwc3znC7SU5tleUB1SAGh9+h/938s9pR5raJgkqv25oAeUJ4j/oZ01+kaKqV624ygwjLspXLhd0+AiJ2RYyjoCPnNibBwm298v/GHghtHx/M35EPJooJBCL35XZg5u5GECumIOQMbTEjffoRFliKHNBnb2GlWfa/d4E3cAHiH+fw7YqQQy/oyOv64d44+mLY+K2CkUormp3TJTVKwr+jyaqcUiljoyc8a4/Ct7I71SEYQCRzqvAMeVg/nctaiOQw5GDtktxokxOcf4PS7FKR1iOQxo0oZEbrprnHO5fVobSUILnUXFR7FqlzJJfSSoq9bvMotX10PFERDCVycpM5k4RUvi8mTd8zLUGgKxHPJcQmtDcs5Wat5HDjWWIrgRzvJGs5q4PxQ7QyOzUcSh/LuxB7whjgDgz2iZdmZDiCu/64PpFTfkadV1z1yTuipLtby8RQSuUqJPsmMda/tEw X-MS-TrafficTypeDiagnostic: AS8PR03MB6758: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KL3v+nqUMtbWGe2CQqcahkV77GTYe3COsbgONDuZcrH5aHHnG//5hYQ0ksze5exh3qKqowRaxxm/3Ce/wnfV1795DK0jvGAufVfqTAr7/ZNmPCjM8d5vnQKnKtD+xduzKvUjIDO19H8ugXEs/pvPgpc3cbCF4Iv/EIkNz/GTsjkQzV7vaAG82wirYmfF1JH+01rniFABUb7W6xX3D0PWGSlLrX+rra2Y/SkHZEiIUomhF/cZRL1ROMLroAWu6kih59i0yqzOrhEhCl4CLrCSysdLymDwwO05ehRHtlE1LcOgmCoGJ1fqDjXxQyVQ4espM4aOHDwF4t02JMOK6t7n7z90W9fW6uT3OX0GSK0mVxm0Ylf/3tGRNeT6CWdpLSLe2MMmdgiku8uPh0vIleJFgndpoKeTELQTj7VTDfbJZjh67Zgh/BnAgrUKsetNrByo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UgDf7FgYxBhjC8fWa+w56Qd54sS+xApdh5wmbCQOph5Wr9iPxb9e/Y4+Cy3O80R8EpyK4/XtwTkNxX+aNzxpw+BGmq7NjXZV1VvL5R4MgQlV13sw1w2oHfTWqSEJ6VkCUxAXzMgieERFPdd9CdcG/g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7a924d8-6daf-4dce-83ce-08d9798004e1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2021 02:08:19.6210 (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: AS8PR03MB6758 Subject: [FFmpeg-devel] [PATCH 04/13] avfilter/vf_elbg: Rename ELBGContext->ELBGFilterContext 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: 951vw51hBK8g The former name will be used for a context for avpriv_do_elbg(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_elbg.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c index bf78030ffe..79797ee25f 100644 --- a/libavfilter/vf_elbg.c +++ b/libavfilter/vf_elbg.c @@ -33,7 +33,7 @@ #include "internal.h" #include "video.h" -typedef struct ELBGContext { +typedef struct ELBGFilterContext { const AVClass *class; AVLFG lfg; int64_t lfg_seed; @@ -46,9 +46,9 @@ typedef struct ELBGContext { const AVPixFmtDescriptor *pix_desc; uint8_t rgba_map[4]; int pal8; -} ELBGContext; +} ELBGFilterContext; -#define OFFSET(x) offsetof(ELBGContext, x) +#define OFFSET(x) offsetof(ELBGFilterContext, x) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM static const AVOption elbg_options[] = { @@ -66,7 +66,7 @@ AVFILTER_DEFINE_CLASS(elbg); static av_cold int init(AVFilterContext *ctx) { - ELBGContext *elbg = ctx->priv; + ELBGFilterContext *const elbg = ctx->priv; if (elbg->pal8 && elbg->codebook_length > 256) { av_log(ctx, AV_LOG_ERROR, "pal8 output allows max 256 codebook length.\n"); @@ -82,7 +82,7 @@ static av_cold int init(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - ELBGContext *elbg = ctx->priv; + ELBGFilterContext *const elbg = ctx->priv; int ret; static const enum AVPixelFormat pix_fmts[] = { @@ -109,7 +109,7 @@ static int query_formats(AVFilterContext *ctx) static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; - ELBGContext *elbg = ctx->priv; + ELBGFilterContext *const elbg = ctx->priv; elbg->pix_desc = av_pix_fmt_desc_get(inlink->format); elbg->codeword_length = inlink->w * inlink->h; @@ -140,7 +140,7 @@ static int config_input(AVFilterLink *inlink) static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { - ELBGContext *elbg = inlink->dst->priv; + ELBGFilterContext *const elbg = inlink->dst->priv; int i, j, k; uint8_t *p, *p0; @@ -221,7 +221,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static av_cold void uninit(AVFilterContext *ctx) { - ELBGContext *elbg = ctx->priv; + ELBGFilterContext *const elbg = ctx->priv; av_freep(&elbg->codebook); av_freep(&elbg->codeword); @@ -248,7 +248,7 @@ static const AVFilterPad elbg_outputs[] = { const AVFilter ff_vf_elbg = { .name = "elbg", .description = NULL_IF_CONFIG_SMALL("Apply posterize effect, using the ELBG algorithm."), - .priv_size = sizeof(ELBGContext), + .priv_size = sizeof(ELBGFilterContext), .priv_class = &elbg_class, .query_formats = query_formats, .init = init,