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 3C9804B6F3 for ; Tue, 11 Jun 2024 20:27:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A32068D8CE; Tue, 11 Jun 2024 23:27:02 +0300 (EEST) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2073.outbound.protection.outlook.com [40.92.50.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A18268D786 for ; Tue, 11 Jun 2024 23:26:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NapqV49+D2fJ28SD/BLeClhVPHzt+kGYwJzJ7YhWe5vOhycOdwHeJ0h7XIRCQr1Oi8iDthSF4OHcT36BGXIwuy5+oQnbDl/DOubgQnihlJpr46S//5a3S2hmK8iIrQtUQhDqWcGfKBhHXCeRSiBgiDui8UnHEkjxg8kjl51bvPV6tvvWvHo3WGz+vacA1zQKlVBuiZlufBCLpJ+C484DoC9aALUO2qAYoZfyahGSkTPS8Qm3MSJZAoi5FKhtCVwXWDEBYLdQfavNv7w4F/CIyTn4VapAt4McP7tM2Ux/ojlYAArsRamXzJkck8hid5NDAWUNjiO2+vUTyNogcXedJw== 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=49dksps+hUmuAs+QiAfNSK3xjhMyaNJkIifo1fDpNZE=; b=WYbZzwVEo6J2WMqxKyTJ8flyBqgMD/eodqsa0tSotMmA8rH6QdQMisxrluIKjWWT2NoGDPDX6x++yDcJacadiSuMJGBrQzpfzD/JOkK1BncM+rNCKQnPTDI7WkDrTDPvhzgjTXGgC803JG0UKgtuDNq2US/ouFcMbpWlACQ/8soKBoLw/4BbooMo6Wh2N3niKwtdBzV5wJpV/NjoP8VSLaWngOXMtPHYZxjUtZ54Eb7YEpSmqhGCwT+/0p067D64zUqJa5PoqEIvVRk31pBK7DlsgbZAdGF3ckgE3q49GdyTHxnojcTknK0Y1qlouvNqo5EE8AH3CY/br2BrnX0jUA== 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=49dksps+hUmuAs+QiAfNSK3xjhMyaNJkIifo1fDpNZE=; b=aXPw+u+v+do7sHT/YCTbjS7FMIPf/HoXMNip9mPVSofnXPBegg9/4KPSS6b7JI6GjN7JlsGP+WJjmC4GO6Es3nqcOT1HiDnYgmYB3swyignDdYJy47vQDb4HcVPoabHk6gmXIpOd74lkaOl7csSaxT5JafaCOBZT6oAdsvNiSltVbT09nvy/xsJkZY4A6MtC+gYQOvsNrvrnN0JrUbz3t2i3ZGKim26gPcaoyYNxDaFNtS5frYs68fyc012ilb6k6/38WtLsQ0RG6dbW970Fa+NC4F8YPz70Kp4AzYKKPBoS5eT+etfhh2KhOuOp04/IaGLP2cgQrU3sioEMdw7NMw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0028.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Tue, 11 Jun 2024 20:26:49 +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; Tue, 11 Jun 2024 20:26:49 +0000 Message-ID: Date: Tue, 11 Jun 2024 22:26:51 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240611185232.5384-1-jamrial@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240611185232.5384-1-jamrial@gmail.com> X-TMN: [rsWwI36QQKP2ho5xW5RE1UqoF7oqccBciBXmC+6D+LQ=] X-ClientProxiedBy: ZR0P278CA0166.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0028:EE_ X-MS-Office365-Filtering-Correlation-Id: bb74962b-80fc-4b6d-b584-08dc8a54d22d X-Microsoft-Antispam: BCL:0;ARA:14566002|461199020|3412199017|440099020; X-Microsoft-Antispam-Message-Info: hxyhgWuhMMqjR5PMz45Uhr505RxJEjbSLuAq9HNMOuc3dzC+B7Gu5Y6t5jZW6o8ueXg6HxSVjBHRoqCNs3XAOBoU0/E5W1aZHkjKjTMPurfOhge5Ff8y5mLrbIZiczrkYC4Yqudr+4iO6lghILFjcOlRbc1rZDGMYQtfDVGhrhEGS+UEKtGPTb2RwU1ytjRvZQj/rv01JkUH0nr3BOASJHX4+OBN+7lU8na84OgYjoOdd07gmbFiKIUrmF0aX32sOBv4dkBz52sWmkrAZ2Ls53aDTrTKA4Y8dd0X9PPSFo8uO4gTQZBtJFZbH0sB2nXYVCXoVUoQMXqPVHtbB+dsWL7nYKqJOPBeMpDpM2LkYM5myWjA4K2e8XdhqJ3mV9j0HXBo8iEoU0py8Pg5MK2XiFPWQTwW2dDZkSV0Yv+toXhBSC29+QZCXm5NAPCPEsK5+vlCVVNwFT7NQgg5JePGT4SpDeQqOLrfU+4Fsj5A028dcWSumNCo7OQ0ohRJpvwSLPk4xRlS3ybfvr9Knbkej/cbXiyumpT5EvRLkelHcsYEw1D1kBN5EPOqJM04BlZp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZU03KzlKY0Y0dU1JMzc3VkMvUUhFR1R6RVZwQnNVQVpOMnhtcDU4MjFpMHhV?= =?utf-8?B?QzVMdnNFZ2FlSnZFWTFYQlRLbHhVa1NaUFQ4NmFFVmwrVzdabHFrU0g1RklK?= =?utf-8?B?cmpHbHB6U2d3cU04MTg5T0xIcjVteEo0UUxKLzhkU3ViZUN0ajF2ejE0Ymk0?= =?utf-8?B?cXZlWk0ra0Q5ZCtpQTVJMHN2OWdveXNERjBmaVovREdEVTNubm9NUmlERUxy?= =?utf-8?B?SnZ0VmFBT1JiMy9pVExqTVpZdW44M3JINE4vRTRROXF2TmJaTTZiNVFSdXZx?= =?utf-8?B?czdhMG8wbW1qdkJ6M0dGR1VGcnVXRndpMnhVWk1sQ3E4S09oUnlzNk9HOTE0?= =?utf-8?B?WGZmalY4L3QvUjFMZHVBNk1ySUVyNFM4ZUJFM0NBMHE2Q3ZBNlRSd2JQdWVo?= =?utf-8?B?RU9IVTRUZ2dzajFlWDV0b0piaEV0Skd6c1FyMkt5bXozOFVIYlUyWTZzSjN4?= =?utf-8?B?RkJkRHpzYThnZXhHamlCajRHeU83QnpXcEMxRlVKOC9YZHBtSlZMa3VPVkhj?= =?utf-8?B?RUE5UEYrS3ZtTmhUU2RlK2gvUXN5M1p0ejRkSEtmRjFNd1dQSjJKNTY5VnpO?= =?utf-8?B?by9XOVVQbFVZRjdTaVlac1oxeWtWQlNRYm9uNmZvZGpKS3BxcldCcXBhYjcv?= =?utf-8?B?WGVKdDBvVXg4VlpDUjhsTndQWjdXYTVVNll3NGFPS2JjRzg1NlFPbjhHQXZ1?= =?utf-8?B?SzVBdHVQVUFHdEJ0K0JJTUM2aTFTTkhwYnAySGJaVUR2TTFRNEplL09QVUJJ?= =?utf-8?B?YUpmcTh3TG93bzA3L094TEZ4QzZ2Q2tWZ0F5a0s4NVlHbytTcjRtNER4TFFN?= =?utf-8?B?bTdFU0h6RDRoRHNDZjI2cFZSQk9LSm9mbUxHM2lJTC9ZTzhkbWFLaUV2SlNG?= =?utf-8?B?OERqcEFHSkNKNlZnQU5hRnY1cTltek1LOTJpMHM3blJsNzViRHd4eG9hVzNt?= =?utf-8?B?MEVxaW9aZkZPcEZoVEJtSTRDR2QvT2RCb21KRllBZzBxRXRScVJMczlUNkVp?= =?utf-8?B?TFZKYVJaSkl0SGl2WXdlSy9BaE9NOG85Z2h0dG5xanZUZ0xHSklXRDlqcTgr?= =?utf-8?B?bXVGOCtoM3RwSkp1Q05FbHlMaDBOWWVoQm9Vank1Z01RdFdxdFZVbU04dFU1?= =?utf-8?B?WGZpcGVGbG5veXJnRXV6RnpPc1V1V2NvV25Ta0NLa0ZVcnFac1BFc0gyQzU3?= =?utf-8?B?ZjNFekV3NE5UQkxHRUpuSGlOZUFJNkduUEk2K1hMR3hEckVJblloNTZaSHIx?= =?utf-8?B?S0I4NlFsNlNUa1ZkTm9NU3ZrUDVhd1J0dDBOQVhFS3R0am4yTkNRbjEyOEJz?= =?utf-8?B?cGFIbjVtYksxaFFobWV6NEpyWlN6bzQ0V3NOUVJzWElxN21MNWQ3b2JiREtJ?= =?utf-8?B?THBtK0RjMHVkYVJyTTJrYk9GUkpyQ3lSeVNYMEt0dXNXREcvcURlNEpaL1FS?= =?utf-8?B?b1dUbWY4WlV0UEs1RDhWY211bUY3NHQvVVZQZjZnazM1eWRUbjBGd3hHcUN4?= =?utf-8?B?TjJJRHRua1lNNEpOcHVjTnNYaUhBTTUvUXg5SlQ1cFZhK0RTRkh3RDB3OHl5?= =?utf-8?B?eFNNd25aMVRVTGNQYjNsVHdDcDBpYlVJaWNMNWZOUU1RektKbjRjSEpuc0JO?= =?utf-8?B?eVFualA0NGxQR29Vbi9haVV5LzczY1huZHBNaU9odlhMeUVrT1lHOEhOYXhi?= =?utf-8?B?eTE4TFZjSzJrVER2S21NZ2prMlZ2VE0wekxTWUtGeUFWRkhuY1FndDRRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb74962b-80fc-4b6d-b584-08dc8a54d22d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 20:26:48.9625 (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: DU2P250MB0028 Subject: Re: [FFmpeg-devel] [PATCH 1/3] avutil: rename av_mod_uintp2 to av_zero_extend 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: James Almer: > It's more descriptive of what it does. > > Signed-off-by: James Almer > --- > libavutil/common.h | 16 +++++++++++++++- > libavutil/version.h | 1 + > libavutil/x86/intmath.h | 6 +++--- > 3 files changed, 19 insertions(+), 4 deletions(-) > > diff --git a/libavutil/common.h b/libavutil/common.h > index 3e4c339893..acd041fb67 100644 > --- a/libavutil/common.h > +++ b/libavutil/common.h > @@ -42,6 +42,7 @@ > #include "attributes.h" > #include "error.h" > #include "macros.h" > +#include "version.h" > > #ifdef HAVE_AV_CONFIG_H > # include "config.h" > @@ -122,9 +123,11 @@ > #ifndef av_clip_uintp2 > # define av_clip_uintp2 av_clip_uintp2_c > #endif > +#if FF_API_MOD_UINTP2 > #ifndef av_mod_uintp2 > # define av_mod_uintp2 av_mod_uintp2_c > #endif > +#endif For the record: This patch on its own will disable the x86 optimization in this patch, only to be restored in #3. > #ifndef av_sat_add32 > # define av_sat_add32 av_sat_add32_c > #endif > @@ -149,6 +152,9 @@ > #ifndef av_clipd > # define av_clipd av_clipd_c > #endif > +#ifndef av_zero_extend > +# define av_zero_extend av_zero_extend_c > +#endif > #ifndef av_popcount > # define av_popcount av_popcount_c > #endif > @@ -288,11 +294,19 @@ static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p) > * @param p bit position to clip at > * @return clipped value > */ > -static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a, unsigned p) > +static av_always_inline av_const unsigned av_zero_extend_c(unsigned a, unsigned p) > { > return a & ((1U << p) - 1); > } > > +#if FF_API_MOD_UINTP2 > +attribute_deprecated > +static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a, unsigned p) > +{ > + return av_zero_extend_c(a, p); > +} > +#endif > + > /** > * Add two signed 32-bit values with saturation. > * > diff --git a/libavutil/version.h b/libavutil/version.h > index 9d08d56884..38456affb8 100644 > --- a/libavutil/version.h > +++ b/libavutil/version.h > @@ -112,6 +112,7 @@ > #define FF_API_PALETTE_HAS_CHANGED (LIBAVUTIL_VERSION_MAJOR < 60) > #define FF_API_VULKAN_CONTIGUOUS_MEMORY (LIBAVUTIL_VERSION_MAJOR < 60) > #define FF_API_H274_FILM_GRAIN_VCS (LIBAVUTIL_VERSION_MAJOR < 60) > +#define FF_API_MOD_UINTP2 (LIBAVUTIL_VERSION_MAJOR < 60) > > /** > * @} > diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h > index 8a6b5ae261..821a06ab66 100644 > --- a/libavutil/x86/intmath.h > +++ b/libavutil/x86/intmath.h > @@ -82,13 +82,13 @@ static av_always_inline av_const int ff_ctzll_x86(long long v) > #if defined(__BMI2__) > > #if AV_GCC_VERSION_AT_LEAST(5,1) > -#define av_mod_uintp2 __builtin_ia32_bzhi_si > +#define av_zero_extend __builtin_ia32_bzhi_si > #elif HAVE_INLINE_ASM > /* GCC releases before 5.1.0 have a broken bzhi builtin, so for those we > * implement it using inline assembly > */ > -#define av_mod_uintp2 av_mod_uintp2_bmi2 > -static av_always_inline av_const unsigned av_mod_uintp2_bmi2(unsigned a, unsigned p) > +#define av_zero_extend av_zero_extend_bmi2 > +static av_always_inline av_const unsigned av_zero_extend_bmi2(unsigned a, unsigned p) > { > if (av_builtin_constant_p(p)) > return a & ((1 << p) - 1); Missing APIchanges and version bump. - Andreas _______________________________________________ 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".