From patchwork Tue Nov 10 10:47:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23487 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 9530144B2CF for ; Tue, 10 Nov 2020 12:53:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 93A9668BE1B; Tue, 10 Nov 2020 12:49:48 +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 2F9C868BDC0 for ; Tue, 10 Nov 2020 12:49:40 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id r17so8229748wrw.1 for ; Tue, 10 Nov 2020 02:49:40 -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=rV4VHHoR9Ltal+51ta/6/4eEv/Z0qQf/1g80FD37YcY=; b=Hnu2dTWE6AckYy/SzROvh7DjDVwrkzbP7vytbbOz2nPNRaMbn6n2/KJXX9vibo+ot9 DHFDW6migXd5S3JhZ85ah2fXRj/S3Hv9hKXpPruucMmjUHG+Bbj/XfpQhsj0NrGDALnU Ls9FXI+goMTwnxmuhB3kvUguN/fBwj+hZzOtXxF4i3mRrUoAVdPyzSyE/DmCWOOCOtsH Rm3Lwmprt+Pt/ZBWisCoe/NvkQ6o79SfGkxBSQlwxwc7tBjBBVH9zXM123xcAhJ2yuir HU0qIrnF1XJmhCfaP9Acu2gMLkAqXGzKMsZxuaZbxN2joS9QCbxo1vOhNob0bK2HBUsv jV1A== 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=rV4VHHoR9Ltal+51ta/6/4eEv/Z0qQf/1g80FD37YcY=; b=eHmI7n9yBXUpbUXZv+BNFBZrxeHa2KU4zdF5lZbyHfm+Ur8cZiGT+csUanPxWfun0j hKzd0QNCCabiobP5ufovXBVehbVfWw8Y7An0n2+5oygUyPViNJcXdG2zsWewxwIHh8b9 6YMT3nccsRnl1nov9TMOeH8/E7DFTgqFnqCd6/XuegwGnwrcV1TwNFGevh8yTzHotZh5 7vFnpWeAVJrciOgSE1nPR5rZK/36wGSMSErnIoMu4dDw4LhzOqbUboNXmymVhBzG9igr pNKIXoYl6gY5hGFHKLKl6uCOXxFZn/xZ/zb42ngk8BMxfTKm8qdHZsvAXnJ9wVVBGsV8 E0mQ== X-Gm-Message-State: AOAM533cnOkX/57FbkAQgAfi5TMVgrQiQc3JgRWZfjv5P76+qJoz7Ibc l1unJHTOgBou0CCMsNGzaQ4w72YjW48= X-Google-Smtp-Source: ABdhPJz/llOvEuM+jdE1CQ9HMqh0wpYDLFbdlc861qWZADXN00nbjEnLtSMBdhdfIls4gtZKHsMA9Q== X-Received: by 2002:adf:f542:: with SMTP id j2mr6422027wrp.107.1605005379139; Tue, 10 Nov 2020 02:49:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:49:38 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:16 +0100 Message-Id: <20201110104851.321029-20-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 019/114] avcodec/clearvideo: 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/clearvideo.c | 94 ++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 54 deletions(-) diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 9b4f03d15e..33b94bb086 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -75,13 +75,15 @@ typedef struct CLVContext { MVInfo mvi; int tile_size; int tile_shift; - VLC dc_vlc, ac_vlc; - LevelCodes lev[4 + 3 + 3]; // 0..3: Y, 4..6: U, 7..9: V int luma_dc_quant, chroma_dc_quant, ac_quant; DECLARE_ALIGNED(16, int16_t, block)[64]; int top_dc[3], left_dc[4]; } CLVContext; +static VLC dc_vlc, ac_vlc; +static LevelCodes lev[4 + 3 + 3]; // 0..3: Y, 4..6: U, 7..9: V +static VLC_TYPE vlc_buf[16716][2]; + static inline int decode_block(CLVContext *ctx, int16_t *blk, int has_ac, int ac_quant) { @@ -89,13 +91,13 @@ static inline int decode_block(CLVContext *ctx, int16_t *blk, int has_ac, int idx = 1, last = 0, val, skip; memset(blk, 0, sizeof(*blk) * 64); - blk[0] = get_vlc2(gb, ctx->dc_vlc.table, CLV_VLC_BITS, 3); + blk[0] = get_vlc2(gb, dc_vlc.table, CLV_VLC_BITS, 3); if (!has_ac) return 0; while (idx < 64 && !last) { - val = get_vlc2(gb, ctx->ac_vlc.table, CLV_VLC_BITS, 2); + val = get_vlc2(gb, ac_vlc.table, CLV_VLC_BITS, 2); if (val < 0) return AVERROR_INVALIDDATA; if (val != 0x1BFF) { @@ -358,7 +360,7 @@ static void mvi_update_row(MVInfo *mvi) } } -static TileInfo* decode_tile_info(GetBitContext *gb, LevelCodes *lc, int level) +static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc, int level) { TileInfo *ti; int i, flags = 0; @@ -595,7 +597,7 @@ static int clv_decode_frame(AVCodecContext *avctx, void *data, TileInfo *tile; MV mv, cmv; - tile = decode_tile_info(&c->gb, &c->lev[0], 0); // Y + tile = decode_tile_info(&c->gb, &lev[0], 0); // Y if (!tile) return AVERROR(ENOMEM); mv = mvi_predict(&c->mvi, i, j, tile->mv); @@ -610,14 +612,14 @@ static int clv_decode_frame(AVCodecContext *avctx, void *data, cmv.x /= 2; cmv.y /= 2; av_freep(&tile); - tile = decode_tile_info(&c->gb, &c->lev[4], 0); // U + tile = decode_tile_info(&c->gb, &lev[4], 0); // U if (!tile) return AVERROR(ENOMEM); ret = restore_tree(avctx, c->pic, c->prev, 1, x, y, size, tile, cmv); if (ret < 0) mb_ret = ret; av_freep(&tile); - tile = decode_tile_info(&c->gb, &c->lev[7], 0); // V + tile = decode_tile_info(&c->gb, &lev[7], 0); // V if (!tile) return AVERROR(ENOMEM); ret = restore_tree(avctx, c->pic, c->prev, 2, x, y, size, tile, cmv); @@ -647,12 +649,11 @@ static int clv_decode_frame(AVCodecContext *avctx, void *data, return mb_ret < 0 ? mb_ret : buf_size; } -static av_cold int build_vlc(VLC *vlc, const uint8_t counts[16], - const uint16_t **syms) +static av_cold void build_vlc(VLC *vlc, const uint8_t counts[16], + const uint16_t **syms, unsigned *offset) { uint8_t lens[MAX_VLC_ENTRIES]; unsigned num = 0; - int ret; for (int i = 0; i < 16; i++) { unsigned count = counts[i]; @@ -661,12 +662,12 @@ static av_cold int build_vlc(VLC *vlc, const uint8_t counts[16], for (count += num; num < count; num++) lens[num] = i + 1; } - ret = ff_init_vlc_from_lengths(vlc, CLV_VLC_BITS, num, lens, 1, - *syms, 2, 2, 0, 0); - if (ret < 0) - return ret; + vlc->table = &vlc_buf[*offset]; + vlc->table_allocated = FF_ARRAY_ELEMS(vlc_buf) - *offset; + ff_init_vlc_from_lengths(vlc, CLV_VLC_BITS, num, lens, 1, + *syms, 2, 2, 0, INIT_VLC_USE_NEW_STATIC); *syms += num; - return 0; + *offset += vlc->table_size; } static av_cold int clv_decode_init(AVCodecContext *avctx) @@ -714,46 +715,39 @@ static av_cold int clv_decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); ff_idctdsp_init(&c->idsp, avctx); - ret = ff_init_vlc_from_lengths(&c->dc_vlc, CLV_VLC_BITS, NUM_DC_CODES, - clv_dc_lens, 1, - clv_dc_syms, 1, 1, -63, 0); - if (ret) { - av_log(avctx, AV_LOG_ERROR, "Error initialising DC VLC\n"); - return ret; - } - ret = ff_init_vlc_from_lengths(&c->ac_vlc, CLV_VLC_BITS, NUM_AC_CODES, - clv_ac_bits, 1, - clv_ac_syms, 2, 2, 0, 0); - if (ret) { - av_log(avctx, AV_LOG_ERROR, "Error initialising AC VLC\n"); - return ret; - } - for (int i = 0, j = 0, k = 0;; i++) { + if (ac_vlc.table_size) + return 0; + + for (unsigned i = 0, j = 0, k = 0, offset = 0;; i++) { if (clv_mv_escape[i]) { - c->lev[i].mv_esc = clv_mv_escape[i]; - ret = build_vlc(&c->lev[i].mv_cb, clv_mv_len_counts[k], &mv_syms); - if (ret < 0) - return ret; + lev[i].mv_esc = clv_mv_escape[i]; + build_vlc(&lev[i].mv_cb, clv_mv_len_counts[k], &mv_syms, &offset); k++; } if (i == FF_ARRAY_ELEMS(has_flags)) break; if (has_flags[i]) { - ret = ff_init_vlc_from_lengths(&c->lev[i].flags_cb, CLV_VLC_BITS, 16, - clv_flags_bits[j], 1, - clv_flags_syms[j], 1, 1, 0, 0); - if (ret < 0) - return ret; - - c->lev[i + 1].bias_esc = 0x100; - ret = build_vlc(&c->lev[i + 1].bias_cb, - clv_bias_len_counts[j], &bias_syms); - if (ret < 0) - return ret; + lev[i].flags_cb.table = &vlc_buf[offset]; + lev[i].flags_cb.table_allocated = FF_ARRAY_ELEMS(vlc_buf) - offset; + ff_init_vlc_from_lengths(&lev[i].flags_cb, CLV_VLC_BITS, 16, + clv_flags_bits[j], 1, + clv_flags_syms[j], 1, 1, + 0, INIT_VLC_USE_NEW_STATIC); + offset += lev[i].flags_cb.table_size; + + lev[i + 1].bias_esc = 0x100; + build_vlc(&lev[i + 1].bias_cb, clv_bias_len_counts[j], + &bias_syms, &offset); j++; } } + INIT_VLC_STATIC_FROM_LENGTHS(&dc_vlc, CLV_VLC_BITS, NUM_DC_CODES, + clv_dc_lens, 1, + clv_dc_syms, 1, 1, -63, 0, 1104); + INIT_VLC_STATIC_FROM_LENGTHS(&ac_vlc, CLV_VLC_BITS, NUM_AC_CODES, + clv_ac_bits, 1, + clv_ac_syms, 2, 2, 0, 0, 554); return 0; } @@ -766,14 +760,6 @@ static av_cold int clv_decode_end(AVCodecContext *avctx) av_freep(&c->mvi.mv); - ff_free_vlc(&c->dc_vlc); - ff_free_vlc(&c->ac_vlc); - for (int i = 0; i < FF_ARRAY_ELEMS(c->lev); i++) { - ff_free_vlc(&c->lev[i].mv_cb); - ff_free_vlc(&c->lev[i].flags_cb); - ff_free_vlc(&c->lev[i].bias_cb); - } - return 0; }