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 2EAB64AB2A for ; Wed, 12 Jun 2024 13:51:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92C1B68D969; Wed, 12 Jun 2024 16:51:15 +0300 (EEST) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2046.outbound.protection.outlook.com [40.92.49.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45D4868D93B for ; Wed, 12 Jun 2024 16:51:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qt6LNTXeCyNrHH5fERjhkMDQJCxZYEHYzQ4nhzRDCknt7dbHFBUlq3eRS0dne500m+5h07zVnxNH+OH87IkJI0jMRYcP0zxQHIqyd5NhxiOTyIaUnURF7M+33O3Ulwz1YbZc8QFXDAZwmrRwNTBElH7F3ScLSxpWUeOPK9qqF1BRzHj967UEEkPsGu2BWMw/h2FDmcCE+1MDrWotczW1C+HYZQViHAToeZQagnVdKmi20Eo2gcks4gPS1Ukl5Bi4ADlPYHgfopPkJngD33da9Q0vBtUzoJVjPcvwwGEeZoFPOplv5HJwLDlJOFXC1V3dUts0fIqfa3LdDBBCG1UY4A== 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=70DihhO2xxlt1kbEenucGLMDHC3xOGSG3jd5oDeGeMI=; b=PRmLL+pescGn3mkcoNPROQ8fbzkrWQqFIbC+q9/lp2cw7vM4YluYGrsmhE51gSuDkNinCEWAwhH8N5bc2lKa8Q3xWVpD0Xgofs6qEJNOzmt4cVHJ4RfbBVZ+GoPMzh+1pwSqW2HCDD4QVIcA8oAdFUvNJtUgEVNqzfcDf4MXJyAK1g3mwqzInYp+z2yN9QlM6l2CNSDCO1EyX/zSBciolqnhapXImP/BmaVJcxLKVz2w5Y0Fcn7RZNtuoycx03pJxau/gnoF35sjE6Aj62N9sBW9SbaAp8GnOMzMdzrxJ8/BJD0wlOVxLrVY4G3TRQtDOLYYn5TtuCctDW45ium0EQ== 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=70DihhO2xxlt1kbEenucGLMDHC3xOGSG3jd5oDeGeMI=; b=ApeytX6+AbwY2CxKewsVEjWtZg8E0AVGjSiAauMynPl2/X3ukuwbZB8/etKmrNKx/lAJE592MN71tQENIyokLhte4Z2LlGDi3GzGPLofuqLb/7tJ/LcoL5dG13ipwBIjsse5J1RInYHwkWB3RH2v9nkwF8HS3siu56TMyIpJfZGvB4J8XxObk/QBfp6eDkLdy0YYjLNLOa9b5/jEsmeB00q//nl3Rtx2ynYR0hXYybqE8+x+SngWLmUAwcYD5snZrl1fB0l1AHyRbYfujV6QA6w2RzEf5NZ3btwwtZ7BFCxiForpb/0XBvhWQ9UuDXio8QiD8wi34TBP1XcpoXrydQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS1P250MB0479.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4a4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Wed, 12 Jun 2024 13:51:09 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:51:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:10 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [xqmUyfdTXHJU/vwXVJEPv3j+o33KbeYFM7wWbNq6IqI=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS1P250MB0479:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d8bddc8-3e63-4e44-097e-08dc8ae6b665 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: jAdextTwecj2TCOW+lcp1wmQtr0yU/RhQBh+Dj2qKOw3W/aebeufSydpcCGp3YlrPCcOGIAvxu3f4IXVSet+iQ/gJ/0qAySE6z2Z89x3MpBY/3JnpVgZy7o5i6yo9Bm4JJnzMckVuj98CdFMPFr/DVwMLzqO3l1Kf0twCaDxFd75k8nJjmQ5Xi2rKCHB8w3bwJ6Mgbwlq1yLdO85gEcUGjNJtfh/Q6KjSlOxAYcHU2ez2Atfwwavhe9nVJHrkYYUKcTrLLpTBtOrlW04npprEQWr4JbnBLmPfY5R8Hafa+Vz56Z0M+GUgmx2fHvwoOwFL+muMRWFIp/k2XDSB/ixu71lOiHnn4wG0KShFm5JZGZUQ8ZqJlCJvUyFvsMG1/HRkUhMDPgGnZ9IPUtyHWJFbnMIJj6hw2VR12IhWGfM5uK/2x/g1c2CX0sxpH3v1xV4lZVnVro8dUxOODRR10qzhr45fA2qQjQ1g2HBIVEkoW1HOK7AIiclSmQCz9ygwJQSYJgmDQXgV6Oe4bkeniUfHZLm45lJ82YusBy2lyPYbpOqOx59xDQ9flhIgEiI28FR/lvEVkTKxY+BEyOT+3OaChTHZwMdtrJRHBf7A80s6usePqJusRbohvPDXnJQevBD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?l8nAn6JNLM/a6er4Y/s9YMGefhr+ICR6hjaxQpkXUzhOy7RnYj3cvBWz2iLb?= =?us-ascii?Q?e2y38mtR7FP9yCdQ45AsHEKfm5pAjBptShy28Ubdph5x45tB5wdBNQP37lbX?= =?us-ascii?Q?9SwhtVs+GhQcODXZnb5tbdEMZ3hb3L2nvvvuvvi5+70QBoUKEFQQs56iKRSS?= =?us-ascii?Q?kmzNRfENe7mh2whHgFnrzI9c3nKN9+swVuJhTiA9x1Se0YMjK896TG4hsUzU?= =?us-ascii?Q?CSFY2Zl2CXsFWup49K2HZPwnJK2BBozyBmk/6UA7qVxhX+eIXE+S6muGCXsZ?= =?us-ascii?Q?Ca95a8tzqaRueG27nlKxmwI5SwRVTSEcdOG0MeteParoRhKOe6SvGb7/bI13?= =?us-ascii?Q?t19qF6VN5yURWICKAWYBQfMXlXHW/+PdBgyjmucTzLhSvo5M2ZDNwn40H9aA?= =?us-ascii?Q?JB3mcIZkmp2Bmb8VOu5bEOIShw+2rCpz1Ymfpyd1KgUJT7FSljBwWBsi1TB0?= =?us-ascii?Q?a0LwvGFr63k90ueqgqEpAovsIvhAuikwFBYKjAfYasU0xvog/FkmI/guMqJV?= =?us-ascii?Q?4OhQbz9jMLFu/jfb0SKFCcRZvcx54+zisMb25Y3ImS6HOjs3immis75rNDdB?= =?us-ascii?Q?6MmEvONcwq/Ifvj++T+Pq6oROFdkh1JE6Ejp5407iZH1682xFHJuUrD03I+4?= =?us-ascii?Q?WEskMnIH36/4t2qeumQ0QIhrIxcodNJ0UaaGW6B6xP4Cg+PmwY8hXk3NNqgi?= =?us-ascii?Q?0+iz4w3rANg/PUdGWV5gARrwp7wuKHzIyY4cTY99GEyqF0h6CEKDT9MnltsM?= =?us-ascii?Q?i76AzMJImH5rqbknBIZCToLOlw0ROLNDVV0mtiRgUtOYi9YnTqr9ILxAdKfA?= =?us-ascii?Q?+o32U+FBrYhh196UjcthSsRXdd71x8UOkgl0BxRSUSte57vGJ9SDM/RKRkL6?= =?us-ascii?Q?04fJPfD4Fd4P4rQJ3c3l6MXb5Y+db18Gmzb8U87cLyjruUsCZ3Kh12XzfSOF?= =?us-ascii?Q?f6EIjF7rSjSNFxn9jjzjWYBiFv8/8JBJIi09ZUANaSxpzXTjxDhLHndqUqdD?= =?us-ascii?Q?YdHtngKkDMiZ3z7zzXWbJZMzDtuflTPUqLC/yyo9YZAmBo/KCqBWEoXnoU6F?= =?us-ascii?Q?hEPDNbCqeA21EO4fyrGZc9fOmkChBJVvlgv6euyHnsE/VAHxqulDIH9W1zDJ?= =?us-ascii?Q?O61oJIDEanerU/aacew7iIZ+7iiz/J8mBIAM3DT7U35Nnq9ODGwpAGToeVH4?= =?us-ascii?Q?FP7RK6DIllnY8riauIUYGSVHL6H9EghLDZ/TVZHi5gFUiFN49p3aCxYQuOde?= =?us-ascii?Q?mY6XzQZR4O4rcGqxF5PeSz1aD5LIq2kgUGhkjzqH4Q=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d8bddc8-3e63-4e44-097e-08dc8ae6b665 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:51:08.9284 (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: AS1P250MB0479 Subject: [FFmpeg-devel] [PATCH 14/57] avcodec/mpeg4videodec: Use VLC symbol table 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: Possible now that MB_TYPE_L1 (which does not fit into an int16_t) is no longer used). Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index ebbd845129..116dc1507e 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -67,7 +67,7 @@ static VLCElem studio_chroma_dc[528]; static const uint8_t mpeg4_block_count[4] = { 0, 6, 8, 12 }; -static const int mb_type_b_map[4] = { +static const int16_t mb_type_b_map[4] = { MB_TYPE_DIRECT2 | MB_TYPE_BIDIR_MV, MB_TYPE_BIDIR_MV | MB_TYPE_16x16, MB_TYPE_BACKWARD_MV | MB_TYPE_16x16, @@ -1845,7 +1845,6 @@ static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64]) av_log(s->avctx, AV_LOG_ERROR, "illegal MB_type\n"); return AVERROR_INVALIDDATA; } - mb_type = mb_type_b_map[mb_type]; if (modb2) { cbp = 0; } else { @@ -3794,9 +3793,10 @@ static av_cold void mpeg4_init_static(void) VLC_INIT_STATIC_TABLE_FROM_LENGTHS(sprite_trajectory, SPRITE_TRAJ_VLC_BITS, 15, ff_sprite_trajectory_lens, 1, NULL, 0, 0, 0, 0); - VLC_INIT_STATIC_TABLE(mb_type_b_vlc, MB_TYPE_B_VLC_BITS, 4, - &ff_mb_type_b_tab[0][1], 2, 1, - &ff_mb_type_b_tab[0][0], 2, 1, 0); + VLC_INIT_STATIC_SPARSE_TABLE(mb_type_b_vlc, MB_TYPE_B_VLC_BITS, 4, + &ff_mb_type_b_tab[0][1], 2, 1, + &ff_mb_type_b_tab[0][0], 2, 1, + mb_type_b_map, 2, 2, 0); } static av_cold int decode_init(AVCodecContext *avctx) -- 2.40.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".