From patchwork Tue Sep 15 07:39:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22407 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 4B04544937C for ; Tue, 15 Sep 2020 10:44:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 82EF768BC95; Tue, 15 Sep 2020 10:41:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 453E568BC6F for ; Tue, 15 Sep 2020 10:40:53 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id s13so2302998wmh.4 for ; Tue, 15 Sep 2020 00:40:53 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=TpHtjgYVHpUbvYxMq0FKZ4btCHB3q/EBElx1sKDzZ0M=; b=O5GSUDZJxdOKfTms082kHIqONA+1gc+IwmazoBbtb0ePM3MjqjcZ4olxwXkHMkpokG QS4iQxUZPvK6ctBtzvPdyKe2sdAhGS3WpkjizQ2loiVGh4EpJIHWD0NV4D0rarz8CqE8 cnoDchqvqBOTSnWoos0NGDyQvT8V7TPxKnU6ModfYtkqOtseEudSZ+v279yqpsWGuUeb RL1I+DjkcRVJ7OXu6rQ6m2tIn3BhNXW6UZneB4O51U+4g5QBpCsfy7buFDogHYgGOt2Z /RS/tRPqHC/XthjoVTf0YV0DilKVHtfuJyoUiMcqFDqEqryT3grduHbRQ+wEnmaS23Tv 1gvA== 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:mime-version:content-transfer-encoding; bh=TpHtjgYVHpUbvYxMq0FKZ4btCHB3q/EBElx1sKDzZ0M=; b=pIIS2L7v3oinWZedErzxBGBP8X4UrLJdrbdEQ26RhC+bt0qkox6a3jkBlWe2t06iM+ OMWnRwDn8CGdKX2FCoolwzK4nh0MQLbi9CJKyv8TaqL0x6WY/GlrFtGzS3/WDl/7ojFU pWDNrWIfz1QDjGOsboe5NSZ2jATpyQyYoujsP7fYIwUC7Gorx8RTUktmkXqfWrwL3fRa xE67bv+2JSJFjz+l+qZL3TUZjmEu3TyFR7vEHAl54dD03EscJsWJwj02FwIsHopswbYm qatQDNLJR2YI9mhXvtBgjWTk1IYe3acS/4XKdLDczHfwO5WqjYh2PN/mletVlsUzuo1S MuTA== X-Gm-Message-State: AOAM532zI60Uvx7qX9+9y2thpt5+l8OmQTTVSM3nmxkLibwXY9tDCHQ2 c4EvEsPHHoW8TlKpwx6WyZhm+ZZvvPc= X-Google-Smtp-Source: ABdhPJxNOY/2aD8/8bUgXZukSsEzAvw9/2HloucSgxNOVx+R8+CleIZWPONGaXe/bjDsHVf5DgF3bQ== X-Received: by 2002:a1c:b703:: with SMTP id h3mr3112163wmf.131.1600155652268; Tue, 15 Sep 2020 00:40:52 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:56 +0200 Message-Id: <20200915074000.102622-26-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> References: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 26/30] avcodec/mpc7, mpc7data: Avoid gaps in array 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" The Musepack decoder uses static VLC tables to parse the bitstream. There are 14 different quant tables VLCs and each of them has a varying number of codes. The maximum number is 63, the average number is 25.3. Up until now, the array containing the raw data was of type uint16_t [7][2][64 * 2] (the 14 tables come in pairs of two, hence [7][2] instead of [14]) and from this it follows that there were large gaps in said array. This commit changes this by making it a continuous array instead. Doing so saves about 2KB. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpc7.c | 17 ++++++---- libavcodec/mpc7data.h | 76 +++++++++++++------------------------------ 2 files changed, 32 insertions(+), 61 deletions(-) diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 8518bc2f8a..4a4f8cf616 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -38,10 +38,9 @@ static VLC scfi_vlc, dscf_vlc, hdr_vlc, quant_vlc[MPC7_QUANT_VLC_TABLES][2]; -static const uint16_t quant_offsets[MPC7_QUANT_VLC_TABLES*2 + 1] = +static const uint16_t quant_sizes[MPC7_QUANT_VLC_TABLES*2] = { - 0, 512, 1024, 1536, 2052, 2564, 3076, 3588, 4100, 4612, 5124, - 5636, 6164, 6676, 7224 + 512, 512, 512, 516, 512, 512, 512, 512, 512, 512, 512, 528, 512, 548 }; @@ -54,6 +53,8 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx) static int vlc_initialized = 0; static VLC_TYPE quant_tables[7224][2]; + VLC_TYPE (*quant_table)[2] = quant_tables; + const uint16_t *raw_quant_table = mpc7_quant_vlcs; /* Musepack SV7 is always stereo */ if (avctx->channels != 2) { @@ -103,11 +104,13 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx) &mpc7_hdr[0], 2, 1, 1 << MPC7_HDR_SIZE); for(i = 0; i < MPC7_QUANT_VLC_TABLES; i++){ for(j = 0; j < 2; j++){ - quant_vlc[i][j].table = &quant_tables[quant_offsets[i*2 + j]]; - quant_vlc[i][j].table_allocated = quant_offsets[i*2 + j + 1] - quant_offsets[i*2 + j]; + quant_vlc[i][j].table = quant_table; + quant_vlc[i][j].table_allocated = quant_sizes[i * 2 + j]; + quant_table += quant_sizes[i * 2 + j]; init_vlc(&quant_vlc[i][j], 9, mpc7_quant_vlc_sizes[i], - &mpc7_quant_vlc[i][j][1], 4, 2, - &mpc7_quant_vlc[i][j][0], 4, 2, INIT_VLC_USE_NEW_STATIC); + raw_quant_table + 1, 4, 2, + raw_quant_table, 4, 2, INIT_VLC_USE_NEW_STATIC); + raw_quant_table += 2 * mpc7_quant_vlc_sizes[i]; } } vlc_initialized = 1; diff --git a/libavcodec/mpc7data.h b/libavcodec/mpc7data.h index 90ab75fe65..b9c5f208a4 100644 --- a/libavcodec/mpc7data.h +++ b/libavcodec/mpc7data.h @@ -59,87 +59,59 @@ static const uint8_t mpc7_quant_vlc_off[MPC7_QUANT_VLC_TABLES] = { 0, 0, 3, 4, 7, 15, 31 }; -static const uint16_t mpc7_quant_vlc[MPC7_QUANT_VLC_TABLES][2][64 * 2] = { -{ - { +static const uint16_t mpc7_quant_vlcs[177 * 2 * 2] = { 0x0036, 6, 0x0009, 5, 0x0020, 6, 0x0005, 5, 0x000A, 4, 0x0007, 5, 0x0034, 6, 0x0000, 5, 0x0023, 6, 0x000A, 5, 0x0006, 4, 0x0004, 5, 0x000B, 4, 0x0007, 3, 0x000C, 4, 0x0003, 5, 0x0007, 4, 0x000B, 5, 0x0022, 6, 0x0001, 5, 0x0035, 6, 0x0006, 5, 0x0009, 4, 0x0002, 5, - 0x0021, 6, 0x0008, 5, 0x0037, 6 - }, - { + 0x0021, 6, 0x0008, 5, 0x0037, 6, 0x0067, 8, 0x003E, 7, 0x00E1, 9, 0x0037, 7, 0x0003, 4, 0x0034, 7, 0x0065, 8, 0x003C, 7, 0x00E3, 9, 0x0018, 6, 0x0000, 4, 0x003D, 7, 0x0004, 4, 0x0001, 1, 0x0005, 4, 0x003F, 7, 0x0001, 4, 0x003B, 7, 0x00E2, 9, 0x0039, 7, 0x0064, 8, 0x0035, 7, 0x0002, 4, 0x0036, 7, - 0x00E0, 9, 0x003A, 7, 0x0066, 8 - } -}, -{ - { + 0x00E0, 9, 0x003A, 7, 0x0066, 8, + 0x0059, 7, 0x002F, 6, 0x000F, 5, 0x0000, 5, 0x005B, 7, 0x0004, 5, 0x0006, 4, 0x000D, 4, 0x0004, 4, 0x0005, 5, 0x0014, 5, 0x000C, 4, 0x0004, 3, 0x000F, 4, 0x000E, 5, 0x0003, 5, 0x0003, 4, 0x000E, 4, 0x0005, 4, 0x0001, 5, 0x005A, 7, 0x0002, 5, 0x0015, 5, 0x002E, 6, - 0x0058, 7 - }, - { + 0x0058, 7, 0x0399, 10, 0x0071, 7, 0x0033, 6, 0x00E7, 8, 0x039A, 10, 0x0068, 7, 0x001E, 5, 0x0000, 3, 0x001D, 5, 0x0069, 7, 0x0032, 6, 0x0001, 3, 0x0002, 2, 0x0003, 3, 0x0031, 6, 0x006B, 7, 0x001B, 5, 0x0002, 3, 0x001F, 5, 0x0070, 7, 0x0398, 10, 0x006A, 7, 0x0030, 6, 0x0072, 7, - 0x039B, 10 - } -}, -{ - { - 0x000C, 4, 0x0004, 3, 0x0000, 2, 0x0001, 2, 0x0007, 3, 0x0005, 3, 0x000D, 4 - }, - { - 0x0004, 5, 0x0003, 4, 0x0002, 2, 0x0003, 2, 0x0001, 2, 0x0000, 3, 0x0005, 5 - } -}, -{ - { - 0x0005, 4, 0x0000, 3, 0x0004, 3, 0x0006, 3, 0x0007, 3, 0x0005, 3, 0x0003, 3, 0x0001, 3, 0x0004, 4 - }, - { - 0x0009, 5, 0x000C, 4, 0x0003, 3, 0x0000, 2, 0x0002, 2, 0x0007, 3, 0x000D, 4, 0x0005, 4, 0x0008, 5 - } -}, -{ - { + 0x039B, 10, + + 0x000C, 4, 0x0004, 3, 0x0000, 2, 0x0001, 2, 0x0007, 3, 0x0005, 3, + 0x000D, 4, + 0x0004, 5, 0x0003, 4, 0x0002, 2, 0x0003, 2, 0x0001, 2, 0x0000, 3, + 0x0005, 5, + + 0x0005, 4, 0x0000, 3, 0x0004, 3, 0x0006, 3, 0x0007, 3, 0x0005, 3, + 0x0003, 3, 0x0001, 3, 0x0004, 4, + 0x0009, 5, 0x000C, 4, 0x0003, 3, 0x0000, 2, 0x0002, 2, 0x0007, 3, + 0x000D, 4, 0x0005, 4, 0x0008, 5, + 0x0039, 6, 0x0017, 5, 0x0008, 4, 0x000A, 4, 0x000D, 4, 0x0000, 3, 0x0002, 3, 0x0003, 3, 0x0001, 3, 0x000F, 4, 0x000C, 4, 0x0009, 4, 0x001D, 5, 0x0016, 5, 0x0038, 6, - }, - { 0x00E5, 8, 0x0038, 6, 0x0007, 5, 0x0002, 4, 0x0000, 3, 0x0003, 3, 0x0005, 3, 0x0006, 3, 0x0004, 3, 0x0002, 3, 0x000F, 4, 0x001D, 5, 0x0006, 5, 0x0073, 7, 0x00E4, 8, - }, -}, -{ - { + 0x0041, 7, 0x0006, 6, 0x002C, 6, 0x002D, 6, 0x003B, 6, 0x000D, 5, 0x0011, 5, 0x0013, 5, 0x0017, 5, 0x0015, 5, 0x001A, 5, 0x001E, 5, 0x0000, 4, 0x0002, 4, 0x0005, 4, 0x0007, 4, 0x0003, 4, 0x0004, 4, 0x001F, 5, 0x001C, 5, 0x0019, 5, 0x001B, 5, 0x0018, 5, 0x0014, 5, 0x0012, 5, 0x000C, 5, 0x0002, 5, 0x003A, 6, 0x0021, 6, 0x0007, 6, - 0x0040, 7 - }, - { + 0x0040, 7, 0x1948, 13, 0x194A, 13, 0x0328, 10, 0x0195, 9, 0x00CB, 8, 0x0066, 7, 0x0031, 6, 0x0009, 5, 0x000F, 5, 0x001F, 5, 0x0002, 4, 0x0006, 4, 0x0008, 4, 0x000B, 4, 0x000D, 4, 0x0000, 3, 0x000E, 4, 0x000A, 4, 0x0009, 4, 0x0005, 4, 0x0003, 4, 0x001E, 5, 0x000E, 5, 0x0008, 5, 0x0030, 6, 0x0067, 7, 0x00C9, 8, 0x00C8, 8, 0x0653, 11, 0x1949, 13, - 0x194B, 13 - } -}, -{ - { + 0x194B, 13, + 0x0067, 8, 0x0099, 8, 0x00B5, 8, 0x00E9, 8, 0x0040, 7, 0x0041, 7, 0x004D, 7, 0x0051, 7, 0x005B, 7, 0x0071, 7, 0x0070, 7, 0x0018, 6, 0x001D, 6, 0x0023, 6, 0x0025, 6, 0x0029, 6, 0x002C, 6, 0x002E, 6, @@ -150,9 +122,7 @@ static const uint16_t mpc7_quant_vlc[MPC7_QUANT_VLC_TABLES][2][64 * 2] = { 0x003B, 6, 0x0034, 6, 0x0030, 6, 0x002F, 6, 0x002B, 6, 0x002A, 6, 0x0027, 6, 0x0024, 6, 0x0021, 6, 0x001C, 6, 0x0075, 7, 0x0065, 7, 0x0064, 7, 0x0050, 7, 0x0045, 7, 0x0044, 7, 0x0032, 7, 0x00E8, 8, - 0x00B4, 8, 0x0098, 8, 0x0066, 8 - }, - { + 0x00B4, 8, 0x0098, 8, 0x0066, 8, 0x37A4, 14, 0x37AD, 14, 0x37A6, 14, 0x37AE, 14, 0x0DEA, 12, 0x02F0, 10, 0x02F1, 10, 0x00A0, 9, 0x00A2, 9, 0x01BC, 9, 0x007A, 8, 0x00DF, 8, 0x003C, 7, 0x0049, 7, 0x006E, 7, 0x000E, 6, 0x0018, 6, 0x0019, 6, @@ -164,8 +134,6 @@ static const uint16_t mpc7_quant_vlc[MPC7_QUANT_VLC_TABLES][2][64 * 2] = { 0x005F, 7, 0x0048, 7, 0x0029, 7, 0x00BD, 8, 0x007B, 8, 0x0179, 9, 0x00A1, 9, 0x037B, 10, 0x0147, 10, 0x0146, 10, 0x0DE8, 12, 0x37AF, 14, 0x37A7, 14, 0x37AC, 14, 0x37A5, 14 - } -} }; #endif /* AVCODEC_MPC7DATA_H */