From patchwork Fri Nov 20 07:19:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23779 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CA1D444AB58 for ; Fri, 20 Nov 2020 09:29:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A29FE68BAD8; Fri, 20 Nov 2020 09:25:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C7B068B98E for ; Fri, 20 Nov 2020 09:24:50 +0200 (EET) Received: by mail-ed1-f66.google.com with SMTP id a15so8502105edy.1 for ; Thu, 19 Nov 2020 23:24:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=RszryPX6U0VBcyesq+m//gnR+m6YgIbOyg2Smq7g/lQ=; b=BttgOQhvROx/IlA98UKrSZImFtX7mX/6xFKIOUBD14J/BLSlKVlg/j6QWSS15FIlsu qpH4MfGuKV/XecPAA3x6IHcvh1SHRbSQVomcR3yWluFpIKzjwRNR34D442fRDD4hupTg poyB6nA2Dkh7sXrmB5Y+c/6i7G23E1axJhtGQHi51od7AgCVXjEie2iK+Y3YzRyX9OR9 p2GlzHCo0pjo31B36ZaKrvP9E/1izaQpvpcQ0XAdFa+YaSsicDDhgB5/RIuPN4QAjOKy pf8oaGKLNiaBeGhKo+BsAZReLu2mKaXPvLrJA5AX0uFRS8CI4NZAhY4/NvEDkMYNkwnb ohMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=RszryPX6U0VBcyesq+m//gnR+m6YgIbOyg2Smq7g/lQ=; b=WLKPQtQAoXhpLG7C3+zkjOwXqX3HJFT60dYcW86qD6RjL56dF5OnWXR/a2j5SCkbHC u01/bEy3f+SLWrlK3atlGQNv067pFfBolZT18tgnvFGwmTiwYHdmRK773rSwx/Behyto /1+4NA9E06ulB2GuNpv5oSe89BM2qkw1Znx1K4DPgl+HXb3f6ZRmRSyAYhfhIeVAE5Ya 2tmN0jeytmfezIRAtZ/jRuUk9KwVjjDacp/+iITnjsxYPoQ0MoYb+IIUxjL7zNpFFc1w uKghSTwuqy8kvKSv6X+2yekgKGSLzc4xvl/xcHhNNX1mXXtwx6EJy+K8YApYGIVusfQK No/A== X-Gm-Message-State: AOAM530IHVJyKrSCeweFMfBblJ/bglFmzlwuPn6F7vvuMGZD12l0qOrc qLUMlJ/3vhek/Qpo1Jrx4PhJOdUo7bvGhQ== X-Google-Smtp-Source: ABdhPJyaVzFodwMJ+BwVWwD3/ZHSMvLyA8fArDNEExvuiA1Nr1gG0PWp7MHc6/fTgKTG4G7GFQPe5A== X-Received: by 2002:aa7:d54b:: with SMTP id u11mr35304678edr.341.1605857089311; Thu, 19 Nov 2020 23:24:49 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id lz27sm779419ejb.39.2020.11.19.23.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:24:48 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:19:12 +0100 Message-Id: <20201120072116.818090-40-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 039/162] avcodec/mimic: Make VLC static X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/mimic.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 60c612003a..ea6a7efe93 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -23,6 +23,8 @@ #include #include +#include "libavutil/thread.h" + #include "avcodec.h" #include "blockdsp.h" #include "internal.h" @@ -58,13 +60,14 @@ typedef struct MimicContext { BswapDSPContext bbdsp; HpelDSPContext hdsp; IDCTDSPContext idsp; - VLC vlc; /* Kept in the context so multithreading can have a constant to read from */ int next_cur_index; int next_prev_index; } MimicContext; +static VLC block_vlc; + static const uint8_t huffsyms[] = { 0x10, 0x20, 0x30, 0x00, 0x11, 0x40, 0x50, 0x12, 0x13, 0x21, 0x31, 0x60, 0x14, 0x15, 0x16, 0x22, 0x41, 0x17, 0x18, 0x23, 0x24, 0x25, 0x32, 0x42, @@ -111,25 +114,24 @@ static av_cold int mimic_decode_end(AVCodecContext *avctx) av_frame_free(&ctx->frames[i].f); } - ff_free_vlc(&ctx->vlc); - return 0; } +static av_cold void mimic_init_static(void) +{ + INIT_VLC_STATIC_FROM_LENGTHS(&block_vlc, MIMIC_VLC_BITS, FF_ARRAY_ELEMS(huffbits), + huffbits, 1, huffsyms, 1, 1, 0, 0, 4368); +} + static av_cold int mimic_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; MimicContext *ctx = avctx->priv_data; - int ret, i; + int i; ctx->prev_index = 0; ctx->cur_index = 15; - ret = ff_init_vlc_from_lengths(&ctx->vlc, MIMIC_VLC_BITS, FF_ARRAY_ELEMS(huffbits), - huffbits, 1, huffsyms, 1, 1, 0, 0, avctx); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "error initializing vlc table\n"); - return ret; - } ff_blockdsp_init(&ctx->bdsp, avctx); ff_bswapdsp_init(&ctx->bbdsp); ff_hpeldsp_init(&ctx->hdsp, avctx->flags); @@ -142,6 +144,8 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } + ff_thread_once(&init_static_once, mimic_init_static); + return 0; } @@ -221,7 +225,7 @@ static int vlc_decode_block(MimicContext *ctx, int num_coeffs, int qscale) int value; int coeff; - vlc = get_vlc2(&ctx->gb, ctx->vlc.table, MIMIC_VLC_BITS, 3); + vlc = get_vlc2(&ctx->gb, block_vlc.table, MIMIC_VLC_BITS, 3); if (!vlc) /* end-of-block code */ return 0; if (vlc == -1)