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 A67D44C8E9 for ; Thu, 8 Aug 2024 19:14:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA33668DA01; Thu, 8 Aug 2024 22:14:17 +0300 (EEST) Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazolkn19011031.outbound.protection.outlook.com [52.103.43.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9849668D98A for ; Thu, 8 Aug 2024 22:14:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RgZxLMC5DOZxRWUdpT4l8mrqK8J2eGTAqM58vjI99ooPFdQ7wib5T9+HYo9GVXqVS3MLyxTtHaR6qB/ebaK2VZQqyVqIGqUo4djmGSJcr2eqMDLg/1nvgAmNkRB0M2+h+XA5z4PYOqkLLB7OVswFGMkZC1GT6NbhTqD6nBHPxeMpc9chcN5OVwvr/rw6vjm5nYV2HtJRvRJMZ+NafFYFpdYy586ejcdq/hClpxm4iBKCO4QgL10y7ZgOOEt3ZMppvB8AmrknT7c06ZUzvPI7EYkiHCH4oAnZvxwLGGMeBEb4WzsZyYF3VG+BksnP3K1pb2IfACAEW5GwAfUeXXsW4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=hbujibG5oyW6KmGmDOq3CV46FrT/iTlW07rSA+fhDjI=; b=DsThvZmhkmWCyOKiJ7nlfnfD2F9DLOXVWcy0bHMY5/BO/1MnQJrQokzIEMEB+gTyG1I/Qa7ih8IZYku3dOtSdWWUCp3CV3Ljn4nkVFJzCvM7K7R/dR7Q9J+0aIre+4YS0bhQJMxzqUeXPtHchQX+3ADdzvLzulTtjw0SGLxITvkSBPQyi6SgoKhFg/2BchD+f6J6IRuT/eHkqUq31kELqAtcfzGXVZby1qW7fcWJKYF5d5c3DRljm8HbhU2vJSC3L4DpPgVpWHaOsa1NjkcXzJIa2/QNI65iBZU49h3rOHz8XFlce2qdv+pkdq9GFYaXixmRuhCODc9YFsV6irDncQ== 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=hbujibG5oyW6KmGmDOq3CV46FrT/iTlW07rSA+fhDjI=; b=EtJjFPVc3L3/p0ehEC1ujz+MeJrIRIzg4Pj1s0IxNk7IPhbDhFY/YS1i4yGZbyGi6zVPNugQ1R7fX9rVPPmyI/tnXRkY4lliKKhxqPT05EdkU/BC/2jvWhFbZDeDl+fANTFCp3Ij323KsfJet0IJjUqlN6l2dvcrJUquhADY4oRmkZvsWNx58T5FBwPN9KRj0UHNurjVfuqub3JNivIeNh0/pJM0Ewjtyjle/S5O9AFuNyGBos86eSH4LwrgDBa7s1ix0gPG7PK6yLGVqY4ZgFWQbfkWEewmm4hwkczEABCgLyk3/Gmy4FfxzAYnwD/y9yNI78farsgYWphw3M0U8g== Received: from OS3PR01MB9944.jpnprd01.prod.outlook.com (2603:1096:604:1e0::10) by TYYPR01MB12466.jpnprd01.prod.outlook.com (2603:1096:405:f8::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.26; Thu, 8 Aug 2024 19:14:02 +0000 Received: from OS3PR01MB9944.jpnprd01.prod.outlook.com ([fe80::7b06:78cc:adb3:903c]) by OS3PR01MB9944.jpnprd01.prod.outlook.com ([fe80::7b06:78cc:adb3:903c%6]) with mapi id 15.20.7828.023; Thu, 8 Aug 2024 19:14:02 +0000 From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Aug 2024 03:13:42 +0800 Message-ID: X-Mailer: git-send-email 2.44.0.windows.1 In-Reply-To: <20240808191344.1017-1-toqsxw@outlook.com> References: <20240808191344.1017-1-toqsxw@outlook.com> X-TMN: [A1q1pLUyHsAb1v4UX6TUTmEFxsoHdhn1] X-ClientProxiedBy: TY2PR0101CA0018.apcprd01.prod.exchangelabs.com (2603:1096:404:92::30) To OS3PR01MB9944.jpnprd01.prod.outlook.com (2603:1096:604:1e0::10) X-Microsoft-Original-Message-ID: <20240808191344.1017-2-toqsxw@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB9944:EE_|TYYPR01MB12466:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e2d7418-f6df-4ddf-698c-08dcb7de433c X-Microsoft-Antispam: BCL:0; ARA:14566002|15080799003|461199028|8060799006|5072599009|19110799003|3412199025|4302099013|440099028|1602099012|1710799026; X-Microsoft-Antispam-Message-Info: pdD2NfSMy27eiH8KtTpBfYng3qSKG740yDh+a1B3fNaOH3H+/OtOHjBsFLWe9YboepVXP8Czcx31ORrpekZAtkOj8wgIhZiwuBg1voXN0nVYwzAaqwHFyq3/XQ85UWagKQfRQth1LPtonQdZdoA4CQpdaZIPi6aYnncQwJNYLmqLr1NIBXDQvy8HQ879ulBGbosF2a0VDRjXXXZXQUc+hVQwr206f8feoA6kU5Y9QzMPZjHgKLzUjOw5ZY3tg9S0oFygfvsXuMbE9uJaLbklMrfCKeXMOeoRsarwM+XWMVLGUW8gS/nsunQdxU1vcVYT+E3BHzvLDC0Og5qRxJiV/7QDxxfV+imKADrEw4ZsPrOjY7DUt3hudvSRoh4uKiBGYC81DEBbVgnHfVV/tmjLdiYfKvrpc6I85keclj6Of0uMX1dsxEtIbv4VlyFEf2vu9gbgScZGpFWESAXnKc+/wpWxykmvlGw+CJ9V0GV/vOZUkEToVD4N7/7XljiLbCyPywFcUS52vKNkZWn3DGHV6oEC3jYutIgP8TzBthW3msQ1K5yWmy3w6rixnYL58IVEaAm/mIEX1cknGO90FNN5KtNN7PcUIxRGalbfj/Vh/SQA8c5putbMfuP3T6LLGCrTQ2LPBc0fKe6R9pNNOdp3tPxhMAlFP8Ll/o7PxI+M/7TYSGF04KJgI4qTvFlhXTFK1eP8MGi36Lh6ZHGPujWp4evJUmU2pvisUlF4qcOaGUWdX0Kj6cBMmNSVKA2OcY7Abjh3Mtw9ybCTpjCNhSluOZlgg1Sv6cFPOM1OdxcOUtMekpgoouuZX+WSSMyH2+xrLKkSTU7TE0BHnSofdnKVOA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KM/6ey4SyQcXoHxZ22/+2XbtO2smvWvSPp1gU2GDtGC3iFqtzlhr66r6vKto?= =?us-ascii?Q?EglzbiSnuqUKwcfFQum/fNI0T4JXpgQEMLaFOyZyusNh3qQ/zGEsv6spyP4G?= =?us-ascii?Q?Qhidm410RWUAO10tZ1PmpWnEoyik73Ue+VzcJPl64MvvRtlxmUzHW/euT6pF?= =?us-ascii?Q?C4WmqtS8/1A+ABM3kyGT/vwMOdN+Pzqq3pBMSwuJG2yp3eBjSttpFF9VqSHb?= =?us-ascii?Q?BRuqCQM1GrFk4gAbSXSqPOpLz4+R0kjEcN1qaltGujK+Sx2QWZeATws8ZJoJ?= =?us-ascii?Q?0blA+7ZHbbKvj5NYUkv1z1V4Dc6nPxqvqChNp+D+u0l7+mekEdfL7aZk1pe0?= =?us-ascii?Q?McHXlkdw46udgyqayvDUcvdyd3wMyt8Y8tL6xWQqr7lhg8g+lfqxPIwSsml1?= =?us-ascii?Q?bYtTxI9s9h3P2dVVG3edfbJzdqDjc3frdVKpKncZu20vIFkZBzcWhyWlup00?= =?us-ascii?Q?xlbQjU2CY85EZrvm8AGcNnz8ZJp/oOA6R30uI8HLIhjUqM0ZaJQ065LAzNqK?= =?us-ascii?Q?ic3LwpbzdvE4sPE6JW9ZxPNYH11gNwj1usehB7QF2d+vcd+HyLI8aI6atfpN?= =?us-ascii?Q?bM13bbKja7+doTDUV1n7gnJTH5RwyqEBC5ZXRCm+gIoJAlX99/2/YQ+08T+I?= =?us-ascii?Q?GayVLCL5PITt0cBim0VnpFJPKWg6LuRxSi6mmEmL5KS3aCYmsEZelg1SC06r?= =?us-ascii?Q?mhy4OS5FeeyaxzfEgaIWRirNXEMxY/jnQrBC8SxaIrJtqKsgmYdlsgYU62M4?= =?us-ascii?Q?V5mCRk8wTSsbRvFaJSiT+8O229BMIRzfKAojzOdw49qAXbrRvoVKivZvHzMK?= =?us-ascii?Q?mxGSoEbNVxQJXLU8/lMSUR59SSb7D812MyN73sWuZUxTcXd67z2xbeulvZtY?= =?us-ascii?Q?uBZip5O/vX455IOEZ4ry3ofMAC9OWdyWw/DdSlyWnTjWW0LtajQ9Nuuk6nN1?= =?us-ascii?Q?Atrz9+DwJJKAFu/z4VQEXDcA6BFHAZjMTNa9tUqwTdfxgeDHMxpkxCm4kcUM?= =?us-ascii?Q?B9fjtughpm99yuuc685hSb41lSGWLHp1UCQIjznRWe7OQ08y0Xddel8grdbS?= =?us-ascii?Q?b3hvdPI7MTwR6i5Yj/zoIQahJJBIQMahV4bcRhmpy0WJjOog9ODZREKCri2k?= =?us-ascii?Q?bFJ3H65sOxj4jVSSk66VaWSGg46VAdCp6voMpL64eul9SYfEZIPWbDxAmRuu?= =?us-ascii?Q?v72lmhHu+9DKV3ZxAMGiY4G/cdm/B1X7zyWev1ZdIfKggVX2QSUGllgDTyY?= =?us-ascii?Q?=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e2d7418-f6df-4ddf-698c-08dcb7de433c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB9944.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 19:14:02.0713 (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: TYYPR01MB12466 Subject: [FFmpeg-devel] [PATCH v2 2/3] avcodec/vvc/cabac: remove vvc_refill2 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: Wu Jianhua 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: From: Wu Jianhua See https://github.com/ffvvc/FFmpeg/issues/178 Signed-off-by: Wu Jianhua --- libavcodec/cabac_functions.h | 2 +- libavcodec/vvc/cabac.c | 28 +--------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h index c3f08d3410..9bee401f2c 100644 --- a/libavcodec/cabac_functions.h +++ b/libavcodec/cabac_functions.h @@ -85,7 +85,7 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ } #endif -#ifndef get_cabac_inline +#if !defined(get_cabac_inline) || !defined(refill2) static void refill2(CABACContext *c){ int i; unsigned x; diff --git a/libavcodec/vvc/cabac.c b/libavcodec/vvc/cabac.c index 0d45eec751..c9b6f9bf3e 100644 --- a/libavcodec/vvc/cabac.c +++ b/libavcodec/vvc/cabac.c @@ -856,32 +856,6 @@ int ff_vvc_cabac_init(VVCLocalContext *lc, return ret; } -//fixme -static void vvc_refill2(CABACContext* c) { - int i; - unsigned x; -#if !HAVE_FAST_CLZ - x = c->low ^ (c->low - 1); - i = 7 - ff_h264_norm_shift[x >> (CABAC_BITS - 1)]; -#else - i = ff_ctz(c->low) - CABAC_BITS; -#endif - - x = -CABAC_MASK; - -#if CABAC_BITS == 16 - x += (c->bytestream[0] << 9) + (c->bytestream[1] << 1); -#else - x += c->bytestream[0] << 1; -#endif - - c->low += x << i; -#if !UNCHECKED_BITSTREAM_READER - if (c->bytestream < c->bytestream_end) -#endif - c->bytestream += CABAC_BITS / 8; -} - static int inline vvc_get_cabac(CABACContext *c, VVCCabacState* base, const int ctx) { VVCCabacState *s = base + ctx; @@ -904,7 +878,7 @@ static int inline vvc_get_cabac(CABACContext *c, VVCCabacState* base, const int c->low <<= lps_mask; if (!(c->low & CABAC_MASK)) - vvc_refill2(c); + refill2(c); s->state[0] = s->state[0] - (s->state[0] >> s->shift[0]) + (1023 * bit >> s->shift[0]); s->state[1] = s->state[1] - (s->state[1] >> s->shift[1]) + (16383 * bit >> s->shift[1]); return bit; -- 2.44.0.windows.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".