From patchwork Fri Nov 20 07:33:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23895 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 3CC84448F1E for ; Fri, 20 Nov 2020 09:52:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2777E68BD94; Fri, 20 Nov 2020 09:35:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0AF668BD55 for ; Fri, 20 Nov 2020 09:34:49 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id f23so11549834ejk.2 for ; Thu, 19 Nov 2020 23:34:49 -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=9qPcwxVR3qUgm3RJMg3kInFhOR9o6oNDuubVshH/XSs=; b=T1T5GJx65ignGgfAJXFJEjXQOZanUiUq2F/goTBO7vDljgdxwy/6D2Zm5RRRYEbwyN +H6oqS7ka208riSFUzPzufCdCBqKS9qog4M5VYN/y5CLGkyVa96xLSpbwWbkYNkrmowA B9iWQ8rr1DqL7W0Yu44RodjboVXKcqF9V5BD6Jxw5P5VBYx+DNngPgErof4nqWW3/VFU v6YJUH5jdgtCKrUawRR12ijsxMy6S3/xX9H035zMg7eg0UTJ1um/Kq3uDRTm5rGuXB4/ z+EnrEyuRv1CL0hiB8wzwCQTPRqzlQpAijk6AqJSg9rX6K253dQmpjX3f7fRkPts3d93 NHIg== 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=9qPcwxVR3qUgm3RJMg3kInFhOR9o6oNDuubVshH/XSs=; b=ciiseGpjV3lzc5IOmr6ht3WEziDz3mcl9ER6EBz4T8lyPANj+2Sjmz2lmnZHvEqMHI GOQd4YbVeNCFDPlqJW4hH3RvUFMK16gXmvCxtyBJEAAm+38Rl2CTDd9UhvrP3VcbmDjv 2DCoKHh/m7YF7HF3HxDhDrtLbic5VJZvnkfVpfmKlq8w0DMWz4qvkSGawMj80O/W883A uHKm9MkC744U/Ns3zfxoshiu4dMtSkP1fBAcWZgnmypmanFh3wu9ktews1b6+HqV2D2/ iOsNpDRoDD3MwIfJKQmxUh3sUmM8WgpTTwsHFOBvDkDFjqQj8OZqbHg/FFkydzB9IjOu UEjQ== X-Gm-Message-State: AOAM533lZQggbTvEogoO1U8n12hvOHpXx3cOZTPot4QEMY+UbdQpALxv oaCWyhn6jfixwIHXhdjxKCrsA6/1uqE/1Q== X-Google-Smtp-Source: ABdhPJzgrUWE7QEcW9VDbOQNl+r+qqV/GXPTeFZWkG/BUHFcx9QJn3ZpGr10HKy3gzDukDzvgXl3vg== X-Received: by 2002:a17:906:b292:: with SMTP id q18mr31022179ejz.93.1605857689087; Thu, 19 Nov 2020 23:34:49 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id i13sm769110ejv.84.2020.11.19.23.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:48 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:33:09 +0100 Message-Id: <20201120073327.820745-45-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 144/162] avcodec/imm4: Don't use too big VLC table 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" Using more bits than the longest code has makes no sense. Signed-off-by: Andreas Rheinhardt --- libavcodec/imm4.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c index d92bc30ddc..85d8526bc8 100644 --- a/libavcodec/imm4.c +++ b/libavcodec/imm4.c @@ -33,6 +33,8 @@ #include "idctdsp.h" #include "internal.h" +#define CBPLO_VLC_BITS 6 + typedef struct IMM4Context { BswapDSPContext bdsp; GetBitContext gb; @@ -488,8 +490,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, static av_cold void imm4_init_static_data(void) { - INIT_VLC_SPARSE_STATIC(&cbplo_tab, 9, FF_ARRAY_ELEMS(cbplo_bits), - cbplo_bits, 1, 1, cbplo_codes, 1, 1, cbplo_symbols, 1, 1, 512); + INIT_VLC_SPARSE_STATIC(&cbplo_tab, CBPLO_VLC_BITS, FF_ARRAY_ELEMS(cbplo_bits), + cbplo_bits, 1, 1, cbplo_codes, 1, 1, cbplo_symbols, 1, 1, + 1 << CBPLO_VLC_BITS); INIT_VLC_SPARSE_STATIC(&cbphi_tab, 6, FF_ARRAY_ELEMS(cbphi_bits), cbphi_bits, 1, 1, cbphi_codes, 1, 1, NULL, 0, 0, 64);