From patchwork Tue Nov 10 10:47:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23503 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 6E16344B922 for ; Tue, 10 Nov 2020 12:56:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E53B768BE74; Tue, 10 Nov 2020 12:50:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F3F168BD8E for ; Tue, 10 Nov 2020 12:49:53 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id d12so10633148wrr.13 for ; Tue, 10 Nov 2020 02:49:52 -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=zPju1HVOU14B0vfvmCjLfaoEbRPxFfJW/exmo4N1J5w=; b=R7V96MCa4M3E1N3b7Regk71ZAh9dh0nrOjEpfFau1PY+E9oOgtFACgGXZJ4XAKH/Th msRTIsZV0lW5c7tXM3O6YqSK2CBNyjHQi+6iryN8OkOUSPBEXTT7Y6b8qlApKfPKIKto FZEwCjjIRrPimBelnGEq9t1aNCivdGMS7tSj24gD9vDs7I8lwEyj6vJ7Fh0mFfOBwsxs EQz12VoNteTnU90B5EDBfhLEoBZQHujCvEZCcjQdd4GY4JZeOai24El6NWi5Gd71xBZc 6gYXASY+aPNz7ZNT3IH2ovsbCeYxAYMedDkU/Em+fat9uhATDttCtGdLkAbrAcca78lv SECA== 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=zPju1HVOU14B0vfvmCjLfaoEbRPxFfJW/exmo4N1J5w=; b=qz1ahocuc7KY12kI7AFnGtnIz740c2nXzhp/JsLlileavXpA6tIeoIb8MhL/nvzUn0 6yYAtm2yUu4Nx+o0UqX5vW4AEqqWCmLqsUA0l3DFI4cDufCelvvn45N/J2pxivVo1t9y 4rEExniTjz0YO1x9vIZJKY9cEgdAvrG//22YzgpfIZ3C6/Ft6Jqv0qhymVfkSXASBDpL Hhs6i6xHd3arxLJzAePAKy9XAvJOfGNduuF45Dzui3/Qr0VjRnu2/AvlE0OvOsa2jJjK Gqd2wPHBidgbmYybilJV6phCT0LUoyHLt9Q+bXTt83sm+3FFNJW8XEefvb+4iVApv54y 4Cyw== X-Gm-Message-State: AOAM5336HBG9+j4fgx9K9WI0Nt/4xOvTp8hWkwhbARPl3RhEMK9QBNhI KqeGs0vi0DBsvodIrmtWTQssXLrR4oc= X-Google-Smtp-Source: ABdhPJyfVrr2EONk++mo7x9igtvhqnzKeTyyU08hBg/MVbHLBduBe2pDYs9HdS48mdxqeqvpwoxTXQ== X-Received: by 2002:a5d:4448:: with SMTP id x8mr22813720wrr.364.1605005392298; Tue, 10 Nov 2020 02:49:52 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l24sm2572543wmi.7.2020.11.10.02.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:49:51 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:29 +0100 Message-Id: <20201110104851.321029-33-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> References: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 032/114] 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 | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 32f02d4b61..3e4d7c2576 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -58,13 +58,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 +112,20 @@ 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 int mimic_decode_init(AVCodecContext *avctx) { 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); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "error initializing vlc table\n"); - return ret; - } + if (!block_vlc.table_size) + INIT_VLC_STATIC_FROM_LENGTHS(&block_vlc, MIMIC_VLC_BITS, FF_ARRAY_ELEMS(huffbits), + huffbits, 1, huffsyms, 1, 1, 0, 0, 4368); ff_blockdsp_init(&ctx->bdsp, avctx); ff_bswapdsp_init(&ctx->bbdsp); ff_hpeldsp_init(&ctx->hdsp, avctx->flags); @@ -223,7 +219,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)