From patchwork Fri Nov 20 07:33: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: 23902 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 79A6A449F1B for ; Fri, 20 Nov 2020 09:53:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 020CC68BDA2; Fri, 20 Nov 2020 09:35:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC1B568BD78 for ; Fri, 20 Nov 2020 09:34:56 +0200 (EET) Received: by mail-ej1-f68.google.com with SMTP id a16so11542297ejj.5 for ; Thu, 19 Nov 2020 23:34:56 -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=+c4CCO85KmQgb+oPI5RYpTlXmvufZf8nGupQ/yjP0F8=; b=sz0lqWvWGTTD8ved4Uh+5P3bp1gcE/4xDoCyFzTc69qDOCRXNoc+dTviM4T0oR3aiL mCGG+BXqiMjeoiBf+0PiOVs22YFRIu/tfbqxPoNK0pu8B2MAbCH2KQhFGoCyRL7VeV6J dvmqoaIghuQn30rZar8oluCgPmWiA/YqssndSpwJ0wDqYAaeSQhTuwq35RzP0aBjtCPs VWqp8PRqFszupZh3a5Vb8uAoT0FZn865UNs+uBHQO3UVRRiHob8aN8ESLWUndLaVvA18 p6xGc35Q+/UH7PezsAbtYCS5V4iQOCATQ/O29dPyeYFXYM6Tcg/JUdv2PBlz/vAExl49 0vkQ== 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=+c4CCO85KmQgb+oPI5RYpTlXmvufZf8nGupQ/yjP0F8=; b=hP1lPnZRnXYu0MwEPfOlilpv57hYl2dUDh0HDP83NfC/0+k/3Tro9cmv2BXtfR/gae s7vkETT7xiwVo++6O6Mp17k1okVzK55WzjUKiObT+Lml11GnK/w/TOB0PdJ+dndzYZRf hZ0igh/e1fZOONmH0Ewyq++3y6nrAx2yFfUJi8bOE/2ZnTxn+GDhT3duP/LxLc/h1cKz znSrjdPTRHQ+ic+wezyPkLV9sUt3rMLezrDj9lPMlR1itZAvqkuFTjYmngI7irFnWvXI OXnlI3nAzQEYbalebtAETudzEce27ey0OeXuBsaDgWYfG7ZLleBxcYc//uLrEYmEkGcS MCWA== X-Gm-Message-State: AOAM5338eg+Ot9r4Yc6HS+2X/lSul054AlBRKSN/qsvrK1l5l2HKOxAV zHzX7swD/WIN3K2t7XWQHpSiEJzJx+5uTw== X-Google-Smtp-Source: ABdhPJzx9uilmX9XoNYwXNWvKqAKKqiNs5Cw4cZThgZ+JztZK6FWKsYJANba0d7FNbhM3GbwEpkvVQ== X-Received: by 2002:a17:906:c04d:: with SMTP id bm13mr1154773ejb.519.1605857696142; Thu, 19 Nov 2020 23:34:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:33:16 +0100 Message-Id: <20201120073327.820745-52-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 151/162] avcodec/mpegaudiodec_template: Don't use unnecessarily many VLC bits 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/mpegaudiodec_template.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 849e3e5c09..0634f70b05 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -108,8 +108,8 @@ static const int huff_vlc_tables_sizes[16] = { 142, 204, 190, 170, 542, 460, 662, 414 }; static VLC huff_quad_vlc[2]; -static VLC_TYPE huff_quad_vlc_tables[128+16][2]; -static const int huff_quad_vlc_tables_sizes[2] = { 128, 16 }; +static VLC_TYPE huff_quad_vlc_tables[64+16][2]; +static const int huff_quad_vlc_tables_sizes[2] = { 64, 16 }; /* computed from band_size_long */ static uint16_t band_index_long[9][23]; #include "mpegaudio_tablegen.h" @@ -321,7 +321,7 @@ static av_cold void decode_init_static(void) for (i = 0; i < 2; i++) { huff_quad_vlc[i].table = huff_quad_vlc_tables+offset; huff_quad_vlc[i].table_allocated = huff_quad_vlc_tables_sizes[i]; - init_vlc(&huff_quad_vlc[i], i == 0 ? 7 : 4, 16, + init_vlc(&huff_quad_vlc[i], i == 0 ? 6 : 4, 16, mpa_quad_bits[i], 1, 1, mpa_quad_codes[i], 1, 1, INIT_VLC_USE_NEW_STATIC); offset += huff_quad_vlc_tables_sizes[i];