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 DF825478CE for ; Tue, 26 Sep 2023 22:24:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC46368CB34; Wed, 27 Sep 2023 01:22:22 +0300 (EEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2075.outbound.protection.outlook.com [40.92.66.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D43A68CB0F for ; Wed, 27 Sep 2023 01:22:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wd9UzU8eARY/AhCzkWGVHDWIKC2OIsQShzejAjnElSDs1lF/0i1d7X7tacKg8O8luv57yynw8K9rc5M4MytH4mfU7+RtbJ1KzKWJjEGWazgLO0VoYTOdFKIwUWY0hEk1a7RKac1GeZUlwIMfVQuD4V6kLirr4D3J77hYTApPu1Xd0mAet86sre3m00odqbTCPyqcOuXfHI3myAwAs0icFDA2/bFFTdWnbJp2bLIO9eNfbUirlGnCOREu1vueOAJ52EOOGx+cxbWS6Nt9zQxGVk/rLC+lKTtHR5TjXu5e8KZLi/O/AQ/eoot+wjVy0VCUh/1KeQgY1H+wTVcQlnzeAA== 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=ouW0i4+LIqNLwLn3rjKqrV3zxhujylbQXLvGcY2VUJU=; b=YwatWdrKYbkNSJ2bQ+Ri2RGM/nGn3Bmy+pISFwgrJk6rQ5Z6kupo4rOVIPL3WZBZEPfgMKiyaekrj58s7BlAMdAqW9QGG7llESAF9c/LaqsKHlme8IBw9Zt2DPl/AshwpKlnTmCfpF5cxbyKaTugP2vYMpLwTyIrN57tyggVmctpzwvJ/N+pVXv0wNJM4FUKuuZC3vs3CpudneY60LkVzTN95ugg9yZzrgaKYaznWvjwFr5gj2+haMEsr82UIGOB3JfmEAK4L4+z556J5FfGQQPl+c2yq+SIpMCPXbaokAMk+yYnOq3P7v6MCHH7TZS/k66Uv5TSoVBPHhU8hTUZ2w== 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=ouW0i4+LIqNLwLn3rjKqrV3zxhujylbQXLvGcY2VUJU=; b=sX3ftgp7fC3tkz8aJOI3ZCapF1TNZ73Qlew76pWocjId70GSQHzu5Nym6aH7rd1WRRZksh8v0di0fpbZTG8VAK6WAki9K2W1m5AhVAlyHt/nONNgR681UeaHi9buPjZoxlygqEfZjcgGxzwW9RYRYmbbQLp5J+SuYFNmudWPEK8MKIkR+UUnnROdRv4j9bnBMD8NO0+70rWcWPjmgVxt1pBUZeE3Kvbcppy2Rz8FgRWlVVnkG2kaAP/DC1O/SYP72uy9JoXeX7N+gbKIfc5yXZNR0ISRDb3NSWKPzyP0JgVLToz8md+65L8CjL14BgCs4YlaDqPv3rkSps1ljCoAKQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0160.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:323::5) 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:22:20 +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:22:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:17:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ipILeyeai5F0PMiUi1in9D0RpwSPF0AH] 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-52-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0160:EE_ X-MS-Office365-Filtering-Correlation-Id: 9763b045-5a5c-4418-26c9-08dbbedf0c6f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ae01Hz49LpzZusUzRCereW9tMrOPtxjAuRTAtmZKi9IS/scfXfI8KErc35m8+O075YJXatsingqykZQ4HnjY9XCfuytjMrlKbCF39Fdf4hG0UdPRPEcdSzyzha9rbMllN12jfOmqTc7pVCWGsJa0Raj9T0UQdxEB4AVsEiyjjxHlzH1ATKkuexEuSZ7t9SNruVJnIwbbM9zuAsRkccKTmbxcCLcU5m9TWHYRcsA/wpJYohTWf87ER9n6U7R1X61nrap+JeA20Keoe04Ui/jyudj/BG69p4DZAdqqD/EWvcVXVFDHgDmigeH07ck2IUdRjWCdK+JrcUyu+GthlXNwSBU+hjjO6r6XV+kUhz1sZFv2Vfzr1I/EQM2Uk20DPiX5nmecLwZZ7/vP0f1/edUEacAzwSg0NL+d4pei61TPpqmHGtXHmm8Tx5+W9OXuqmQlFBRoA/y153B0GCuvdf2nBuosaILAqAi3ffwzdvQGbtRUMynhqzBEUqfEkmDMqw68/3ynj7I+F8jJ6lA6x7oodCGzmS/njlhdygsRbwLQBU8iAd0RLXy1QXOAf4dglqQQv20vrr0liNvNyMz0pGw8vEjL5tWqUrDxkQteuEJGjHZ140DVu8JAN4z3kvvHLHyR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PqJhQK4oY/09VJ0bsamJ/8GUGEGd0wbk1FY+sZanZmj+N8WyV4ctP4bgeXH4?= =?us-ascii?Q?Gpb5y9qZK2murEdDUGwcXiA2wrCkB5rE3M0pA00Ytl9mz+WdRqpR8cNE3xvn?= =?us-ascii?Q?Eq0KdHFMbUBsyJGbtQ6E4LyC0zkWm8uHG10P0CMNNm9+skeIl8hmPA+ETn3Y?= =?us-ascii?Q?Vy1lQ42h2EGfef8oMzUSV2/XO6FW4pdZQfs2GZp0xNnxolJ5y3ISulAWCixL?= =?us-ascii?Q?Q1/RB/Drq/PFHjGvRGhtIO4ypjT8y5KnNUwCKAmW33AMiLMkC4jf81veic/X?= =?us-ascii?Q?eBMlT9lpk7dnC7ogWXiVDa1rDHptEHCd4M9G1HgcnlfOlusCmUpaQ8lcTlxf?= =?us-ascii?Q?XRorcygqoDa+6coLZoTk8WJgyypgtaPyW7UOuYhuwkGXqYnFPVwMQ1rKvzDz?= =?us-ascii?Q?ayENT9JGYbv8fhZxFahI1jIQAXXYOXpD7ERB+ZcAC6PEFGOLVNE4acJAk9LM?= =?us-ascii?Q?c92t9t2VW2ddTzXl1Kq2h83njxtY4I4LUNlpM6xX0FaBuR4ufeHpC1fkM/ae?= =?us-ascii?Q?dh15TrLMWjeB+Enxl3lvt7eKSzqZOdanGZDYPj6KtykJpVAzPDCaP3/2RboO?= =?us-ascii?Q?lcgE4gPb8mxT6aes5d1dX3BVyRjGbdnPs7pZydgXT5AQJgUXOVZWRQhwaaGN?= =?us-ascii?Q?Wl+XsbFeeGc88yeTdtRvbKGa3BZ6kJpXjrQ+iE7A0vbLYMh5G3E6Ut8efPBl?= =?us-ascii?Q?+AFD9R3GWBp6kproD+R8ET75S1LAFL7Gq+jT1TS7pqbm4KXZUhvl612Qb2xe?= =?us-ascii?Q?7LhW3F0T0queW7mA5Z+pigxLNzVKpIV51NCHIbb1rTCt6e1XQCTEYH9MT/pb?= =?us-ascii?Q?BUb10vNDUmDFkDcYTTAOo1ra6d8BFE7dEhH0OZJDaxN8mQi6XywFjf9AKCeQ?= =?us-ascii?Q?E/UGCR6e7kHr5HKVlORAIYo4G0HfMDcnhqefsN3BJCdtdGeHqtFti0efZ9dU?= =?us-ascii?Q?NmQpJBGSBBuQEfLh9ZXpAC2uiiBcgyflyN9TmP1p+zJ/auoonGUOhMSMoG6p?= =?us-ascii?Q?ZgFeNqlrmmcapMGebzaLc6pi1KKvvz2qSTDztUn2kmbJq1voPtnF/ucz0AEd?= =?us-ascii?Q?fucBkVdGZuretza1tvAQCEo2dRwTyifazp8VBr8XjjDwFhyf+Kfk9mas+Sq6?= =?us-ascii?Q?rxI7HM0U8Yq/Qxvx96JZuZaTda7KzV4LjjQTZ6YGAgY5mlFENN9GCmephSyu?= =?us-ascii?Q?fRNgaZaSw0R9OtH8Ay/Mcjdf56MPKRBQvnzmvyFIPzfPlRWEAyT8NCPIOwCI?= =?us-ascii?Q?sLNe1VmOVEfKJqM6rzFk?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9763b045-5a5c-4418-26c9-08dbbedf0c6f 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:22:20.1445 (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: AM8P250MB0160 Subject: [FFmpeg-devel] [PATCH 53/61] avcodec/aacps_common: 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: For all VLCs here, the number of bits of the VLC is write-only, because it is hardcoded at the call site. Therefore one can replace these VLC structures with the only thing that is actually used: The pointer to the VLCElem table. Signed-off-by: Andreas Rheinhardt --- libavcodec/aacps_common.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/aacps_common.c b/libavcodec/aacps_common.c index 6b5493d4c2..281eaa12e7 100644 --- a/libavcodec/aacps_common.c +++ b/libavcodec/aacps_common.c @@ -58,7 +58,7 @@ static const int huff_iid[] = { huff_iid_dt1, }; -static VLC vlc_ps[10]; +static const VLCElem *vlc_ps[10]; #define READ_PAR_DATA(PAR, OFFSET, MASK, ERR_CONDITION, NB_BITS, MAX_DEPTH) \ /** \ @@ -77,7 +77,7 @@ static int read_ ## PAR ## _data(void *logctx, GetBitContext *gb, PSCommonContex int8_t (*PAR)[PS_MAX_NR_IIDICC], int table_idx, int e, int dt) \ { \ int b, num = ps->nr_ ## PAR ## _par; \ - const VLCElem *vlc_table = vlc_ps[table_idx].table; \ + const VLCElem *vlc_table = vlc_ps[table_idx]; \ if (dt) { \ int e_prev = e ? e - 1 : ps->num_env_old - 1; \ e_prev = FFMAX(e_prev, 0); \ @@ -289,16 +289,18 @@ err: } #define PS_INIT_VLC_STATIC(num, nb_bits, size) \ - VLC_INIT_STATIC(&vlc_ps[num], nb_bits, ps_tmp[num].table_size / ps_tmp[num].elem_size, \ - ps_tmp[num].ps_bits, 1, 1, \ - ps_tmp[num].ps_codes, ps_tmp[num].elem_size, ps_tmp[num].elem_size, \ - size); + vlc_ps[num] = ff_vlc_init_tables(&state, nb_bits, ps_tmp[num].table_size / ps_tmp[num].elem_size, \ + ps_tmp[num].ps_bits, 1, 1, \ + ps_tmp[num].ps_codes, ps_tmp[num].elem_size, ps_tmp[num].elem_size, 0); #define PS_VLC_ROW(name) \ { name ## _codes, name ## _bits, sizeof(name ## _codes), sizeof(name ## _codes[0]) } av_cold void ff_ps_init_common(void) { + static VLCElem vlc_buf[(1544 + 832 + 1024 + 1036) + + (544 + 544) + (32 + 32 + 32 + 32)]; + VLCInitState state = VLC_INIT_STATE(vlc_buf); // Syntax initialization static const struct { const void *ps_codes, *ps_bits; -- 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".