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 DDBA64B723 for ; Wed, 12 Jun 2024 13:51:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CCA6B68D920; Wed, 12 Jun 2024 16:50:38 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2084.outbound.protection.outlook.com [40.92.59.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 42B9568D92D for ; Wed, 12 Jun 2024 16:50:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kxp1DXSy/Dsp+nwMePyFX24BsWKb6xh+l/ChebvbjkwBStQAL3LIrvNxXoqR1pgg+qTavmPqI+MS6S9zW/K9ZWzvS2HRXE8fGgobUxG86R7qkN45llP8ytgAc2WO9FCAehiylEDlIexAJYlwnWqw2azKwIYVhtnNYuvfVoIBrAkR1ZczE3JcPE6Y53CwI1iSccp5Bm+xCHoKxofMs6LsQHHCdyINnjmhrGuT3SRYc6Ix5EpV+7Na0nxTkAK0QLmxRAzFU4xNVWMloMhBk3IiCeRMpR8kdjWAPYGr7nQG9T7hIDb+0YgDOs8zO+KDddmG/3gGsZFZZJyADOVuDCMZIA== 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=5uZy3+86j9BVg21B+1Q182p0ZnA0vPsayZFDYMce6bQ=; b=dVUhB6qIvTprsSKjUfDplVHjcBW00TP7t47cwjkHpoNOEUmNhQ37LbUPuSYZ1o4uxtbz3vds8rZFuof14wOAC6Z3Muapdom+7IHpNqJlUlMzmsdMO5ftcselIvgnM/jiqbrfmVG8xccZk0IJCSzKa6L2nF+f5nQBCBy5sbCYoQA+raHbKDAFofsTyq2qwRQiLFQuY2loAcbN0c5jg3xcbUMNaT3TQENAZ6ZTjRGJOBddlCzbj0CUPIcb+AComsxe3TJjPIlNGZ1H3zgXe33AEzMemXJT1+HcC66p2+9A55S5onzK/9iVfnmg1sMVYBNAeVRb/HjAeR7pWUMgXMyytQ== 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=5uZy3+86j9BVg21B+1Q182p0ZnA0vPsayZFDYMce6bQ=; b=f/LhdksbZqsIwTzelXrP2tiZDLjtVfjGyZcmG2ItrRFVFbGI8D5tAR3j1YAT6+MLvgzBUL8Q7C6OUSeBFJ/vhm78vV82WSMWoAGYlEXWBFETcQuJgfbMVhAR7B1f+Iyk6mMRli2iexl4VcVqBbWcR5q/Q6KhHz8POLsU1tmAQRCIOHv+ZzB8NZdPnTbLiRotHv2Ix0G+L/2ZVY1IOpB3oOuzwHXQrzMDE7IpVvCstRDdPcEy0tt3NzXrOlbwDv7rQnBJd3DQ44sF80gqdqLHIjlFbROOhQ1xxVCrmgaxOkEzPwO62aOx50P2kIRCAWbA1LB3EFU8z/DNvdXWsGkeQQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0054.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:50:30 +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:50:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:05 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [RUB+FROgkULYW8WV6iWQYyOcgSa3MBcgIm4UsVkl390=] 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-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0054:EE_ X-MS-Office365-Filtering-Correlation-Id: 85acae93-7028-448f-bfee-08dc8ae69f8b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: YTEGSW4ue8m8W/REvVcOhIVsFCmtUlaw1gj7e4+7CoF34O6UXxql8jpALQHF2BpeXhXig4WaUavpTYA9NgCckyDW6AeEGN+a+4GiUC9gY6+LUMqU0D8Vr/0WcCd1NarhE7ASWNPoGaCV3jKCK+6cv/wtDZacWYTvOxy1DiVPnEfI9DzfYDZfBiHmohw5g+C5hNdkO///X2x6Iv3/4t2aksr/ByhNPtIW7x1jpaHUFjuiWnbtwqTdp6dSF3id9la0IAkYIp9DxSAA8CcXVexddRxy4DPMjJLlilQSV/4UTSVZLcRHMqO0atZoZTF3Q/yPx1zKq/U/0cFlNQzBR3CKG0BK00YJSxntSkfctmFZGaQAVZVse5+JBb/YOETgpkynASAjqXl2+iehgZxFyJHF4QHkIACb75TgENw3Wgajwcyzaxpt62pY86FB2iWfu3ouomjaLTz5rCqGpl4qG/na/Oh9MNeHSgYCCS9gzuqsHBDf1Av5J8+osRRjx46wxsCj098XNoYEdmqlWPxQiw3UAGyMWXyPhpDblBqZDPigMUMJJW6C5/X/9yWxErw9oEitmTeY9o4RjAAjexOW42mS3k+59nGB8msJ/8HkOjDJo/qExENg8W6f383XMSaDCbIo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gSjDJy5Gmc8mvif2M5tcShiMhabkaV0jzYjVSpzcNruxOjP6BWgA3sJhDLZp?= =?us-ascii?Q?Mk/5G3zCVaqaOFQ28dfUyzYl7JAuYH0QVBkJs9voGFcladl7gehIiKvqV7HI?= =?us-ascii?Q?sBSI8bgESfvTuXWRkke/b41B6nZSPuODg4PJR6p3GS76RoKe9PZcU4iRXnbV?= =?us-ascii?Q?deBfn+PX0mLrJVn8T2ilDGrCpdfvR3Q4KaCFFRDt4ndlpLGfBxQ2wDv50OyR?= =?us-ascii?Q?3aKGjMVfGIl1zv92h/BAJ2CZiTxXKMTvnUChbSN+fJq/djkgvG/2aP8yDrf2?= =?us-ascii?Q?3rSlbwQoRP/PWwzNU8vgO4BCnUdr0Sf53ym0QmlrPiZ43GO22G7kMh/dlrlB?= =?us-ascii?Q?AC3UWsvhQq2PZm8GaTbaVu9RP8pR6/z5+6/GSLPbeI60RxKmaFgtyAoq/6UY?= =?us-ascii?Q?keQiVHKX4eTqt6zMHgzlaYVi1aa0QCPEdbKhyRxD83n0z8EMM46xUp7psOld?= =?us-ascii?Q?UvZdoOGXeXQDbEaOcq0/HBTfRkfuZ7kCiquoBxS+/GXlPlW7tuHW075jsW6o?= =?us-ascii?Q?Wqr2BUQlqBbVj5jauIxOVm3cqtjNHN1lTrvbZKPp9bSngI2FQG0dF52C4g9l?= =?us-ascii?Q?FucmAnJRqw3PgCGybJ6Ol7ngbSUr2clxktmOKnf1aPFPIGUKyhgZRqyS/uaZ?= =?us-ascii?Q?ID2v06+Aa7UC8Na2bNYdh1bF3WzbDgVcPq/ILUvnRYzIKLZEUpvdIXwpZOAS?= =?us-ascii?Q?4qI+d/t7Rucasxg2CxEo5wtNrlZXwNAJgV/X32YnYB1UvyDCiMhQ7igeN64T?= =?us-ascii?Q?tc/PNMwM7f6abAkcX5XcQLQCjHBldgMHJpgXiprNlZVH8dm9Nv1Ne2HWRQ/c?= =?us-ascii?Q?Nth3624kXdcBmYgOE87Jg9JmLkE1WVYm8p2c9L5JCOhb/RhSbK74aD9DwZBU?= =?us-ascii?Q?b/owCzkojRGdQPZH1Xb3tS8DVxJmMyO/0GuuOi92olC9aYVKv+h0pbQdbmSR?= =?us-ascii?Q?kg3w7IbEIDEiGST6p9nBsy5QTAHRz86i3QZp/x10XXdOhA18n1c1aOv2r0Dp?= =?us-ascii?Q?9d/4H1IGj20hwRS9dfZVRPosR1g4TzATiOHoVUqncSzjq2kmewLwnOPbB8xW?= =?us-ascii?Q?ZCsblRmRxdFbIGT3/KYFHZJcFBpjSI/dyFzBLXVNZDmphWz2V9kyBynP1C1d?= =?us-ascii?Q?ln5s5u6H3fDGX2adAJdiYikhFVCFtgF7L/OvuQPMRJfGFyABL7yfRHbDw6tc?= =?us-ascii?Q?N9Q15eoTyBhHyvu2EWDCT4jj52qrRndXhMvKOdFm9EFm6B/Sn0gzKtpuDI5W?= =?us-ascii?Q?Jhw3LfCbD5Tq7nz/yLRfKkF6v4/liKfM8XKFIc7Hvw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85acae93-7028-448f-bfee-08dc8ae69f8b 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:50:30.5813 (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: AS8P250MB0054 Subject: [FFmpeg-devel] [PATCH 09/57] avcodec/h261dec: 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: This is possible now that MB_TYPE_CBP and MB_TYPE_QUANT fit into an int16_t; only MB_TYPE_H261_FIL needs to be remapped to MB_TYPE_CODEC_SPECIFIC. Signed-off-by: Andreas Rheinhardt --- libavcodec/h261.h | 5 +++-- libavcodec/h261data.c | 2 +- libavcodec/h261dec.c | 9 ++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/h261.h b/libavcodec/h261.h index 67c362be93..11a8a8685a 100644 --- a/libavcodec/h261.h +++ b/libavcodec/h261.h @@ -28,6 +28,7 @@ #ifndef AVCODEC_H261_H #define AVCODEC_H261_H +#include "mpegutils.h" #include "mpegvideo.h" #include "rl.h" @@ -38,13 +39,13 @@ typedef struct H261Context { int mtype; } H261Context; -#define MB_TYPE_H261_FIL 0x800000 +#define MB_TYPE_H261_FIL MB_TYPE_CODEC_SPECIFIC extern const uint8_t ff_h261_mba_code[35]; extern const uint8_t ff_h261_mba_bits[35]; extern const uint8_t ff_h261_mtype_code[10]; extern const uint8_t ff_h261_mtype_bits[10]; -extern const int ff_h261_mtype_map[10]; +extern const uint16_t ff_h261_mtype_map[10]; extern const uint8_t ff_h261_mv_tab[17][2]; extern const uint8_t ff_h261_cbp_tab[63][2]; extern RLTable ff_h261_rl_tcoeff; diff --git a/libavcodec/h261data.c b/libavcodec/h261data.c index a9891edd0a..bccd9e5f56 100644 --- a/libavcodec/h261data.c +++ b/libavcodec/h261data.c @@ -72,7 +72,7 @@ const uint8_t ff_h261_mtype_bits[10] = { 2, 6 }; -const int ff_h261_mtype_map[10] = { +const uint16_t ff_h261_mtype_map[10] = { MB_TYPE_INTRA4x4, MB_TYPE_INTRA4x4 | MB_TYPE_QUANT, MB_TYPE_CBP, diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 392f1aef1d..05279b9ec5 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -67,9 +67,10 @@ static av_cold void h261_decode_init_static(void) VLC_INIT_STATIC_TABLE(h261_mba_vlc, H261_MBA_VLC_BITS, 35, ff_h261_mba_bits, 1, 1, ff_h261_mba_code, 1, 1, 0); - VLC_INIT_STATIC_TABLE(h261_mtype_vlc, H261_MTYPE_VLC_BITS, 10, - ff_h261_mtype_bits, 1, 1, - ff_h261_mtype_code, 1, 1, 0); + VLC_INIT_STATIC_SPARSE_TABLE(h261_mtype_vlc, H261_MTYPE_VLC_BITS, 10, + ff_h261_mtype_bits, 1, 1, + ff_h261_mtype_code, 1, 1, + ff_h261_mtype_map, 2, 2, 0); VLC_INIT_STATIC_TABLE(h261_mv_vlc, H261_MV_VLC_BITS, 17, &ff_h261_mv_tab[0][1], 2, 1, &ff_h261_mv_tab[0][0], 2, 1, 0); @@ -418,8 +419,6 @@ static int h261_decode_mb(H261DecContext *h) com->mtype); return SLICE_ERROR; } - av_assert0(com->mtype < FF_ARRAY_ELEMS(ff_h261_mtype_map)); - com->mtype = ff_h261_mtype_map[com->mtype]; // Read mquant if (IS_QUANT(com->mtype)) -- 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".