From patchwork Tue Nov 10 10:47:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23465 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 9C7D0449B06 for ; Tue, 10 Nov 2020 12:49:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F51D68BD8A; Tue, 10 Nov 2020 12:49:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4DDE68B581 for ; Tue, 10 Nov 2020 12:49:24 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id 23so12136370wrc.8 for ; Tue, 10 Nov 2020 02:49:24 -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=8zxx6CkEZE+MjIXO1hr3yCJNUKqEpn8G/3VmhC0W6WY=; b=lyZfMxC3t8udhPymVJCksAgbW/kbAwzDtGTQ+ZN8dFpkuPJWl0yrbUS2wtxQP9a6gW QbaHARJBEB2KKQMLKPiolFKiwGFot2hcfCnJjU5BziRCWKltLrQ1Mb5qePRVJ2WImMS1 +nvAI5frEnIMIKWTyvVQR+3GwzK/PhQEjKkdKf+4rPxsAMSY7wvd9HQywXtFDyAU5JSa v5UzyuXsppnwzfj5RTnorVwjH1nyUTNnixCaucBuE5bKClbHdNd4T/8cDE4X4dRA1p8S 0GEVjEu1XTtBV+UAaYKITBoYSdgf+JaRl4OzrAIsYYSe6x+J/KwOMMm1M6/1UBis1Nf+ /AlA== 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=8zxx6CkEZE+MjIXO1hr3yCJNUKqEpn8G/3VmhC0W6WY=; b=Cj+DQzAjZFJB1aZvvXWMzRNb8XY0NCCmoye/9wTgrmVT09L9obtQHdVNExU8HCyY+6 mqtefiRxuQPmNkwXcKRgEfEg7I1A/Gq+ZrqpXdqUy7VgmxhUT6AAv+p+ll/2Ng9IPQo0 S65Z0wkGfMTy9sP5Y60WFkA7sQsNMfeaWOgzsDR8SazkTchXvbR0wQj9hMEsKf6o2ILI 7plyok1sfYQvrYXBZC7PpH1tPjzwo7kDjwC3krN5zwORVXwXvjDpMwGfYAaGvnAc1n6u jk2mBD9dYv9FVpEu0+PgscTIA7jyLLxzANXE4wRvc0IN1eB5jt+0YiLIvRF5lAFbhIJ/ NKIQ== X-Gm-Message-State: AOAM533A3PZS9qcqRfShibGCXpfYo7P6nbQKX0rvmfH971jEht6G6HSj axqlUvJaBlAMMyWi76GCZfw5BlVllPM= X-Google-Smtp-Source: ABdhPJzdqyEfmFr4xrPMUfO9CY4iotzIAO1L0mymQzzU4xE0HUs8p450A2c+giTy6aqB1watqhWIRQ== X-Received: by 2002:adf:a315:: with SMTP id c21mr23014027wrb.272.1605005363686; Tue, 10 Nov 2020 02:49:23 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:49:23 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:02 +0100 Message-Id: <20201110104851.321029-6-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 005/114] 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 --- libavcodec/tscc2.c | 73 ++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 41 deletions(-) diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index 7a591899c1..c5ce1cb74b 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.c @@ -34,6 +34,8 @@ #include "mathops.h" #include "tscc2data.h" +#define TSCC2_VLC_BITS 9 + typedef struct TSCC2Context { AVCodecContext *avctx; AVFrame *pic; @@ -43,52 +45,46 @@ 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_USE_NEW_STATIC | INIT_VLC_OUTPUT_LE); + *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); - if (ret) - return ret; + if (ac_vlc[NUM_VLC_SETS - 1].table_size) + return; + + 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); - 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); - 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 +150,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 +158,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 +326,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 +333,11 @@ 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; 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); + tscc2_init_vlcs(); + return 0; }