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 DD0CE4789E for ; Tue, 26 Sep 2023 22:18:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B73C568CAA7; Wed, 27 Sep 2023 01:17:17 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2088.outbound.protection.outlook.com [40.92.90.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B582C68CA92 for ; Wed, 27 Sep 2023 01:17:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OfInRlrjfq5MdnqSVcQr9RWhWQr4nDwlceY1CWjWMynIudV8ey7bFCTXcTHPvWGVfsjWL1nLbMX6oi3gB9E1qQD4EDLnoOykM6wUg3wEeks4e6Xa+NKyY+z19rqJ3h8PMHEqpmqDwiWWeSG6oUaeJgNZE2n8o8KjTUDpVqObk2wpYjjRpY5B5Hk2sTtYgh6RSfjm4tW9oGJIzncTUnPFDaXZwHozM1KjqFs9Wr9DTG4M2hJe1ueBXSMPjvvcAjRPbM6ydupMrkNTwk6sYo9wU7uJ53QhKhxocAB0cfZyvTp1Aoah0B4XxU/7SnHkPeq8H+h+93YzgrYphcUPSObnuQ== 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=mnpEC3ZjtazzWgeNJikdiTY/2P3x6LXcoQeD92DhjeA=; b=bPnen4BXshOiBxSU8gtq6Df89iz09+ifc1CS6rJhKWnpjytAmPg2x+D7FH87DW4Rpeqp2/xPJrUGbSZ9UtD+P+yC1OYYvKNRjy+DIeNP7Xqc1o1ZM9xDq0Jg/t1zNq00nLTMElKdR0MgKITQhl52Mqw7gJDGgq5W33eV2Lqt5Utj2ETvQuD5OYuMTMDOo76p1towY+4rhKRsxwh8eq4orOT9G7J/JpCI/LSO1Rp61NaKA5dfcmXwBEvV2EnOeQQHZwlVkjoSfL4rW7YldstAPWbTmMyzN+VmGsxQ1x9itY4/qJrgiJuBPMwPkaGTmFTl5mqlTdeYFqMhsxOeekIqJQ== 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=mnpEC3ZjtazzWgeNJikdiTY/2P3x6LXcoQeD92DhjeA=; b=qQxtaDfLgyV3c32AEYg1RuX3M26KwIitqQVqS4tqPM/Ystz0ZsnuNY0PMQl9cX1miUQ1yWPareurm8VQhw8KQhLbbp8tMQo3iFKWOk15kEVO4Lp+0wrR6RryctIFsluAYJ3g0yRP4wK9R8OJky1cnO6zZ5p5rJmO7gXlDziTRdtcWgkPEeLoDReddFjBEuGyED5XSkyI16RvaZwpsCY8q/tAZcbYcmZ3JQC+PYLs8/TLi2hRrL+C/ddMgluJEtgoEradPoHuINhHU0Ih++PHi55z9JpMIoIDgjNhFua5W/PccDFdV9uP4cOKwZ52FQt+2DY5dD9KxVu1oSwJNVS9eQ== 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:14 +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:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:16:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7bL/h1IuiN+Mu5XyLxcH4nXh5k2QWiO8] 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-13-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: c4191ce0-9a16-40ec-be16-08dbbede5616 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /iA1niFKt6jiK92YifO4Xpmg9DjA/JFtbjLZnSDRWMq1dyf6AsD7iGVZss0GbECjwm8yPLm5kWxCDUOlFx8Y61ehj2+jAG2jQl7/zwxNXsj3YsOADoiiDmlChT7Sl999JVX16oJFgaBJYKLrOibzqDmsGWKnE/ZBFRI3vO8ZNfpEy6SvyKXCn3Gv8h0Dsnh/S7CygjMoH/TEYTFE+zDzMqQpEhWG3I2pGB8F/zp+XLU8d8CR3aXxom9dejVnYavTE/3+FHcZah5FRqy/m5dD0hPOakrxaG93VFymlRc8oghJHH642T9PzKlyHonL0WKOz6yLk8roO0ZTS0tKM3SB7YgVGCQaecFk4beNwXFP16k9WSwenT+nJLvj663PQRxWWr2yAHPzUVZgDTK3MJYn8wFlWdPlURKvVyFiFZQ68edmmFdn86WFiPvihtT1kwzPoyI6J06G1ejQm5unzN+fUIAR8KzWWvKWZLBjdpNTf00YbC50aCEk2afYs5TFKZb0VOYxGyb6DOA+NFgPeqpFYc3V9qzDFQ2X4bHjfGrTWNY5PXdkyoDbbnV8EjnRU+uTsa8hKiBX1QNik9zMzCUxfNQ2bCXvT+sKDjHS1mIvKFsnmaObhA4ac47+7+MaYjhL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?48HcLFDCDa4GFrW+hbFISSaM0Dw+tyaiiGuklfqEr8NN9Tgo8CYtp1aDkI4K?= =?us-ascii?Q?ZB7BYehGktfJ13eVdUYxdv1TO6pyaTafClUA5k+/h7uBzBTYiv5QXHK9CCwc?= =?us-ascii?Q?VQFnvAiDpOGebQhBua4v1ZmZjKIqnIneLkGHijeDQdPtxailnlpX6hRgF6N0?= =?us-ascii?Q?nRwIo7KhvNw6nLv96vK58zpVpe7ryiB50Yclz1yM8DkThU0XFOo4Axomo2Md?= =?us-ascii?Q?is+5nATImOZzEwsNh7S0GCvch1b5DQF4NBNkGoRRICUjsuPo1uXGFuT0i+P/?= =?us-ascii?Q?XlY9mh/iT1eJK+uAplKCck2mSgQ2BQfjGzObDoH+4DXaXpn6Qlz2UX31zXvi?= =?us-ascii?Q?mVYo/xBKjxE0u2oUeb8JwJUTm5dxsR0Iw5TDOIX1Yz592ORPIaVvS/XcMdCa?= =?us-ascii?Q?aR3+b4k81Td+/aBRpSlnRwcJsblx83H8GS+RcYSm15s5wA8ZQYSBsO6Ugxy4?= =?us-ascii?Q?KHr0H9zwa6Tf1585ptdq97aUqDK4Pq37Yo88e3sH2YlMqZgCKgz0naEqOpQc?= =?us-ascii?Q?PdnEx3irRPoSupL/6yHKqF9JaKmEBWHNgIrsSi3S8mN5frxJlMs+XxDQ6Zu3?= =?us-ascii?Q?c1b3u1zUmHrxDu3p+NfDB94w8IJPkfBO/Sr3UxVsCDuH62TS+phlesdGmuHC?= =?us-ascii?Q?3DTOAQbcaGB57bWQ4yn9acmZadFguqJzwC5IxYmhbUOvtWuLltR/aAXRTPKP?= =?us-ascii?Q?ELDY8sN1/LAxZQV6eW+wSbwNYm2g7WLO88aL0M+nI0cz7ZbmKKwQFlcgfzUr?= =?us-ascii?Q?hVCYQrpk0o4kezQw84LvXd5zc3uMQMbofOY9gtUNXn4bL8CIGT0gqrMTLvdE?= =?us-ascii?Q?POYtEwXuB9UYCBKayfZzeVo9FxfZbDx/rLrx1Ua19JVqdP+J7Qu/mHTEd9Z4?= =?us-ascii?Q?X0YSXmUWuh5RH50SPNXsr8MwJyRhtngO3Y0Ac2KDDfOxqogo2rkJyUC0TIFf?= =?us-ascii?Q?ASZfkOuJ3PFAeqYsJdj7MKEG7IxBQrK2GJPN11/EbipNHZa+WwFj2R83eGqj?= =?us-ascii?Q?ItinbrglLzZSUdKBaMkq8vfJVfh7T2RDRDu3h7R+FQpyJ6XjdR4s501CZ7KL?= =?us-ascii?Q?S8BBh+wAdUFB8B4GIk6z5m+waluiEbkM0DDYXZ0Qu4P/vPUqzfOBNlG3I3dH?= =?us-ascii?Q?kPZdZCjHtvU4ka8A2QHPvwVICx+6HLuiaP9UtFahKs9QudyUm2g/MJ5wFVtA?= =?us-ascii?Q?9hMspbdl21qbBsJ8CU2xnoB9xrZAuYbCyns0/nKWs5kLIhUywplqD3fCdBMq?= =?us-ascii?Q?y4cm0Cf98y/xp0yNQtg2?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4191ce0-9a16-40ec-be16-08dbbede5616 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:14.1608 (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 14/61] avcodec/rv40: 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/rv40.c | 69 ++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index d2f8ef9f5a..3ee405f33c 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -40,22 +40,16 @@ #include "rv40vlc2.h" #include "rv40data.h" -static VLC aic_top_vlc; -static VLC aic_mode1_vlc[AIC_MODE1_NUM], aic_mode2_vlc[AIC_MODE2_NUM]; -static VLC ptype_vlc[NUM_PTYPE_VLCS], btype_vlc[NUM_BTYPE_VLCS]; +static VLCElem aic_top_vlc[23590]; +static const VLCElem *aic_mode1_vlc[AIC_MODE1_NUM], *aic_mode2_vlc[AIC_MODE2_NUM]; +static const VLCElem *ptype_vlc[NUM_PTYPE_VLCS], *btype_vlc[NUM_BTYPE_VLCS]; -static av_cold void rv40_init_table(VLC *vlc, unsigned *offset, int nb_bits, - int nb_codes, const uint8_t (*tab)[2]) +static av_cold const VLCElem *rv40_init_table(VLCInitState *state, int nb_bits, + int nb_codes, const uint8_t (*tab)[2]) { - static VLCElem vlc_buf[11776]; - - vlc->table = &vlc_buf[*offset]; - vlc->table_allocated = 1 << nb_bits; - *offset += 1 << nb_bits; - - ff_vlc_init_from_lengths(vlc, nb_bits, nb_codes, - &tab[0][1], 2, &tab[0][0], 2, 1, - 0, VLC_INIT_USE_STATIC, NULL); + return ff_vlc_init_tables_from_lengths(state, nb_bits, nb_codes, + &tab[0][1], 2, &tab[0][0], 2, 1, + 0, 0); } /** @@ -63,18 +57,19 @@ static av_cold void rv40_init_table(VLC *vlc, unsigned *offset, int nb_bits, */ static av_cold void rv40_init_tables(void) { - int i, offset = 0; - static VLCElem aic_mode2_table[11814]; + VLCInitState state = VLC_INIT_STATE(aic_top_vlc); + int i; - rv40_init_table(&aic_top_vlc, &offset, AIC_TOP_BITS, AIC_TOP_SIZE, + rv40_init_table(&state, AIC_TOP_BITS, AIC_TOP_SIZE, rv40_aic_top_vlc_tab); for(i = 0; i < AIC_MODE1_NUM; i++){ // Every tenth VLC table is empty if((i % 10) == 9) continue; - rv40_init_table(&aic_mode1_vlc[i], &offset, AIC_MODE1_BITS, - AIC_MODE1_SIZE, aic_mode1_vlc_tabs[i]); + aic_mode1_vlc[i] = + rv40_init_table(&state, AIC_MODE1_BITS, + AIC_MODE1_SIZE, aic_mode1_vlc_tabs[i]); } - for (unsigned i = 0, offset = 0; i < AIC_MODE2_NUM; i++){ + for (unsigned i = 0; i < AIC_MODE2_NUM; i++){ uint16_t syms[AIC_MODE2_SIZE]; for (int j = 0; j < AIC_MODE2_SIZE; j++) { @@ -85,20 +80,20 @@ static av_cold void rv40_init_tables(void) else syms[j] = first | (second << 8); } - aic_mode2_vlc[i].table = &aic_mode2_table[offset]; - aic_mode2_vlc[i].table_allocated = FF_ARRAY_ELEMS(aic_mode2_table) - offset; - ff_vlc_init_from_lengths(&aic_mode2_vlc[i], AIC_MODE2_BITS, AIC_MODE2_SIZE, - aic_mode2_vlc_bits[i], 1, - syms, 2, 2, 0, VLC_INIT_STATIC_OVERLONG, NULL); - offset += aic_mode2_vlc[i].table_size; + aic_mode2_vlc[i] = + ff_vlc_init_tables_from_lengths(&state, AIC_MODE2_BITS, AIC_MODE2_SIZE, + aic_mode2_vlc_bits[i], 1, + syms, 2, 2, 0, 0); } for(i = 0; i < NUM_PTYPE_VLCS; i++){ - rv40_init_table(&ptype_vlc[i], &offset, PTYPE_VLC_BITS, PTYPE_VLC_SIZE, - ptype_vlc_tabs[i]); + ptype_vlc[i] = + rv40_init_table(&state, PTYPE_VLC_BITS, PTYPE_VLC_SIZE, + ptype_vlc_tabs[i]); } for(i = 0; i < NUM_BTYPE_VLCS; i++){ - rv40_init_table(&btype_vlc[i], &offset, BTYPE_VLC_BITS, BTYPE_VLC_SIZE, - btype_vlc_tabs[i]); + btype_vlc[i] = + rv40_init_table(&state, BTYPE_VLC_BITS, BTYPE_VLC_SIZE, + btype_vlc_tabs[i]); } } @@ -178,7 +173,7 @@ static int rv40_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int8_t for(i = 0; i < 4; i++, dst += r->intra_types_stride){ if(!i && s->first_slice_line){ - pattern = get_vlc2(gb, aic_top_vlc.table, AIC_TOP_BITS, 1); + pattern = get_vlc2(gb, aic_top_vlc, AIC_TOP_BITS, 1); dst[0] = (pattern >> 2) & 2; dst[1] = (pattern >> 1) & 2; dst[2] = pattern & 2; @@ -201,12 +196,12 @@ static int rv40_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int8_t if(pattern == rv40_aic_table_index[k]) break; if(j < 3 && k < MODE2_PATTERNS_NUM){ //pattern is found, decoding 2 coefficients - AV_WN16(ptr, get_vlc2(gb, aic_mode2_vlc[k].table, AIC_MODE2_BITS, 2)); + AV_WN16(ptr, get_vlc2(gb, aic_mode2_vlc[k], AIC_MODE2_BITS, 2)); ptr += 2; j++; }else{ if(B != -1 && C != -1) - v = get_vlc2(gb, aic_mode1_vlc[B + C*10].table, AIC_MODE1_BITS, 1); + v = get_vlc2(gb, aic_mode1_vlc[B + C*10], AIC_MODE1_BITS, 1); else{ // tricky decoding v = 0; switch(C){ @@ -270,17 +265,17 @@ static int rv40_decode_mb_info(RV34DecContext *r) if(s->pict_type == AV_PICTURE_TYPE_P){ prev_type = block_num_to_ptype_vlc_num[prev_type]; - q = get_vlc2(gb, ptype_vlc[prev_type].table, PTYPE_VLC_BITS, 1); + q = get_vlc2(gb, ptype_vlc[prev_type], PTYPE_VLC_BITS, 1); if(q < PBTYPE_ESCAPE) return q; - q = get_vlc2(gb, ptype_vlc[prev_type].table, PTYPE_VLC_BITS, 1); + q = get_vlc2(gb, ptype_vlc[prev_type], PTYPE_VLC_BITS, 1); av_log(s->avctx, AV_LOG_ERROR, "Dquant for P-frame\n"); }else{ prev_type = block_num_to_btype_vlc_num[prev_type]; - q = get_vlc2(gb, btype_vlc[prev_type].table, BTYPE_VLC_BITS, 1); + q = get_vlc2(gb, btype_vlc[prev_type], BTYPE_VLC_BITS, 1); if(q < PBTYPE_ESCAPE) return q; - q = get_vlc2(gb, btype_vlc[prev_type].table, BTYPE_VLC_BITS, 1); + q = get_vlc2(gb, btype_vlc[prev_type], BTYPE_VLC_BITS, 1); av_log(s->avctx, AV_LOG_ERROR, "Dquant for B-frame\n"); } return 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".