From patchwork Fri Nov 20 07:18:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23791 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 8015344B17A for ; Fri, 20 Nov 2020 09:31:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 636FB68B9FC; Fri, 20 Nov 2020 09:31:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C510D68B99F for ; Fri, 20 Nov 2020 09:31:29 +0200 (EET) Received: by mail-ej1-f68.google.com with SMTP id y17so11472226ejh.11 for ; Thu, 19 Nov 2020 23:31:29 -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=DwGViy6VfVvDUCg9P3n5jU1/sz28I4FD6Zlho+bqWZM=; b=ngx3/oumINvY9jRzlaFxMKa3qzqi9O4GPPW+czTvyz2D9ta2NXdoy/sCk+9qQv4BnW V0B5FeC7P9PQ1FYbXWN+A3vCkCshDJjOegpOq21y8Jd0wNGybVKbWgHkpOKVtGZXUgMT dEwqsCCvIThvamhK7K0b4pZRoagvDyLZDuoyMqGg77j/hZo2Psi0g2xTYTzA/YRa7rvP J7Q4GZK4t03n//xlfKrd26uOKVyKwMofgPXQwpawTQoWtsJn6xMPnhbWqH0SuIzUudPQ ALPRb2oHyE9QKJ3e7pOev4FX3/3dePxD823qEA7egKs6D3XpaHNktantnNVVhhSgGJ4M S5Iw== 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=DwGViy6VfVvDUCg9P3n5jU1/sz28I4FD6Zlho+bqWZM=; b=Y2HPujuX3vVYgQnl5BE4PdI6/ccxGvGN/OjI/xh6eoFHz+XdqrKvJz3zmNEKLLWWoe heyH/AIATeXg7C8S2+vcNbdvwqp9zkddI8KBFe/3UyWWvI3CEbck/zfiEoS7DIyNYQhD bHiC0dQ9k9bRqK8v1OJO2xljgqpZVtwZXclAFdvMsE2EgTEVf+SATFzeJ00im6Z+nWSs POm7xXJDr1l/+NYmafKjJOKgVdLb72MpWGt/s0PRXNgf8Qjzi80lWnrLIfXilH3N4WPk Dd6aaB6qkLaFFvcTGQXa2Zm5brqaKUkSbCJTrojO3uSKCjFHMqcmHVvWX6E4fogzs7vf 6GDw== X-Gm-Message-State: AOAM530wNRpAoVj7wnbk/6UAo4wi7KOSiUa280dgK9960D91ox0ew4G3 NICiCMQ6PpEkIZMyCDXo4QJhuyA+AlTWuw== X-Google-Smtp-Source: ABdhPJzKHdkGNIM2lAHFgW1c2wtqj/oeoUD3MHxxIr5u9luoMTqGIhUr9rMwRj5AL1m4DK98Wz8P5Q== X-Received: by 2002:a50:eb96:: with SMTP id y22mr35053051edr.116.1605857051204; Thu, 19 Nov 2020 23:24:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:24:10 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:18:39 +0100 Message-Id: <20201120072116.818090-7-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 006/162] avcodec/tscc2: Make VLC tables 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" Also use a named constant for the number of bits of the VLC tables. Signed-off-by: Andreas Rheinhardt --- Now using ff_thread_once(). libavcodec/tscc2.c | 73 ++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 41 deletions(-) diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index 17eb2c854f..13e7a41a31 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.c @@ -26,6 +26,8 @@ #include +#include "libavutil/thread.h" + #define BITSTREAM_READER_LE #include "avcodec.h" #include "bytestream.h" @@ -34,6 +36,8 @@ #include "mathops.h" #include "tscc2data.h" +#define TSCC2_VLC_BITS 9 + typedef struct TSCC2Context { AVCodecContext *avctx; AVFrame *pic; @@ -43,52 +47,43 @@ typedef struct TSCC2Context { int q[2][3]; GetBitContext gb; - VLC dc_vlc, nc_vlc[NUM_VLC_SETS], ac_vlc[NUM_VLC_SETS]; int block[16]; } TSCC2Context; -static av_cold void free_vlcs(TSCC2Context *c) -{ - int i; +static VLC dc_vlc, nc_vlc[NUM_VLC_SETS], ac_vlc[NUM_VLC_SETS]; - ff_free_vlc(&c->dc_vlc); - for (i = 0; i < NUM_VLC_SETS; i++) { - ff_free_vlc(c->nc_vlc + i); - ff_free_vlc(c->ac_vlc + i); - } +static av_cold void tscc2_init_vlc(VLC *vlc, int *offset, int nb_codes, + const uint8_t *lens, const void *syms, + int sym_length) +{ + static VLC_TYPE vlc_buf[15442][2]; + + vlc->table = &vlc_buf[*offset]; + vlc->table_allocated = FF_ARRAY_ELEMS(vlc_buf) - *offset; + ff_init_vlc_from_lengths(vlc, TSCC2_VLC_BITS, nb_codes, + lens, 1, syms, sym_length, sym_length, 0, + INIT_VLC_STATIC_OVERLONG | INIT_VLC_OUTPUT_LE, NULL); + *offset += vlc->table_size; } -static av_cold int init_vlcs(TSCC2Context *c) +static av_cold void tscc2_init_vlcs(void) { const uint16_t *ac_vlc_syms = tscc2_ac_vlc_syms; const uint8_t *ac_vlc_lens = tscc2_ac_vlc_lens; - int i, ret; + int i, offset = 0; - ret = ff_init_vlc_from_lengths(&c->dc_vlc, 9, DC_VLC_COUNT, - tscc2_dc_vlc_lens, 1, - tscc2_dc_vlc_syms, 2, 2, - 0, INIT_VLC_OUTPUT_LE, c->avctx); - if (ret) - return ret; + tscc2_init_vlc(&dc_vlc, &offset, DC_VLC_COUNT, + tscc2_dc_vlc_lens, tscc2_dc_vlc_syms, 2); for (i = 0; i < NUM_VLC_SETS; i++) { - ret = ff_init_vlc_from_lengths(c->nc_vlc + i, 9, 16, - tscc2_nc_vlc_lens[i], 1, - tscc2_nc_vlc_syms[i], 1, 1, - 0, INIT_VLC_OUTPUT_LE, c->avctx); - if (ret) - return ret; - ret = ff_init_vlc_from_lengths(c->ac_vlc + i, 9, tscc2_ac_vlc_sizes[i], - ac_vlc_lens, 1, - ac_vlc_syms, 2, 2, - 0, INIT_VLC_OUTPUT_LE, c->avctx); - if (ret) - return ret; + tscc2_init_vlc(&nc_vlc[i], &offset, 16, + tscc2_nc_vlc_lens[i], tscc2_nc_vlc_syms[i], 1); + + tscc2_init_vlc(&ac_vlc[i], &offset, tscc2_ac_vlc_sizes[i], + ac_vlc_lens, ac_vlc_syms, 2); ac_vlc_lens += tscc2_ac_vlc_sizes[i]; ac_vlc_syms += tscc2_ac_vlc_sizes[i]; } - - return 0; } #define DEQUANT(val, q) (((q) * (val) + 0x80) >> 8) @@ -154,7 +149,7 @@ static int tscc2_decode_mb(TSCC2Context *c, int *q, int vlc_set, if (!(j | k)) { dc = get_bits(gb, 8); } else { - dc = get_vlc2(gb, c->dc_vlc.table, 9, 2); + dc = get_vlc2(gb, dc_vlc.table, TSCC2_VLC_BITS, 2); if (dc == 0x100) dc = get_bits(gb, 8); } @@ -162,12 +157,12 @@ static int tscc2_decode_mb(TSCC2Context *c, int *q, int vlc_set, prev_dc = dc; c->block[0] = dc; - nc = get_vlc2(gb, c->nc_vlc[vlc_set].table, 9, 1); + nc = get_vlc2(gb, nc_vlc[vlc_set].table, TSCC2_VLC_BITS, 1); bpos = 1; memset(c->block + 1, 0, 15 * sizeof(*c->block)); for (l = 0; l < nc; l++) { - ac = get_vlc2(gb, c->ac_vlc[vlc_set].table, 9, 2); + ac = get_vlc2(gb, ac_vlc[vlc_set].table, TSCC2_VLC_BITS, 2); if (ac == 0x1000) ac = get_bits(gb, 12); bpos += ac & 0xF; @@ -330,7 +325,6 @@ static av_cold int tscc2_decode_end(AVCodecContext *avctx) av_frame_free(&c->pic); av_freep(&c->slice_quants); - free_vlcs(c); return 0; } @@ -338,17 +332,12 @@ static av_cold int tscc2_decode_end(AVCodecContext *avctx) static av_cold int tscc2_decode_init(AVCodecContext *avctx) { TSCC2Context * const c = avctx->priv_data; - int ret; + static AVOnce init_static_once = AV_ONCE_INIT; c->avctx = avctx; avctx->pix_fmt = AV_PIX_FMT_YUV444P; - if ((ret = init_vlcs(c)) < 0) { - av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n"); - return ret; - } - c->mb_width = FFALIGN(avctx->width, 16) >> 4; c->mb_height = FFALIGN(avctx->height, 8) >> 3; c->slice_quants = av_malloc(c->mb_width * c->mb_height); @@ -361,6 +350,8 @@ static av_cold int tscc2_decode_init(AVCodecContext *avctx) if (!c->pic) return AVERROR(ENOMEM); + ff_thread_once(&init_static_once, tscc2_init_vlcs); + return 0; }