From patchwork Fri Nov 20 07:18:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23771 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 DAD23449F1B for ; Fri, 20 Nov 2020 09:28:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E7FE068B9EB; Fri, 20 Nov 2020 09:24:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5958468B9EF for ; Fri, 20 Nov 2020 09:24:32 +0200 (EET) Received: by mail-ed1-f68.google.com with SMTP id cq7so8475525edb.4 for ; Thu, 19 Nov 2020 23:24:32 -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=YvjJybSTnFpQnOf1X04nM/Vm5CUx/7uMmiWj4APoYjg=; b=iMHbDAbMXrhdE4e3tp419Mw/l+M023bUOdSPIwIR2zJ+LHJzm+29eP0gmkoi6/UMlp y8HV0OozQREPOQtC7Su1sR+5jRVzAo+y7qVRLgTMdRc2+f8hChgUErMFriMXIpdb9hrv LwYavFqAiJzESjvtgHG7MJziiHvfTEvSar3HZuKGtgdLKOhf0oVAJjgrByg4EHy1kIrV XL/h6sw+jT7CWTCcIn3uJhCm/18EgAVGt+f/xrL512BoQOV/WaM1Opyjsol2plPqKkzo Iw3husnTmpBsVnh3PhMA9K4Uc5H12nRhCNt1KjvatOqL6HmHJygFmdAlIeAg5vAhJxiR 26Ig== 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=YvjJybSTnFpQnOf1X04nM/Vm5CUx/7uMmiWj4APoYjg=; b=pZp4Nk3/aYSzI7+m9Qz3HkWoJGZV2Np0hfo1zD6IUE5m76JNEG4liAOqbkZ3r4cP/8 yy4wJjhdinS0TCDw6J/v/QbAWjjAD62QfjJnpfQjAw1n2n5YpsSu7zSEt6gfXyqPU2ZR WKs5qewd1e39Tqa8FOORjwlriVpo+1IPZHmQw7VqR61QqYbpDqpAuYpAVFVYeQffbIbF uUXGcpcumPChTTkzt1q3bUXW6AcJGr1+c8aZytzBmhfk+Q1irup5+9yhtpIgMKGBZKXS QFTluwiYqwjRftbX03Q9jNCsjCS4OuyNiZM8z5vFwQDcJ9+NOmp03WIvTiyrliIvpUC6 oZlg== X-Gm-Message-State: AOAM531FGeOx/EQ55HPK0AuUyCZbm3fIpg8f01Z35TvtNKNESZZ/MnFR Fgj15Qy8feTv5XXeF3HhxDzvOFuC5XPXVA== X-Google-Smtp-Source: ABdhPJwNay9NCUktZ3zqdP6k6dKwiP39L5/42PBHHpEm2tU1SLLz/wNczz+tFAmxkN/MnbPfduAJiw== X-Received: by 2002:a50:f604:: with SMTP id c4mr33512604edn.117.1605857071367; Thu, 19 Nov 2020 23:24:31 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:24:30 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:18:55 +0100 Message-Id: <20201120072116.818090-23-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 022/162] 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 | 117 +++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 62 deletions(-) diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index ff6445b1de..7342557cd2 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -24,6 +24,8 @@ * ClearVideo decoder */ +#include "libavutil/thread.h" + #include "avcodec.h" #include "bytestream.h" #include "get_bits.h" @@ -73,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) { @@ -87,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) { @@ -356,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; @@ -593,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); @@ -608,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); @@ -645,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]; @@ -659,18 +662,51 @@ 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, NULL); - 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_STATIC_OVERLONG, NULL); *syms += num; - return 0; + *offset += vlc->table_size; +} + +static av_cold void clv_init_static(void) +{ + const uint16_t *mv_syms = clv_mv_syms, *bias_syms = clv_bias_syms; + + 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); + for (unsigned i = 0, j = 0, k = 0, offset = 0;; i++) { + if (0x36F & (1 << i)) { + build_vlc(&lev[i].mv_cb, clv_mv_len_counts[k], &mv_syms, &offset); + k++; + } + if (i == FF_ARRAY_ELEMS(lev) - 1) + break; + if (0x1B7 & (1 << i)) { + 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_STATIC_OVERLONG, NULL); + offset += lev[i].flags_cb.table_size; + + build_vlc(&lev[i + 1].bias_cb, clv_bias_len_counts[j], + &bias_syms, &offset); + j++; + } + } } static av_cold int clv_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; CLVContext *const c = avctx->priv_data; - const uint16_t *mv_syms = clv_mv_syms, *bias_syms = clv_bias_syms; int ret, w, h; if (avctx->extradata_size == 110) { @@ -711,44 +747,9 @@ 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, avctx); - 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, avctx); - 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 (0x36F & (1 << i)) { - ret = build_vlc(&c->lev[i].mv_cb, clv_mv_len_counts[k], &mv_syms); - if (ret < 0) - return ret; - k++; - } - if (i == FF_ARRAY_ELEMS(c->lev) - 1) - break; - if (0x1B7 & (1 << 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, avctx); - if (ret < 0) - return ret; - - ret = build_vlc(&c->lev[i + 1].bias_cb, - clv_bias_len_counts[j], &bias_syms); - if (ret < 0) - return ret; - j++; - } - } + ff_thread_once(&init_static_once, clv_init_static); + return 0; } @@ -761,14 +762,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; }