From patchwork Fri Nov 20 07:19:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23833 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 4B5B1448A07 for ; Fri, 20 Nov 2020 09:38:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35DE268BC41; Fri, 20 Nov 2020 09:25:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B2BD68BB3B for ; Fri, 20 Nov 2020 09:25:30 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id lv15so5643174ejb.12 for ; Thu, 19 Nov 2020 23:25:30 -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=gz4ABEUASiotGwksfChRLz90QN9b5AnWbDFy7RS5RKk=; b=SdH9zg6MmiC/CM1s0oksq0y5HINCEabepciHNrTyNxshAHOCsfz0c1v2gbFjPbesYS VLt89qObmlJzjz0t9bJtjg0wGHKxg3iyUURBzkWL5y2TNQfZkzp7SrAMvbp7mPHgADvm cQ1/CHcdbB98e+ITzZFzt9lUIxtu9HJegrdanS6eKsJpoZv4DAriHdguFCTlKrAfR3cM ZGZoOBXFCavEPEQ3xPfMUcmsJJKCVC9afLY3hKKZISTV1aRXtso0F3oS93gEXJSTtCdR yL58TjLpv0Jf9yKhFHbkchO07/Ni2pQbTvO89CiUi7tGf6b446XnfSvTsiPXlhz15ZeJ wV3A== 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=gz4ABEUASiotGwksfChRLz90QN9b5AnWbDFy7RS5RKk=; b=tN+pHCybXIt7h71bMpePtugb96YeruuTx7Bz5rjEl5ArN6JKvi3hjmTZhL+J1HWQNz /zsMa2q37UwhGew98U+2x0n8puqQOMOLEB2FACuoTFcWcR4aLsyWb1UxBxsQqdSmfES2 xjnhsAl3PCNPjOWimQ9XFLw6R23uNiyStHjrX4x0yXRUYaGrzJ7bLdCISaP533c9P5u3 pPX597m40fzeuArF0AVLdXJqFwmAqR1TvvpLwBL+PZmFT1rJ5PpqPO64AShfg0Qk/0iz i6w5QFBn5UYv7LdCwAVlloMLXdKFMgWsHxVnjHNOpeVereoMGWbdpxXysgasVQqrwdZ5 X+CQ== X-Gm-Message-State: AOAM530+Tm+QJZzpZbpTpMkMAUnabg9nq8+GvKL9Rr9q5K9/0DcxSHjK 1GNuHxnzIvI0qJh2dygcB4HJ8FHL5uYtMQ== X-Google-Smtp-Source: ABdhPJwtx3zf1g/dUM3XcXdKSfoU4SUMGyU+ahi28b/UVA6bCKjBBmTxub3HZt7clo+GgVdLPzjOKA== X-Received: by 2002:a17:906:3644:: with SMTP id r4mr31567949ejb.517.1605857129482; Thu, 19 Nov 2020 23:25:29 -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.25.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:25:28 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:19:52 +0100 Message-Id: <20201120072116.818090-80-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 079/162] avcodec/mss4: Make VLCs 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/mss4.c | 74 +++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 44 deletions(-) diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c index f8edaac4cd..7f11f30dc8 100644 --- a/libavcodec/mss4.c +++ b/libavcodec/mss4.c @@ -25,6 +25,8 @@ * aka Microsoft Expression Encoder Screen) decoder */ +#include "libavutil/thread.h" + #include "avcodec.h" #include "bytestream.h" #include "get_bits.h" @@ -78,8 +80,6 @@ static const uint8_t mss4_vec_entry_vlc_syms[2][9] = { typedef struct MSS4Context { AVFrame *pic; - VLC dc_vlc[2], ac_vlc[2]; - VLC vec_entry_vlc[2]; int block[64]; uint8_t imgbuf[3][16 * 16]; @@ -93,9 +93,13 @@ typedef struct MSS4Context { int prev_vec[3][4]; } MSS4Context; -static av_cold int mss4_init_vlc(VLC *vlc, const uint8_t *lens, - const uint8_t *syms) +static VLC dc_vlc[2], ac_vlc[2]; +static VLC vec_entry_vlc[2]; + +static av_cold void mss4_init_vlc(VLC *vlc, unsigned *offset, + const uint8_t *lens, const uint8_t *syms) { + static VLC_TYPE vlc_buf[2146][2]; uint8_t bits[MAX_ENTRIES]; int i, j; int idx = 0; @@ -107,41 +111,25 @@ static av_cold int mss4_init_vlc(VLC *vlc, const uint8_t *lens, } } - return ff_init_vlc_from_lengths(vlc, FFMIN(bits[idx - 1], 9), idx, - bits, 1, syms, 1, 1, 0, 0, NULL); + vlc->table = &vlc_buf[*offset]; + vlc->table_allocated = FF_ARRAY_ELEMS(vlc_buf) - *offset; + ff_init_vlc_from_lengths(vlc, FFMIN(bits[idx - 1], 9), idx, + bits, 1, syms, 1, 1, + 0, INIT_VLC_STATIC_OVERLONG, NULL); + *offset += vlc->table_size; } -static av_cold int mss4_init_vlcs(MSS4Context *ctx) +static av_cold void mss4_init_vlcs(void) { - int ret, i; - - for (i = 0; i < 2; i++) { - ret = mss4_init_vlc(&ctx->dc_vlc[i], mss4_dc_vlc_lens[i], NULL); - if (ret) - return ret; - ret = mss4_init_vlc(&ctx->ac_vlc[i], - i ? avpriv_mjpeg_bits_ac_chrominance + 1 - : avpriv_mjpeg_bits_ac_luminance + 1, - i ? avpriv_mjpeg_val_ac_chrominance - : avpriv_mjpeg_val_ac_luminance); - if (ret) - return ret; - ret = mss4_init_vlc(&ctx->vec_entry_vlc[i], mss4_vec_entry_vlc_lens[i], - mss4_vec_entry_vlc_syms[i]); - if (ret) - return ret; - } - return 0; -} - -static av_cold void mss4_free_vlcs(MSS4Context *ctx) -{ - int i; - - for (i = 0; i < 2; i++) { - ff_free_vlc(&ctx->dc_vlc[i]); - ff_free_vlc(&ctx->ac_vlc[i]); - ff_free_vlc(&ctx->vec_entry_vlc[i]); + for (unsigned i = 0, offset = 0; i < 2; i++) { + mss4_init_vlc(&dc_vlc[i], &offset, mss4_dc_vlc_lens[i], NULL); + mss4_init_vlc(&ac_vlc[i], &offset, + i ? avpriv_mjpeg_bits_ac_chrominance + 1 + : avpriv_mjpeg_bits_ac_luminance + 1, + i ? avpriv_mjpeg_val_ac_chrominance + : avpriv_mjpeg_val_ac_luminance); + mss4_init_vlc(&vec_entry_vlc[i], &offset, mss4_vec_entry_vlc_lens[i], + mss4_vec_entry_vlc_syms[i]); } } @@ -239,7 +227,7 @@ static int mss4_decode_dct_block(MSS4Context *c, GetBitContext *gb, int xpos = mb_x * 2 + i; c->dc_cache[j][TOP_LEFT] = c->dc_cache[j][TOP]; c->dc_cache[j][TOP] = c->prev_dc[0][mb_x * 2 + i]; - ret = mss4_decode_dct(gb, c->dc_vlc, c->ac_vlc, c->block, + ret = mss4_decode_dct(gb, &dc_vlc[0], &ac_vlc[0], c->block, c->dc_cache[j], xpos, mb_y * 2 + j, c->quant_mat[0]); if (ret) @@ -255,7 +243,7 @@ static int mss4_decode_dct_block(MSS4Context *c, GetBitContext *gb, for (i = 1; i < 3; i++) { c->dc_cache[i + 1][TOP_LEFT] = c->dc_cache[i + 1][TOP]; c->dc_cache[i + 1][TOP] = c->prev_dc[i][mb_x]; - ret = mss4_decode_dct(gb, c->dc_vlc + 1, c->ac_vlc + 1, + ret = mss4_decode_dct(gb, &dc_vlc[1], &ac_vlc[1], c->block, c->dc_cache[i + 1], mb_x, mb_y, c->quant_mat[1]); if (ret) @@ -347,7 +335,7 @@ static int mss4_decode_image_block(MSS4Context *ctx, GetBitContext *gb, for (i = 0; i < 3; i++) { vec_len[i] = vec_len_syms[!!i][get_unary(gb, 0, 3)]; for (j = 0; j < vec_len[i]; j++) { - vec[i][j] = get_coeff(gb, &ctx->vec_entry_vlc[!!i]); + vec[i][j] = get_coeff(gb, &vec_entry_vlc[!!i]); vec[i][j] += ctx->prev_vec[i][j]; ctx->prev_vec[i][j] = vec[i][j]; } @@ -586,20 +574,16 @@ static av_cold int mss4_decode_end(AVCodecContext *avctx) av_frame_free(&c->pic); for (i = 0; i < 3; i++) av_freep(&c->prev_dc[i]); - mss4_free_vlcs(c); return 0; } static av_cold int mss4_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; MSS4Context * const c = avctx->priv_data; int i; - if (mss4_init_vlcs(c)) { - av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n"); - return AVERROR(ENOMEM); - } for (i = 0; i < 3; i++) { c->dc_stride[i] = FFALIGN(avctx->width, 16) >> (2 + !!i); c->prev_dc[i] = av_malloc_array(c->dc_stride[i], sizeof(**c->prev_dc)); @@ -615,6 +599,8 @@ static av_cold int mss4_decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV444P; + ff_thread_once(&init_static_once, mss4_init_vlcs); + return 0; }