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 657C149498 for ; Sat, 10 Aug 2024 20:33:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D858068DA84; Sat, 10 Aug 2024 23:33:40 +0300 (EEST) Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazolkn19010005.outbound.protection.outlook.com [52.103.43.5]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18E0C68DA62 for ; Sat, 10 Aug 2024 23:33:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lXUqViExp4O0iAXtX9T8/VXpgxXJUhRWhh9ElRsrrRiVG5RpMjXDYuuTSxPbjdcQTO6WzEnjEDNc04K5Ch6F1ZX6qjr7R1ds9RaxGB7N/Gdnjzj/qmO//VrTKiL5LKOK7AQAkKf0fNTGbfs7qb0gMTVnft5wf8Q50WvGZ1MQPoOvmYDzAjOyJ+9BH59efk5iKKqVlJ0Pz9P3hEW8b/mawDXWfIPPJBKKhfE4uQu2H+5EtEr7jvUgolSIatUg1j4+9jallMHIXGBiuxDctE1z64jheWEMgBCXyX0vcNWfcvFOHagETvt0rZuqYh37K/jf5WbFjUqctyaaxIsbbyd+Gg== 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=xk8TMp+lkKqTEkJzZXCJkMxlrFv3ZfHbKA2mKGtsjJ8=; b=xa++hcoOknM5CTGpSL7Ec6SKrc7GKd2g3wHmo6De7fR2jBpL9BTEikreczjxUd7nZfz31mbj89mUyOErFuD6rlYxIK3i+XinhiooynsGU8v4uQ04bDtNgykQc9Qes+xV/RRMSPY+0vBhZwWFKU7KZBVWwy7or1aBFgs5KKkt+dorxruAXJvk22x7GKGpAyeyGBoqoCoqi4yqvkjFeXqrfR0DSKt9eKG1BtJfulM/l4bLXoK8bx6uyHn/3bclBcObDelEDPoDkHUe+GExpIe5yMlhH5MWUmkjU5RJE4ee7HtwVmOkP1XOQu92cFMES40ntoUTNDB0Yn9YLPq+jJM2/A== 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=xk8TMp+lkKqTEkJzZXCJkMxlrFv3ZfHbKA2mKGtsjJ8=; b=NeOtSKX3F+Fr7qakXsUwg3hGgO0sLb3Lzu4SjLBwKvFL7S5PB4gsKo6YMR/LQ61k4v/Kl5buDRp/5/XaW27A1AXF+TvRxztKCjdWT9u3JcO6/YqKg7HBAcnQAJvaJq8idTKyzeELOtyqMUCoYcOmXUZe7xD5zipy1IkC8ySdqh8wQWRnOplkvZwP2pt0506ellrdlBa79DpPr+DJpub7yv2oNwPGSftIba/LYpVZB4mMmPN8ay83/oyZ5eu9TFbsQ8VMVy23dndW3i5gKdJr9iKbWRl/bAtsKL6635rKjJq+C1xdUSEro6UoUNWwZpsv0iu2CikyAq895fpsyV/PlQ== Received: from OS3PR01MB9944.jpnprd01.prod.outlook.com (2603:1096:604:1e0::10) by TYWPR01MB10016.jpnprd01.prod.outlook.com (2603:1096:400:1e0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.17; Sat, 10 Aug 2024 20:33:24 +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.7849.015; Sat, 10 Aug 2024 20:33:24 +0000 From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2024 04:33:03 +0800 Message-ID: X-Mailer: git-send-email 2.44.0.windows.1 In-Reply-To: <20240810203304.1864-1-toqsxw@outlook.com> References: <20240810203304.1864-1-toqsxw@outlook.com> X-TMN: [PXgGZu+Zzzvke3TlddnoLVBA/+/xs58u] X-ClientProxiedBy: TYCP286CA0102.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::9) To OS3PR01MB9944.jpnprd01.prod.outlook.com (2603:1096:604:1e0::10) X-Microsoft-Original-Message-ID: <20240810203304.1864-2-toqsxw@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB9944:EE_|TYWPR01MB10016:EE_ X-MS-Office365-Filtering-Correlation-Id: 04458695-77de-437a-1b7d-08dcb97bad3d X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|15080799003|5072599009|461199028|8060799006|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: qJfzd1n1Ac8WlWoeC1MnO23MVHfcNDa3OpuZGnbtqiTECcrXXz3wNEV+FIAwZ28AY5Wjso7kxwNDQW7Ng2itQkGp3806uwoW/14NkgqMZ1IxF0f3Ms0EH81vvZEasOFPolRIX3unf1VBpgrzNcWaUaeJtnlZbx19rXpTFylwev20G5P22nWXPyzBD3QJAYilIzJuV6kGu+A+f0x1YsiNLTt2IXw69SNOxstc1yT7D/ntpOXQJ23dUlNhzWipFpu1Qmq6+KVWYlnC3DFdI+HJimxIWnUyzbl/MXif2egelrU7ON1bjk2//tZR2MIh36M5zOpP0Bd3e2vVA6d7nVbpCxwB68bT7BBVrlX9T31Fs12/z1eiU87yQs0lzZZA0GtqqhM+oSpYQMk/+3X1gO3w7QKoDZf49PulqxMdeFRvYotFHrDuSu+X+OO9UqrlNkLfZHHxMqylqJKkh8p4ccSDBRGzLb3jDBs8kRPTEtk+gG9QvZ5vxg+coe0dUQHRu6FpC9nRF7/EUvtTujFerN7padITiy0KsoHvjKhorGq0G0wa34jObBFqZ5aDEXmqSs7hH4PvvAioPUNPHqrdzovhvUjRR1NGGQWdgoVCmQUb29cr8J3PHUIAfOpC1QcXZnaXeIepepZqNbN8QxKzqWapabYzoKCcWzCJgfWTGk2qA0lsfhgziQFruzN6zLCArHqOolxG4pxeb1xRMbRIgO7ipoW5bw4rHFUarGSv7snfToQ= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OFbTLGWi0+aodyO4eRdx5MhPp1XeD0a2oepqkYZ2sFFahSMsW85hmqowl+77?= =?us-ascii?Q?s4m0l33VY7/ZFsYfcsJClYi6IawgaHGkuaukHsQWPs6vMUKh/6KompFGM1fd?= =?us-ascii?Q?KSq45BuH29J8WNsoeIFciiXBjxcDNDyN5qFjp7rSnfYuF4zmo3DQ1LRcIMQn?= =?us-ascii?Q?p2qGJfOrvzoCfBQHhyLcRpr+4w2HgRx90IpAzxxdXGx79WR8kKrgIxbX2twK?= =?us-ascii?Q?57rTxpAfSaywq/dVVsvmeQyTVjaIB8CjVZY215gFEKidg4Pexhc7khOGPfAR?= =?us-ascii?Q?5Uk//X9imB1LZbA3DwIQsy6WFY8hRvgl4Zmxmbqq+zXMz04gt93zGlQn6v/m?= =?us-ascii?Q?jg1oXMdJdKd9q52y5xER/Oy0mTJE7D9lCOxohIEWiuDuthynCTyfXKA9bcPY?= =?us-ascii?Q?OkyXiCBrTTevwHalvd1QpuDphmw746THXF/QZe7fePa9PhMq11kRqUnhtC72?= =?us-ascii?Q?V1DrkozO+yIr5ZLmrzafWnwSpd2wjLCzIaPX2rZ2ucPy5CDf9cIx4/rF5P83?= =?us-ascii?Q?0DJ2V8u5gu4dPcdAROdc/neIjHoAi/QZpr9HDi6ZpaCKLNfMet0j+s0/rxQM?= =?us-ascii?Q?EuFtX9DPEO3IY27z1wBW27XVbWrVt7t1zSPZY27n0jv8+FDnyHjJWsOpLIpc?= =?us-ascii?Q?lOWBmIrjw7B/GRmQujvjTQ1XYKfi3ssFAEEl7Ew3HmugVSVXIBNp/kZNJb9v?= =?us-ascii?Q?VRUNvm0M4M0zcOmAg+IMcT4pE/rHCYNfIz/oGVVv8wIF9IvejThpezwDv+LS?= =?us-ascii?Q?8k1/7zoB9u48jJ4NJCrYAFxsoqVGPessfTRH0L8v0ANWDXk2BlDkQxNVbPxR?= =?us-ascii?Q?PTyPX+0TN6yiDsGncnfwhf2cnxtWIyLrllIRF4ybAtjqCbcH2r0IsQ9kxhsZ?= =?us-ascii?Q?OaRvJrPx/QgjrjYAva9h2NtilUBkWIUuzZ7No1kRcfupKkCBtvS64K4GFyMN?= =?us-ascii?Q?0epHOh7NciApXk6K9RLWHUyzoxyPVr3wSBHLacQxelQZh01zSvwD9Z1dDPHZ?= =?us-ascii?Q?rRz8bBX+0x5Q/6c2IHQ/iYC6aFjNrqp358remJQDUgHf+8eOOKzYW4fIpaPk?= =?us-ascii?Q?IxA4463ytuL5o0ZsS0QH7zA7zrFfg4XgUKdlxxi/iF4R5ZlYe7j4FWQ/B1nq?= =?us-ascii?Q?3hI0kpWbk07WIqE3QlrziF3BAGiw8ExShQknDypxH49hTgS41M31JrfJMyGO?= =?us-ascii?Q?Yau1o6g37YzPkkhZogD0TM6BcpvR7XXkv6rAVoTz415C0mKoPvptA3bA0H0?= =?us-ascii?Q?=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04458695-77de-437a-1b7d-08dcb97bad3d X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB9944.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2024 20:33:22.0586 (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: TYWPR01MB10016 Subject: [FFmpeg-devel] [PATCH v3 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 The vvc_refill2 is the same as the refill2 in cabac_functions. Remove it to reduce duplicated codes. 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".