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 B2EC9493CE for ; Thu, 8 Aug 2024 20:19:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A0AB68D9D6; Thu, 8 Aug 2024 23:19:15 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2032.outbound.protection.outlook.com [40.92.89.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2423768D837 for ; Thu, 8 Aug 2024 23:19:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=thNGt/nSpB4Dic6dt7Gzrw5JstQLryQviQhehd/NKzpz8JjtXOKeI6EWQSVscmUruzZoNZGtSgBGJkKH7meorcKPXpGTcWZHEoRtt17zW5jVW5RDmKLFKdPl2IMDD26CyYll8JmHBI7u+0EB7keC75tJftTW5x+ytFZC82u9lqPFbJBmDpyj6uG58KUJXEXb2S7+uwYaL0nF0xCE30iooWTF4iBum+na66SExQCeuZIkfn4P+DEELAT6repFK/qFZ/FgSgfACrkeBk/AMN5NTHNtMtOhofa5MmA0hBUvSMt7kkzMzK8rh0kXJ3V0nzGd9CyJPGIP6Ba50eerFrPl3w== 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=NWp5+gxQzN0MEjjSWltVocDVIMlZfASVBjxaLvKGl3Q=; b=kZ+jKU+EC6Uim7nO/YdLD2RDDIFIWlw/mVMCP6Y3jV0MHewDVHf16xpmkG0VQvTF+jIF4dorf9rMbeGEqpY23x7HLpManfklnbNq0bFf6g/b5mH7xOAI5dN/s4Zk78T6UOaXzcZZ/aMF+mzsOAxuqKSK4pTzuXk3N79RYnXhpzBVk23ZybTNzToRQVjb9Q7Xj47cl0LSEcwUWb/HaA/dkT+OKVnwYUJuAtc2xNp9zftTFhb1M9tKE0tQ1Wx3bBJZEWuLEfG6pGCh4dsX2SDwaq15zq0z+fuU7SN7S4plGuwuQHxCgt0yj3US/0UEhrjz34G2OGzwlCuUBK/h/E8jdg== 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=NWp5+gxQzN0MEjjSWltVocDVIMlZfASVBjxaLvKGl3Q=; b=ripblWrvRzvAE+YNvS5kv/TCoYztOLecYGV7X3thjO8cwJ6K+8uVMW3NhU/b+PXN1wOWNRfTMmzHFmhY93pU8laLchtqbmEiTEaFVka5AHgYw3M3+DtKqEAPVyiFhr6kngaGKIZ/amL8A+7LwN1H5t2YFMpAnkNSYd4pkIUTTph88zZdYxPO2latTN+2HroBuF6zKrftbDeLB0qX1D6DbHH6GH86LAM0zDqUEYdA5GxTwy+3EpEddNCXr5tTqcJHXuVMQKtWOpny+lEFxhpB5LpC5HQnP16FD3I1KKYQlHs55lQbCyq+0XWClIa3JVpLkSZyVMPRwXvS+9qFb9JdDA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0528.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:48f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.13; Thu, 8 Aug 2024 20:19:06 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%3]) with mapi id 15.20.7828.023; Thu, 8 Aug 2024 20:19:06 +0000 Message-ID: Date: Thu, 8 Aug 2024 22:19:05 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240808191344.1017-1-toqsxw@outlook.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [geTp8vzpQBrKiqlCNswRcPO5A7nxL1r5nTTVeFzRlE8=] X-ClientProxiedBy: FR5P281CA0028.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f1::10) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <6a1957df-0ee9-41f1-bb37-30c554841964@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0528:EE_ X-MS-Office365-Filtering-Correlation-Id: 6cb36e2f-5645-455a-9655-08dcb7e75a95 X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|8060799006|5072599009|461199028|15080799003|3412199025|4302099013|440099028|1602099012; X-Microsoft-Antispam-Message-Info: CBE4AudFw07KstIvP/BOem79sxOhGyEQNQqBZ8WB9wMisJzRZoCbQNhR6kKtejawqDJ5wsR9mYAHw3vpnPVrxHVl4w3KW7Q8Mo9hbrCe0I/GItLUwYOO5jLI9/SM/yv4KIHfG14Ic7N4TgBBgyeyMjpaRp4JZBFfXmL16XjGND3dtRLADF/TR9tvPEdfbmkYG26dvRKWSq8Zwg8myUh/LVMmm8PU9V7Q2A09kbadWp4z2FYtz2kdYdgW3aZAc/bA23MRkoxdFfw2qUiol1CH8KXIC0pL5dSbQjajCoioB7BVfLbNcy9AZzUVMQRJjPouvJvYe7uYWukqKkzFVYyt4jp0TZXlkLynuyO5TPU10fM7Y33kER0b9ZJSe75NgnSyZkvT8S7NikRjiaa6M3MwAW51nT4QNui3vGWtPgBdF8Ly3MouSoYUFtRYtRkVCjz4gzAesed6zYjm7q4Z7eDU8XiZaspGMMQi92GF8dNwckGB4d8z5OfXrDCQovGSrX58GEUrFyAliQDRZ+JKtcUYeBfqUtmlOX+QdFsplIBrKDzeUzehakdpVGQDyQpAx2iogAVGI9s23Zt/opynv3STVNKI6ss0xKJh6CKOfGOOygwfh8gyD2iDM+p6ZSWHqssLJOmZ7UB0g77Q+0KTBBjeLM97wJE7WiubgwTVggftT68FTZzwhwel+3/g4pMH6nopNM6iy70B9ZVeUpKl8muT19OnbRuZoamYbq7Y4hHlQhQTni1e9BdPo6YWBvbO89eKKmWjEirMYPacPNAMzfegWniwatKX0uiwOmU4E1PIYwDhqu2BtUEoxRCLKXs10acJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WTZSd2xGenlaZXYwekwvTFZDTHpud0wzUVR2d0k2UXNlZzJkejJCQUh5V2Zv?= =?utf-8?B?bHZobTJtYUpFWk0zbGlaODN3YmhlYW9PeHhSMVFyOVhoOXpTR1l4dkdTYmRP?= =?utf-8?B?TzhuSVJnNVlHUVFjclE0RDNBcWMxb2pUSzBJN0V5alFyS1NuTVhOQVlBOGx4?= =?utf-8?B?Z3grVkRKcEQ2OHBXTFl2K1BtL1E1YUtLc3J3TUdtMGxQOURZQTlrZzkwZzN0?= =?utf-8?B?TW51ZFR2d05lRFJvdjJNdmtnazgyUDVjd0lMTTFxdkthSnd1QU1VTnMxN1l5?= =?utf-8?B?UnhXQk9ja3ZybUhrR1FVd0VkUmh6VlhXbEtiU3lTaUl0ZTZjTzZXMjRPOTkx?= =?utf-8?B?cVZPMEo2akV0SzRRckUrMlExbVJpOVE5b296cGN3MGc0dkxqNktpNzhGTXB2?= =?utf-8?B?RUlRam0wN1ZrTkk3d01UMWtpZklzamNtWVhqUFNGWEk1VVB5MXJOWVdKdklt?= =?utf-8?B?eVJlWUVmQjQ2eUd6Yis2bDZWOElpSWoxWTVycWdrM2hrbitTR2kzOHdtS0Y5?= =?utf-8?B?VjJFTFl2UkFFUStKLzFRUjFKc2hCZG9QN0RtRS91c0I3bnhsdXFTNXZzNTI2?= =?utf-8?B?SjgxSk5YYWNvcXNWWG1wMnUxcDlaU0VnQ2h4RkdIRnE4QTlJR0RxWFJSQ29M?= =?utf-8?B?WE1KRU1CTEE4bnhIQkJ5dEorRys0blpmd1FnRTYxMndjRzBreFlmb0lwV3dw?= =?utf-8?B?OWVmcjkyc1lySHZHWElwbFpmc1ZWTHAxT0h3dnNkRTJuaE9pRDFKcDMzME1M?= =?utf-8?B?TUljdS9TMjV4ZW0yR3MxbjRuMGoxcFR4MjhTQnkyd1FsbDRPNDFSMUFkZ05O?= =?utf-8?B?QmhmRkhWTUxDRkYwaWZ2REU3RVNrQk16MS9QaEtZVC8wazIrdFZhQzlaSHVn?= =?utf-8?B?c2pUVWs1ZzlDVDB2MjNHUFZqMlQ2aHJjWWE4anJpVWdDUndqejhaUG00WTQ3?= =?utf-8?B?cS9OeDEwenJpQ0JuY2lOK2ZlMEVPZitjWlhjYUNMWUR3R2V6WEJSdEY0bjJa?= =?utf-8?B?bitid3Fta2NSb0E1WWZ1WDBTM29WbzduNTZPOXVrR1pQYlp2WEJWUXprdjEx?= =?utf-8?B?d2VKTEU0ZmEwaXlIekUxNTk1TVFWMmFNOEk1dTNzVS9hTXpDcjFJdzJ2SG5p?= =?utf-8?B?UXhHYVE0VWJFRXA5UThZMUlhUDVJY0hialkvOWwwOVVNL0pLUHhSeVorRWUy?= =?utf-8?B?dU9ZdzdWMDlCckhHeEpUN2t1WEtRd3JSOHorQnMxdGpzL1o2NWtBU0FBSnRy?= =?utf-8?B?cjhDZkJXc2tGT0svbzBkNkdrSlkvZ2lESGtDeFlYVGgwK05jRE1ScXcvS0Yv?= =?utf-8?B?SVJJUFB6Tzgrd3Z6djZjODAwL1Y5VDc4dFE1UDZ0U2oxVEw4NGFtaGxZdjVx?= =?utf-8?B?a1lvbmNlK1M0cXJRZU14ODk0UFhBbmlHKzNSbjBza1hvc1ZKZUsvcXVsaXdR?= =?utf-8?B?cFdsQnRtTDNYY1dyclpVcWpBT2pRdGZLQW81bzEwTHF3bVRhZWVNeFlvODZX?= =?utf-8?B?OHJ1VW9FM3ppOW9DNWJhaG5DeVdsbkcxZzI5M28xdkdDZm9MQnk0WFNPRCs1?= =?utf-8?B?RDlqYkUxVVE0UTlEMkVIV1k5NXN5VEFYRUVUc0NjOUU5THJMK3NmcGRmQUVj?= =?utf-8?B?b3NQTk1BWHU0NFk5SCtTUm5sYjNWdk1VWWNtZzhMaGgrRE5RVmpyQTA3YzBX?= =?utf-8?B?NU1TSkhiTzFKdFlydzNlMElzMTNrcnJ3UVV2aHhHZFcwNEFnTUZBR2FRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6cb36e2f-5645-455a-9655-08dcb7e75a95 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 20:19:06.7247 (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: AS1P250MB0528 Subject: Re: [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 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: toqsxw@outlook.com: > From: Wu Jianhua > > See https://github.com/ffvvc/FFmpeg/issues/178 This link only sends one to a patchwork thread to read. The commit message should instead explain why this is done on its own (and may refer to the mailing list thread for a more detailed explanation). Same for the next patch. > > 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; _______________________________________________ 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".