From patchwork Tue Nov 10 10:47:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23540 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 48BAF44B15F for ; Tue, 10 Nov 2020 13:03:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E96FC68BF1E; Tue, 10 Nov 2020 12:50:36 +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 88A1F68BD9C for ; Tue, 10 Nov 2020 12:50:20 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id j7so4891293wrp.3 for ; Tue, 10 Nov 2020 02:50:20 -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=8+H14TI5NM+Z8e12IqJVmFgUeaw8HKosCAIns1dMjXk=; b=k/SemA+oB2m0G4Y3aNVWDt859wfuRgAlf3M7VIiJ8sDTnA/DnjIdUaxKD0yh9a38MI ojdUEUyMXV+BCggYO5rMscdgnzGtm5PqBSe4aXiOWCjOme5GhCfaYOVKrJ1dAHS5hB5q 8zHtL2e2PFCzw741cNJSrI5qKYt/gclXhpP8DYv8xQ73yeBdejaei87ReSvB4t7/xcnk ENEsmSMeF047fyJ29ucHKtnU1T9QjPz23+Xh8x6ffLyuKfEWCsswVaHPZTic/mdrld4r LJlJWMy5hSoVIS6f/7UqFT6RklWodP6FSypIRMqkfR6L5JSYRohTQH3pxAFLRgDhWg9W Iwbw== 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=8+H14TI5NM+Z8e12IqJVmFgUeaw8HKosCAIns1dMjXk=; b=QTfxtmp7hwRk8GmD8XDbCUJ6AQOIiIHKfjwlfKt7R8M2gGL+I1mJ9qsHDmZcJ5spDE CZTe0JM0zOET6fhIAcZ30zAyoEnxorFZPARMrX0wHN4lTQJkfNdu2DTAsMMopGcMIpGo mJwKe1Dw8b065i3hDIUD1OZfA6U3ViPbG2KJeXLiIHqX2BW+sPf5DkBu8tbD7z0mepIS fKXZt4ChLmDpu+Pd/PpCnWbCN19AgUTq8yLjiAw8MRFKNKxrF70pwDuHX8lqg+Gu5KSL 3sfsBD+t9y+x8VhrPyMuVu3eJr8JrgPg0HuKNjUOWn/zgjJ55KeHT4T0HKfgeeDQsSYg DvlA== X-Gm-Message-State: AOAM5318XOtKQpKibacLvjWVEO52KCKcIh6+aizFNBnp+Za/M3gSKvGv punN7j3v4SCOxBSm2TcEYtxb5OOVUP0= X-Google-Smtp-Source: ABdhPJy522hj861IhI0uZPhS0Sm6hj+O+bGBypg2Uy9AoIbx65orcF84PcYth5YWU+3bUqpjlAgpZw== X-Received: by 2002:a5d:4e48:: with SMTP id r8mr22095784wrt.141.1605005419779; Tue, 10 Nov 2020 02:50:19 -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.50.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:50:19 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:58 +0100 Message-Id: <20201110104851.321029-62-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 061/114] 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 | 73 +++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 44 deletions(-) diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c index 9c257dc873..9b343c9b2b 100644 --- a/libavcodec/mss4.c +++ b/libavcodec/mss4.c @@ -78,8 +78,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 +91,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 +109,27 @@ 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); -} - -static av_cold int mss4_init_vlcs(MSS4Context *ctx) -{ - 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; + 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_USE_NEW_STATIC); + *offset += vlc->table_size; } -static av_cold void mss4_free_vlcs(MSS4Context *ctx) +static av_cold void mss4_init_vlcs(void) { - 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]); + if (vec_entry_vlc[1].table_size) + return; + + 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,7 +574,6 @@ 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; } @@ -596,10 +583,6 @@ static av_cold int mss4_decode_init(AVCodecContext *avctx) 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 +598,8 @@ static av_cold int mss4_decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV444P; + mss4_init_vlcs(); + return 0; }