From patchwork Tue Sep 26 22:16:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43923 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp2208094pzh; Tue, 26 Sep 2023 15:17:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH0Ms47tKCjDhrVEomvgWNBVWeCfpcTUms4F4M5RthGbqkMsPGsBibRlOb24CO92FfVrm1I X-Received: by 2002:adf:f405:0:b0:31f:f99c:6009 with SMTP id g5-20020adff405000000b0031ff99c6009mr21333wro.22.1695766621297; Tue, 26 Sep 2023 15:17:01 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qk8-20020a170906d9c800b0099cd6660994si13462332ejb.116.2023.09.26.15.17.01; Tue, 26 Sep 2023 15:17:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=YTeymnd8; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2AB368CA71; Wed, 27 Sep 2023 01:16:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2085.outbound.protection.outlook.com [40.92.73.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B252568CA79 for ; Wed, 27 Sep 2023 01:16:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OnkMVVUN+LZbLpO2aV/fTkega6sNo0INKVBmM+8bOa5zJxL7vhceYZe/a+d5AfTF3a2VMz3qTeQCResuBlA0d6VeLKgBzQMKh3iBtaLU1kd7NbeTnzKkbGg3MuaZKRJ1atzYkGt8PPwphi6hJu5kA7SgLGAbWtqd1yxCTliNSdXIMBNkiaM9oaNdjFOrWfnfgwbNVcx5k54O7X7P18pp0Z47Gthin48CQ2a2vJW+xzb5uepZ6NiHBRILZYzSYrp0pEYYynpclnpIvb7OClpFnuKcrkSSK7g7JmDDFqiWN08ygekgNUM0Ln/pkPEKiKJ8PzTUE0HLcDcKwPybuKSGkQ== 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=LxyiMmGWUVg/4YUsuu0KduhMI23e9kOhMBFBaiTqDHE=; b=cal9HEOYF51MomzTw1EUJd+7QmDxYaICjlWuWA6FXEaR4+s+YGo1JCH3m+HhTXj9zNsKdWbMaLZEk0xp7bA72I04+gUHNBS7g2+nx507/07k+t+U3wQReqx2pvH4cfV5+8Cfpq2aDln13Tw61Q5+23A1F/6lBHgXCX9kZqX95Mb34gvq0uoVzjDOPxheujCCB7R8EgBb4tIrJyZhSOE6/zNl8u8PYyVilOmAzkihfQwIS+zH8f03IadYILAGkNqNB0W/wCK7Vf/6OTj4B25S3RjW19xK0A9iw4weIvccu30uMSQZgWNScY4QKSh8t527opyMMeHjLjNja13WXILV9A== 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=LxyiMmGWUVg/4YUsuu0KduhMI23e9kOhMBFBaiTqDHE=; b=YTeymnd8yw3jM3FVSvHVh1CvfNFxE6WhvCPAg8rYrU5t7bMTVuV7U488e6JWva/SPNq8sZn0g1Ko52KE5rJFd6zrzDtkWlR/0rOOGyLKmnctsZFqSQiowMz5k6cgVjLXKYy/XzcXlRdLOdhzj7DY7uMH2TshSfjsWtNBXDfE2G72Y3uS8Z0tmUG1QQ3hPZQTzD1iZHxTcrvUh+rwftZf7a3KiCKoT6CltlsxqEJXk7ufTMF4IQB9hDDjHB6JBKnbebFidpiG9aP4ybqChB4gdbrhMrKg+HPMKlT+lriMNuXekid+HoiIZUEAOOIVNNj8QsOJkVGW4dW5kW2z19dNAA== 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:16:36 +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:16:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:16:36 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [2+RjaVtz9uZaWePM2zXxeUigV3KGLmTd] 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-4-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: 7bb991c7-af82-4959-8eef-08dbbede3fa9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rJv5533e3VulS0j3r2OpGYyyRWM2k3VnD8pdkkmilUWQ93WAsW1goKHauqCfmfO+r6nEEKL0GpcdcUHVndFvpyxp1IYoGRg5+EQU/ni+24Xb4IuQHB9QUv2EeQmc6Xco486cu/ILi5DpcKr3t+xgDUhBOpFvYPBfrSCygW+gPftebsPojzxKuIkXxAQ6Nj0GIqu9Ubisp23tHTcxafE27xejKTcDJLTUXx95erpM11FHM+T96Cz/5KRmW3uXUfnTSNGy/CxLD2yXE72klkfFEOHh/MPulmwFdsyvFIBqskEq0jyyXxuxR2egGkZqauH16leJ8XAahGNIB+Lz+x1XvrvyK8V/T3D66djGnDgbbybVkUud6WOuTNHZc+VuY2w4dMdYOX0CvmbiA+OkHrDfCprbB776ElUX6YGKHqVMGyP5oBEUEJXOP82rbsRsS8Fc1sCnIRc0kZXIKREPUuid0m/Mwe1PUae2AgNk5QiaPF5mbSyqLtmya9Bw3hltYJFqO7zXIVfg8TQ7JqMz0CUQEuuHXOulG+JRdd2nj1/zkC9nXQVsCrtmgAf9KaolHcqBPUvm1PVuT1bf3rDqQggRKjx6UGZp1bzP35VZDWRNfYwR2nx1d802iRvp19wPmF3k X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pxivUsruwTZtqDQV8CLfsjflI+EBAJjmxI2xJ8wHulPJIxJwA5MMSqbE//qc7lVVuXzDkNRU/JQIXXPUs8/R7WxBqkEGgUMM+LNyjd+5B1gfYK24QBNAfNaB4rxEUI4IuWXyZtYk5mtJWseBALxEMIYPQPZ0Eg9y6+z43Iwv60SEDTAxKgvFt9tavwN2eGuIEsUStbr1RMHpKdotcw1XLcWfJLhvhJJY+yFCr4eU7kCgsesClwWxMqaQ8U17Q+NGWjOdegE+5zYKj+/GnM28V1zZw4uE265dWu+rUG2vXNrJwRG2RPuAoiHimyXo/kUAkD6bEuKokzv5Iu5JVw8He0R3MDP/KygM9qWKnwVNIqqPoaP8mqOP0ZcetwK9umuoeX7V4CxaWymeQvGRDFpMgvQLL7ycNGkIHZDmi/nGtxXS1lkNqBZ7RTrPCfJBnvTfKDMIF6XG5FBQYfmJalTkD6gPqNA913vnvUBuBPvlhynRC0Xg0R8gM7enmuzWZMmcm8DVkxVxfJUpcYyswCIOuW7KaIpFr3PT9uSI2Tw8I+pS7aS6G16X9f+ppitj+OYt97RVsuhW3dekETGMjCYxvpYJ5RRGiOQP8SeqgQJWKV6+OB4A7P5/W361dqTiUz4KPsMTyffFTvMFTfCJeXx1IC4zIPBhEtCDUU2QJmG0YgchbFiDtdbjaQ1xEwkmD0eG6c9eCE8LdgCfdNhmdUUuv70kf4Bf0DUoR9a4Q1+XNgYcrA2uxj/XpdbTj1JZd72hzuuYEUTuDz9lCy9j7mfjmgkwUaL6MUT7EpgwL5shfTAGSRG+RiY4XxMJmDOSz0OfmrcUw80+cirID7HbkbUhzgRm50IojPmovyl+IL3AanC6wMYXeUCHsCa1OZdwFp+XBle/IIHWKnW4fb5FtesHDytRUPYlOF2FvOWmLRm9mLBQ1sQ8sPcXKz1O/OnP8x2RZf84x+00cH7iRekNX9Tjzs2NCfssgxCwEjFpXkKOfFPzgge9O6Hs2eAdlooYjBRG+H8tuOB9IIMJK9EOzqeP6qv6C3cVn/yX7KE/Ksw5gDst+kqexY5vLqw/rQfvZ/Zsh8fGApOH+vzFzHyZt88Ce3UUDPjXDgPpvueXvjHheVUzvrxDjSflUf6ot12C5woXb1f2YwKL39DgrAtBL5zHj2BxYVsXNEz1DZkFWmpjjtfuq3Nk0BhcOQMGxe4sDHT6cnBWj4lv0izi13E8T0H2wyqyXXsz4iiHWJgivJKesoZaM3s+CVBWx2qUsgq85+oi X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7bb991c7-af82-4959-8eef-08dbbede3fa9 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:16:36.5637 (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 05/61] avcodec/h264_cavlc: Avoid indirection for coefficient table VLCs 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mjdzg3X62dqL Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_cavlc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index dc22955626..f17e30e853 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -246,7 +246,8 @@ static int8_t cavlc_level_tab[7][1<= LUMA_DC_BLOCK_INDEX){ total_coeff= pred_non_zero_count(h, sl, (n - LUMA_DC_BLOCK_INDEX)*16); - coeff_token = get_vlc2(gb, coeff_token_vlc[coeff_token_table_index[total_coeff]], + coeff_token = get_vlc2(gb, coeff_token_vlc[total_coeff], COEFF_TOKEN_VLC_BITS, 2); total_coeff= coeff_token>>2; }else{ total_coeff= pred_non_zero_count(h, sl, n); - coeff_token = get_vlc2(gb, coeff_token_vlc[coeff_token_table_index[total_coeff]], + coeff_token = get_vlc2(gb, coeff_token_vlc[total_coeff], COEFF_TOKEN_VLC_BITS, 2); total_coeff= coeff_token>>2; }