From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C3C0A4789F for ; Tue, 26 Sep 2023 22:18:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DEEE868CAC3; Wed, 27 Sep 2023 01:17:33 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2084.outbound.protection.outlook.com [40.92.90.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B2CE68CA77 for ; Wed, 27 Sep 2023 01:17:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MH6NWmR72Es+rM0ISUzCvJJuQD15/Soe9Qt0vOEgTCWe06eFuwBVZfbFdAcMYdRqqiH42E5yHy04cEIsV8zFPrBRU54C1MdbGIcihKVdSwlx+9NGmL0u8joP3urliyaFoLuhBc5FdpEJN7PbTytwOutBU5TjBKT9fgPT9Nt5tR/PYWe1lpYyAC3Wkz2LGaEy9ygyxQGFFSJolRsv9v7nbGUZJyUQWG82Of2NLnmlLPY5NHc51z8MBQcK7LCzQtcHQ4B/YIRKxpCDP6G6ozOda3YJRUr/E1JgWmfaxIhnsmeQednWgn3EOy8TT/r95hCBZMdhvn5NE0e7pxbOdlKH/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qohdtmCzP0hSchck51xxdLQJvIY3DmwVN03Qm/j6wjA=; b=EQRJaYWeCddCeLgDk6lZjEjyzeiSGWvhCogASSWcGZD/8AzVZ6+m7Ky52oVXRLOetHz4uO8kP8ctdP+X3DzQddGMew2d1wknp3usqZTXuleB9Iyz9ajhK5d6kS5Icz8i9l+IdNYcCsHXPBNzSPGco9qz2k10Vd3vnTKBeS4eT4v8V4lZnvIhsmceusR5QNSqePyNKSJN4lVtrdLgRVv6rdIylJs6GV5RNHHSsLafWn7UYabBHFN7BKIEaPC79do/6VNO01pqJGpaMuxAoiC6C/zg7IXVAOIfOVpu4I7NlKe2b9QmKmdXGKvqexIiAu59WSHmUAac+lavb9IOzc45fw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qohdtmCzP0hSchck51xxdLQJvIY3DmwVN03Qm/j6wjA=; b=eikYdSeJQfdQOSF+DLWkyo2YzaWLNlG4gJ9DphzAgUY429UNgHotcWiJu0xsX8qlhmqHPtRwbhqFY+X9geJ9k2kBS46L7mOr2aIjXaxGRm/h7VU42l5DR2oFBWcm6n5f6rGpf395RiESyIwXH68LxbDBNLu6FAqV56UVagFyiSo98ttyOPDR2bPae99ToujKYE9BluXf2VwLpca9a7fs/81y3r0nsOclJi7RDz1Yat6ujtaB+qQSE+PMH/s5jtbUlEr6n6tPdQzKPRQzHgzXaP8R7nN4KwU2o6fTEhZAVm6RbNkldI6agJ2LmYYwVMcBCYyLGu1d4jRm9OZOlKaFVQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0413.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c0::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 22:17:31 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a%3]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 22:17:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:16:49 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [l1kMNgBhJ4amk4LwVcTgd5N7EG/QxWR0] X-ClientProxiedBy: FR3P281CA0019.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230926221732.3711507-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0413:EE_ X-MS-Office365-Filtering-Correlation-Id: 86e13f8b-e8c0-4f50-ec8b-08dbbede605e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YtY0+SF/ORWtsE6WrGFG/rBN/++NgwoCXl9ngVpqdYFcBJz6waow2uYbToR2JZOauh0zm4QMWFWcIHzSJG2AR7EQ7Otus5rCGNt0k3TFEQF1T4gXADSYjhmaZhkBAUxI/6NMq/1Kuoeh2Wrxe0mjLAy5S3kqkMJiZ59wo9/5DaGmcreAdMQUjIf5E1QXtPnQnAfd8eSPv6XZAkR1vIHxIDCNTBYfnSJMsGd/d0GHCwAnYt759ogIuK6EyXNPGuYKkk+tC/qFiCYud/vmfHcPa+rQy074HxC0bZE008PjFtJtQLR0/y3lTweMwO8JquMB49fvkyN6hH4yFW7aqbNOx3ANu3kuaEywdKnC10s8Y43H2FX/yURaQhIfXskElAkzObSd0eY/ng0pN8P0HL8/Ib408NOGgFcJYkfylftWYXEFufOfBgO38oF7jfKxrlEU03VPtBZL4xH0JWws+HqPKJLLSxF7zN2wSv3DKzHISvhorB+qbd4w7x9QfZbG4acKmZVZINU939kNd72HRPW4VdTkt37/W1d5RsuJQf52swedgzoaoacBouqNolb/OK75DaD+E6KrZRBMUtbWjy1KyQaC73fpF20s4MlpANMTz1xEnxfOMQCUqbD4OgwW6dKU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8NvDRRWoUhqx69bsflTFlGubNzapEZII+GkKvSeHvCns82GPliROS2J2R85r?= =?us-ascii?Q?YBPainKXy4uT3f67QXQzVLmU8RKvDboKYw5nsNEsB5zHTGxBH6Dh04eoK8IS?= =?us-ascii?Q?f5OUF/6y4+5WFl9hZXXXr0NF95sfQ3Dn4sYFIqPaeaBzfuEtk5QpxgyILdlw?= =?us-ascii?Q?WU+6D7J/oh5RX/K0QtQAnKQp4j4m5vhJgTn7uVw8pXg2Njd1y7yJt0IGbBDD?= =?us-ascii?Q?/GJac2V6h+UUsm9jyCqto+p4WkbUxUnkLTo18agJHMWKqI7GyYreMhkTplL4?= =?us-ascii?Q?rpmB5UupCDSyeGHlHp3plI25dYznQp8rybMb4OQPL06/eqxysiiWYyaZxnkS?= =?us-ascii?Q?HLmI/IztmjSBmMgHHQbYEpYhyKhoixb+eIi/QUTb643g0MQMgJbYrerCi5i1?= =?us-ascii?Q?obLps649ia3KzR9EEn1o79q1LwsX2E8MH6h8GF0FG3bvO5x/8DVj9bL2AImm?= =?us-ascii?Q?piMOzQXiZxsM4TmOwWm/+ENA22E6PQLFHcZXGswcPscAchEMAFbwffb2Y31f?= =?us-ascii?Q?BF2HJCHdBKsdofpfIFR/M4xJ/vFeRNyAn92RJ3ttznPSSflpZl2T/YIZ+gRj?= =?us-ascii?Q?xv2iNyKF1TfW8mHToadgS3mTlhR9MV98s6a+UwZZyU8/9PM0UKkknxj+2K9F?= =?us-ascii?Q?gw1LNo5KuQGKxF1sKAoTM8TWyMZgxboEMtbjXLPGZEzUtDS/aK+bQ5hQ6/Au?= =?us-ascii?Q?vYTfPY+gX8D5bxHVxjkw/N3iKM10etGcfsKRf+Yntc8ZPGwQwQgrCMLnt1eS?= =?us-ascii?Q?mR4lVEu1hVQfKICry3mTUBBJSNiUCW/5LFmQPuUC+NWd9T+ZYKwCF1DB3h6c?= =?us-ascii?Q?+8y9rST/v4HC3bVgNU3v4m3WissxE6A2CvMeFUlYnDhg/n5NBo0RogxSYWJN?= =?us-ascii?Q?tp/uLaqa10K4x4frwo42TULa4iImYTq60oEl8qlvQuPxIEImIRpkkq94glwX?= =?us-ascii?Q?uc2a2o8OlhbUUrBTR9Rt9Ueht0rFURDqSRIMf455iX8O4M4upk1fLK8/emQE?= =?us-ascii?Q?JmBsweKbhGVFUSBEfbq5yyjb/iPcJkiUfT7zUIy4cR4j/5I6X6XWlUSRPY9H?= =?us-ascii?Q?TR7ZRsSKSGI1jLfl8PZzmBXu1ap3SpD+yyCfT72vYT8m/00gt15ZvbmYWwAC?= =?us-ascii?Q?lQ3Ykz+FAugEK6VYxEcKsax5uTbuScF5cyGPE/lwqJvk7tNOBl2otqxQyYP9?= =?us-ascii?Q?HIeXY+jooUhaWAx2VjjyidsbZpyKbX5ChrA5xsGVTZKK/GZ8q6Qwg0TdOIFp?= =?us-ascii?Q?iMIaN9iEFwX+Tl3UNLp4?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86e13f8b-e8c0-4f50-ec8b-08dbbede605e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 22:17:31.4148 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4P250MB0413 Subject: [FFmpeg-devel] [PATCH 18/61] avcodec/atrac9dec: Avoid superfluous VLC structures X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Of all these VLCs here, only VLC.table was really used after init, so use the ff_vlc_init_tables API to get rid of them. Signed-off-by: Andreas Rheinhardt --- libavcodec/atrac9dec.c | 52 ++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index d24a8e3f79..5b84f0c6d6 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -105,8 +105,8 @@ typedef struct ATRAC9Context { DECLARE_ALIGNED(32, float, temp)[2048]; } ATRAC9Context; -static VLC sf_vlc[2][8]; /* Signed/unsigned, length */ -static VLC coeff_vlc[2][8][4]; /* Cookbook, precision, cookbook index */ +static const VLCElem *sf_vlc[2][8]; /* Signed/unsigned, length */ +static const VLCElem *coeff_vlc[2][8][4]; /* Cookbook, precision, cookbook index */ static inline int parse_gradient(ATRAC9Context *s, ATRAC9BlockData *b, GetBitContext *gb) @@ -277,12 +277,12 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b, const uint8_t *sf_weights = at9_tab_sf_weights[get_bits(gb, 3)]; const int base = get_bits(gb, 5); const int len = get_bits(gb, 2) + 3; - const VLC *tab = &sf_vlc[0][len]; + const VLCElem *tab = sf_vlc[0][len]; c->scalefactors[0] = get_bits(gb, len); for (int i = 1; i < b->band_ext_q_unit; i++) { - int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table, + int val = c->scalefactors[i - 1] + get_vlc2(gb, tab, ATRAC9_SF_VLC_BITS, 1); c->scalefactors[i] = val & ((1 << len) - 1); } @@ -310,10 +310,10 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b, const int len = get_bits(gb, 2) + 2; const int unit_cnt = FFMIN(b->band_ext_q_unit, baseline_len); - const VLC *tab = &sf_vlc[1][len]; + const VLCElem *tab = sf_vlc[1][len]; for (int i = 0; i < unit_cnt; i++) { - int dist = get_vlc2(gb, tab->table, ATRAC9_SF_VLC_BITS, 1); + int dist = get_vlc2(gb, tab, ATRAC9_SF_VLC_BITS, 1); c->scalefactors[i] = baseline[i] + dist; } @@ -331,12 +331,12 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b, const int base = get_bits(gb, 5) - (1 << (5 - 1)); const int len = get_bits(gb, 2) + 1; const int unit_cnt = FFMIN(b->band_ext_q_unit, baseline_len); - const VLC *tab = &sf_vlc[0][len]; + const VLCElem *tab = sf_vlc[0][len]; c->scalefactors[0] = get_bits(gb, len); for (int i = 1; i < unit_cnt; i++) { - int val = c->scalefactors[i - 1] + get_vlc2(gb, tab->table, + int val = c->scalefactors[i - 1] + get_vlc2(gb, tab, ATRAC9_SF_VLC_BITS, 1); c->scalefactors[i] = val & ((1 << len) - 1); } @@ -418,12 +418,12 @@ static inline void read_coeffs_coarse(ATRAC9Context *s, ATRAC9BlockData *b, if (prec <= max_prec) { const int cb = c->codebookset[i]; const int cbi = at9_q_unit_to_codebookidx[i]; - const VLC *tab = &coeff_vlc[cb][prec][cbi]; + const VLCElem *tab = coeff_vlc[cb][prec][cbi]; const HuffmanCodebook *huff = &at9_huffman_coeffs[cb][prec][cbi]; const int groups = bands >> huff->value_cnt_pow; for (int j = 0; j < groups; j++) { - uint16_t val = get_vlc2(gb, tab->table, ATRAC9_COEFF_VLC_BITS, 2); + uint16_t val = get_vlc2(gb, tab, ATRAC9_COEFF_VLC_BITS, 2); for (int k = 0; k < huff->value_cnt; k++) { coeffs[k] = sign_extend(val, huff->value_bits); @@ -841,33 +841,31 @@ static av_cold int atrac9_decode_close(AVCodecContext *avctx) return 0; } -static av_cold void atrac9_init_vlc(VLC *vlc, int nb_bits, int nb_codes, - const uint8_t (**tab)[2], - unsigned *buf_offset, int offset) +static av_cold const VLCElem *atrac9_init_vlc(VLCInitState *state, + int nb_bits, int nb_codes, + const uint8_t (**tab)[2], int offset) { - static VLCElem vlc_buf[24812]; + const uint8_t (*table)[2] = *tab; - vlc->table = &vlc_buf[*buf_offset]; - vlc->table_allocated = FF_ARRAY_ELEMS(vlc_buf) - *buf_offset; - ff_vlc_init_from_lengths(vlc, nb_bits, nb_codes, - &(*tab)[0][1], 2, &(*tab)[0][0], 2, 1, - offset, VLC_INIT_STATIC_OVERLONG, NULL); - *buf_offset += vlc->table_size; *tab += nb_codes; + return ff_vlc_init_tables_from_lengths(state, nb_bits, nb_codes, + &table[0][1], 2, &table[0][0], 2, 1, + offset, 0); } static av_cold void atrac9_init_static(void) { + static VLCElem vlc_buf[24812]; + VLCInitState state = VLC_INIT_STATE(vlc_buf); const uint8_t (*tab)[2]; - unsigned offset = 0; /* Unsigned scalefactor VLCs */ tab = at9_sfb_a_tab; for (int i = 1; i < 7; i++) { const HuffmanCodebook *hf = &at9_huffman_sf_unsigned[i]; - atrac9_init_vlc(&sf_vlc[0][i], ATRAC9_SF_VLC_BITS, - hf->size, &tab, &offset, 0); + sf_vlc[0][i] = atrac9_init_vlc(&state, ATRAC9_SF_VLC_BITS, + hf->size, &tab, 0); } /* Signed scalefactor VLCs */ @@ -878,8 +876,8 @@ static av_cold void atrac9_init_static(void) /* The symbols are signed integers in the range -16..15; * the values in the source table are offset by 16 to make * them fit into an uint8_t; the -16 reverses this shift. */ - atrac9_init_vlc(&sf_vlc[1][i], ATRAC9_SF_VLC_BITS, - hf->size, &tab, &offset, -16); + sf_vlc[1][i] = atrac9_init_vlc(&state, ATRAC9_SF_VLC_BITS, + hf->size, &tab, -16); } /* Coefficient VLCs */ @@ -888,8 +886,8 @@ static av_cold void atrac9_init_static(void) for (int j = 2; j < 8; j++) { for (int k = i; k < 4; k++) { const HuffmanCodebook *hf = &at9_huffman_coeffs[i][j][k]; - atrac9_init_vlc(&coeff_vlc[i][j][k], ATRAC9_COEFF_VLC_BITS, - hf->size, &tab, &offset, 0); + coeff_vlc[i][j][k] = atrac9_init_vlc(&state, ATRAC9_COEFF_VLC_BITS, + hf->size, &tab, 0); } } } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".