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 E7CBB43963 for ; Wed, 2 Nov 2022 00:26:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4887D68BD92; Wed, 2 Nov 2022 02:26:44 +0200 (EET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064070.outbound.protection.outlook.com [40.92.64.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2668368BD7F for ; Wed, 2 Nov 2022 02:26:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hp+rFmTLAvVuzQD4PyhV32ocUh6FyIhAQ7frSnpBitYTE5ibUN3gpqDXj50F3/xVLmygNjo8vBDPbqmRZFtaS35IhYMapLrKgy4RmaoWUe8Zby12w35Q43s+TH898oqvhEPS/PaZROM6Um1OK4E8j8XWYmVRlwEjSYvohMzKbdsoTX9XLPRzbPM2vxaxSgdUwiQ7vgTTJYj6F04uO6+qCeBvL0te0jbuSvsfyet9LYzkrWhMDrxWGp2WY0mBrB8IlF4qfRrrrvL12wT+OaAiIKCRYMpjU/J9EJAmnlQg6NvBH4jkcV+KrOTu1k97Y2dxnUNaO/ZMROSBk1SnNYMAAA== 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=wMw/BkSuI+Oz58Xs9a5JGZMmqoAVqoxcUo3YSxeK3Mg=; b=fj5PmcMEVcHH0xLXPyI0Z8p8iFtx+fbgyaIgsbXUm8dv5toKlWoIR72VLyLSoSFYpOCU3PuzrBO4LqmTV4J8D9vQwSC2qR9nnzyuNpF2zROPfLZCvWk2CYI4yBQoCNKCFxmNB1Uocw1PFW9cqB233y+DcTWYj6iv/09aKIFCESkwjOE+2NeuUPDaN/kDpiy1LPyt0jJVycVzpVmJvh6GiA9hdxCibTwIfYdgu8iGMSenUsOO74RGmwwY3ogPVwzBz5PhQF/50EBqDo8q0JWVbZwC5/YECiug49OZw+eXsZiQwpI0YS97fdpAHks7uhYIfabBedqyVyaVMo9/FBhzBw== 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=wMw/BkSuI+Oz58Xs9a5JGZMmqoAVqoxcUo3YSxeK3Mg=; b=jCRVQ0MdvgjPzqcxMmi/E/ylgW2lTT/Q1aZMtnGHms0qe+jPtrHxqNxCGeArFXuODif73dHKaKTJ03HnYBK+QK3/EjI7yAgLDQdy7GXf8IrghlMWmNdpcQUb9VTmWGXW6YJNyrXuXks0LkBUIuOUbthgBkAmZM3LwxvOQ1iOOHB4cqQa1wZsiClU1FDvEsWcm1Kmah7dcYZcBli4KuZ+Tn1ATc/vDP3jHP2NlnQ4oy/CxDVRmtIhgMthYGURUq7Ti8KB6K5jbxfvh9ViatXc7yW+CqPnZBI5E0vslMWBgZnLbB2cOcFJYabcD9HxTGXUEbS7NBNBqmiFntVhtLnfQQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0890.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3e9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Wed, 2 Nov 2022 00:26:36 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c%5]) with mapi id 15.20.5769.019; Wed, 2 Nov 2022 00:26:36 +0000 Message-ID: Date: Wed, 2 Nov 2022 01:26:48 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [BI1c0ZzRHMsTgYtnRW3Cka4A97pP4cVcuThpRc7ksnI=] X-ClientProxiedBy: FR3P281CA0134.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::18) 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_|DU0P250MB0890:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d104584-60a3-46e7-98de-08dabc68e6d8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c7AkX9kmuYgFdUKgPSHlHG5oIWunHki6BoC66B20s/JawZI+oeDkpbdJh+b6KBEMPwNh4sdbDSf0FgyY/FU9Ra//m5I+TgNnOfrdduHvZ8ankrSKTHmd0rDA5D7DgnFpH0demREDvszB99u+N+x8VERc72Yy+A11dAWUbBiNbvMziiDwfv3FWHdljVuZpHb2k8EtS2+wnTRo6JA2p+v1NUkWMFsSR4mZErZ/B4QPc5HTk17TOhVQ3y5ADTszKwsDPmgzrSEAOrSiZsEcIRePHJjN/9P9Ob5rP8GtbbvMcgSWhwF9ee8ZjSzCE50l1skaXnlppHILGMh309Lh37985VwTQtQYDHMfUYbYtfKgazao2f9rsbz+GXJLbAZKKDd0zmiKMtNKmIQ+WqPQUErXoykk1nNeOgRyEq+9FhJN2id3ZdheYm+h1BNNp3EHhYFEAuEj6/PHX4xrLjY9R0+hGgUBi56H4WuuuWfC1BhtcvaZQlkSwg60Bp78TH5kwBz0jUZhXmEm8b+E7qgcXhv9yHMlIwb3N1RNQYREzN5vDGEdDJI6lpUtCSKc7umSPwz94gV1W7Mh8ypIM2h5EwvAWjhqdBY4pdXiTFYPe9z7Z7yLgioIPskWwb68km7wml0GBHVfzET13IBg/Msa2mzM3NSLitKwZMHB8+KqHErzkse074O1CIjVi3aKtxrzq4GI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eDV3dDRCQTBNeUp4dm5BMFBxSHdWNkNFN0Z3VEJYbkttV1NCT3NqSWsvbWpD?= =?utf-8?B?M1A0VDN6RU5xY2lNYm1RYlpBVktrTlBXOFBPSHRPYnI0RlVLRmd3VDkzVW12?= =?utf-8?B?Y3U0azh2MS9VLzF5b2N2aDh4SzF3cmVPdmpkNnhOV1VRaTVud1k1dm1STWRH?= =?utf-8?B?VzRoM2hRTHp3NzhWZVArYjZmbUt1dWw0dmt6UGF0VSs4bUxLa3JOQm9aNUJM?= =?utf-8?B?a3VOSjlZZzZzRU4zaERmT3Z5RW9NcldvMkdsQjRVdjZnRXpIdHl6Y080SnRo?= =?utf-8?B?UDc2QlAzRG4wVnJWSVVoNzhmZ3F4QnNEYXdBNWFZRnpWR1Vnc2c2alBqanJP?= =?utf-8?B?ZWFkOXRrSWdDZllCTHh1cmNXcUpYVEhLTzlCZUZ1MGZ1bmcwYjhuVmpubHdS?= =?utf-8?B?aEVoUTBHc0JDVHRqd1dzSEhMWnNjcWltS3pEZmJWRXlUWG5qV3pRSXpTS3M2?= =?utf-8?B?VFp6ejNhTUhWUWduWjBZTzY0b2lWczdMZWl1dUdPeGF4aDdodVFHb0phZzJO?= =?utf-8?B?YXJmRUdOWHRpeUNnQWlFS2h4czVkeXh4elF1NTJRNmRkLzdWZ1hMblRTODJ3?= =?utf-8?B?VFc0MEk0MHk2bTI0OHhobmZ3Y0I0cG1TYk5aSjlIc2dtR0piZmJoRFBCN01t?= =?utf-8?B?a3ExaFZPdC9tQ1hRS241SnM5R3JrMlI4R2RBQUIzblE3eFR0dzB2cy9zNEhw?= =?utf-8?B?T01BUFpDb29obzlGWENQOHV0T0p1OHk1SldWSHdrbW12aHJneWFScEZqb09Z?= =?utf-8?B?SWVoNTh6OFZwQ0dWRUxaWkdoK1RzZDRBUEpjNmJ0SjNNdk5KVVhhUHRCQURH?= =?utf-8?B?RUE0dDNVOG9SL0ZoK0MvQ0Z6VUFoSkVGcXlBMldJaS9UOEFqaFBKQzBnVXN4?= =?utf-8?B?MnNEcERCVlBWZjBJdW1FTTM4dHl6TFozOXhGbUlrdHpTelVzL2ZzNllRNkoz?= =?utf-8?B?bnQwa3FFV3M4ZWlHVVNOTGxFekthMFJCZTNCdmVWWi8yR3hlSURDMzhvQy9K?= =?utf-8?B?VStkQ0o4b2JVc1E3OXQxZ2tyWjZhQkQzcllLeVlHMk10cnJETkIyeTdjUGRP?= =?utf-8?B?VEhOQUhjRW85ODZMWDNUbW5ENm5TV0VWMEdLWmxOdnRkTnR5L3RTUENGQldL?= =?utf-8?B?ZzB3eTh2NnBjN3lUMHBYdVRqOHlZcmQ3WkJrMkI5UmxPY01IbTRPZW9HamFv?= =?utf-8?B?SjRvOGZ1WVNYVmYybjhhM043b0k5Z2E1NGlZZzM0L013UlJ5OEFrQ1YwSktj?= =?utf-8?B?RDlJSkNVRyt6aWxtek1RMnV6UXR0cmJaalphNU9xdW1aelRJSkJpRTZkU0h4?= =?utf-8?B?Z1p4MWVlc251ZXdwMHcwa0thK0p4aTB0SkdnQ3RIS1hRdkRaZ1JRSHpKVEUz?= =?utf-8?B?YjFxdmZpN1RFZXBsek4vNnJpaXh2bUgvMVVVSWF0bytRa0NXbmFsNnBWUHBa?= =?utf-8?B?U01pOCtNUCtpbm1ZTzduT0poKzBrT1dVekhLZ1FpTXdjOTRMNU96TEhtSHN6?= =?utf-8?B?RXhiWG9ZU3N1VmZrTWxrUi9rWE8rSjliVk1rdmlUWmg4dGE3S1NrNXM5Uis5?= =?utf-8?B?WDRFdnUwdTZvTmlKanRjY2x4V0diU0FaK0Ird2kvTWdMWnBaMVVMNXcyVHU3?= =?utf-8?B?S1Q4Ly9CV3BJdVkvUGlUS01VSVNMdy8wTFZZTi81bTd1UXVraG1VbitSSXRr?= =?utf-8?B?dFA2eStuenhhYVFGRHppbGRJaXB6cXFOSGs5NFBZSTZ4QjBGTzFUaXVseEs1?= =?utf-8?Q?XCBziidxu99H3Q9DG35f4bpfgGGVh9pOBtlyFV0?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d104584-60a3-46e7-98de-08dabc68e6d8 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2022 00:26:36.3952 (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: DU0P250MB0890 Subject: Re: [FFmpeg-devel] [PATCH 4/4] all: Guard if (EXTERNAL*) checks with #if HAVE_X86ASM 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: L. E. Segovia: > Continuation of 40e6575aa3eed64cd32bf28c00ae57edc5acb25a > > Signed-off-by: L. E. Segovia > --- > libavcodec/x86/aacencdsp_init.c | 2 ++ > libavcodec/x86/aacpsdsp_init.c | 2 ++ > libavcodec/x86/ac3dsp_init.c | 4 ++++ > libavcodec/x86/audiodsp_init.c | 2 ++ > libavcodec/x86/bswapdsp_init.c | 2 ++ > libavcodec/x86/cavsdsp.c | 2 ++ > libavcodec/x86/celt_pvq_init.c | 2 ++ > libavcodec/x86/cfhddsp_init.c | 2 ++ > libavcodec/x86/cfhdencdsp_init.c | 2 ++ > libavcodec/x86/dcadsp_init.c | 2 ++ > libavcodec/x86/dct_init.c | 2 ++ > libavcodec/x86/dnxhdenc_init.c | 2 ++ > libavcodec/x86/exrdsp_init.c | 2 ++ > libavcodec/x86/fft_init.c | 2 ++ > libavcodec/x86/g722dsp_init.c | 2 ++ > libavcodec/x86/h263dsp_init.c | 2 ++ > libavcodec/x86/h264_intrapred_init.c | 2 ++ > libavcodec/x86/h264chroma_init.c | 2 ++ > libavcodec/x86/hevcdsp_init.c | 2 ++ > libavcodec/x86/hpeldsp_init.c | 2 ++ > libavcodec/x86/hpeldsp_vp3_init.c | 2 ++ > libavcodec/x86/huffyuvdsp_init.c | 2 ++ > libavcodec/x86/huffyuvencdsp_init.c | 2 ++ > libavcodec/x86/idctdsp_init.c | 2 ++ > libavcodec/x86/jpeg2000dsp_init.c | 2 ++ > libavcodec/x86/lossless_videodsp_init.c | 2 ++ > libavcodec/x86/lossless_videoencdsp_init.c | 2 ++ > libavcodec/x86/mdct15_init.c | 2 ++ > libavcodec/x86/me_cmp_init.c | 2 ++ > libavcodec/x86/mlpdsp_init.c | 2 ++ > libavcodec/x86/mpegvideoencdsp_init.c | 2 ++ > libavcodec/x86/opusdsp_init.c | 2 ++ > libavcodec/x86/pixblockdsp_init.c | 2 ++ > libavcodec/x86/pngdsp_init.c | 2 ++ > libavcodec/x86/proresdsp_init.c | 2 ++ > libavcodec/x86/rv34dsp_init.c | 2 ++ > libavcodec/x86/sbcdsp_init.c | 2 ++ > libavcodec/x86/sbrdsp_init.c | 2 ++ > libavcodec/x86/svq1enc_init.c | 2 ++ > libavcodec/x86/utvideodsp_init.c | 2 ++ > libavcodec/x86/v210enc_init.c | 2 ++ > libavcodec/x86/vorbisdsp_init.c | 2 ++ > libavcodec/x86/vp3dsp_init.c | 2 ++ > libavcodec/x86/vp6dsp_init.c | 2 ++ > libavfilter/x86/af_afir_init.c | 2 ++ > libavfilter/x86/af_anlmdn_init.c | 2 ++ > libavfilter/x86/af_volume_init.c | 2 ++ > libavfilter/x86/avf_showcqt_init.c | 2 ++ > libavfilter/x86/colorspacedsp_init.c | 2 ++ > libavfilter/x86/vf_atadenoise_init.c | 2 ++ > libavfilter/x86/vf_blend_init.c | 2 ++ > libavfilter/x86/vf_bwdif_init.c | 2 ++ > libavfilter/x86/vf_convolution_init.c | 2 ++ > libavfilter/x86/vf_framerate_init.c | 2 ++ > libavfilter/x86/vf_fspp_init.c | 2 ++ > libavfilter/x86/vf_gblur_init.c | 2 ++ > libavfilter/x86/vf_hflip_init.c | 2 ++ > libavfilter/x86/vf_limiter_init.c | 2 ++ > libavfilter/x86/vf_maskedclamp_init.c | 2 ++ > libavfilter/x86/vf_maskedmerge_init.c | 2 ++ > libavfilter/x86/vf_overlay_init.c | 2 ++ > libavfilter/x86/vf_pp7_init.c | 2 ++ > libavfilter/x86/vf_psnr_init.c | 2 ++ > libavfilter/x86/vf_removegrain_init.c | 2 ++ > libavfilter/x86/vf_ssim_init.c | 2 ++ > libavfilter/x86/vf_stereo3d_init.c | 2 ++ > libavfilter/x86/vf_threshold_init.c | 2 ++ > libavfilter/x86/vf_tinterlace_init.c | 2 ++ > libavfilter/x86/vf_transpose_init.c | 2 ++ > libavfilter/x86/vf_v360_init.c | 2 ++ > libavfilter/x86/vf_w3fdif_init.c | 2 ++ > libavfilter/x86/vf_yadif_init.c | 2 ++ > libavutil/x86/fixed_dsp_init.c | 2 ++ > libavutil/x86/float_dsp_init.c | 2 ++ > libavutil/x86/imgutils_init.c | 2 ++ > libavutil/x86/lls_init.c | 2 ++ > libavutil/x86/pixelutils_init.c | 2 ++ > libswresample/x86/audio_convert_init.c | 2 ++ > libswresample/x86/resample_init.c | 6 ++++++ > libswscale/x86/rgb2rgb.c | 2 ++ > libswscale/x86/swscale.c | 2 ++ > 81 files changed, 168 insertions(+) > > diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c > index 09c48c341e..d8f4e45849 100644 > --- a/libavcodec/x86/hpeldsp_init.c > +++ b/libavcodec/x86/hpeldsp_init.c > @@ -224,6 +224,7 @@ av_cold void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags) > { > int cpu_flags = av_get_cpu_flags(); > > +#if HAVE_X86ASM > if (INLINE_MMX(cpu_flags)) > hpeldsp_init_mmx(c, flags); Here you are including an INLINE-check inside your #if HAVE_X86ASM. > > @@ -235,6 +236,7 @@ av_cold void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags) > > if (EXTERNAL_SSSE3(cpu_flags)) > hpeldsp_init_ssse3(c, flags); > +#endif > > if (CONFIG_VP3_DECODER) > ff_hpeldsp_vp3_init_x86(c, cpu_flags, flags); > diff --git a/libavcodec/x86/me_cmp_init.c b/libavcodec/x86/me_cmp_init.c > index bc1051c27e..527fdff4a9 100644 > --- a/libavcodec/x86/me_cmp_init.c > +++ b/libavcodec/x86/me_cmp_init.c > @@ -242,6 +242,7 @@ av_cold void ff_me_cmp_init_x86(MECmpContext *c, AVCodecContext *avctx) > > #endif /* HAVE_INLINE_ASM */ > > +#if HAVE_X86ASM > if (EXTERNAL_MMX(cpu_flags)) { > c->sse[1] = ff_sse8_mmx; > #if HAVE_X86ASM You can remove this. > @@ -307,4 +308,5 @@ av_cold void ff_me_cmp_init_x86(MECmpContext *c, AVCodecContext *avctx) > c->hadamard8_diff[1] = ff_hadamard8_diff_ssse3; > #endif > } > +#endif /* HAVE_X86ASM */ > } > diff --git a/libavcodec/x86/mlpdsp_init.c b/libavcodec/x86/mlpdsp_init.c > index 333a685f47..f7eca8cb76 100644 > --- a/libavcodec/x86/mlpdsp_init.c > +++ b/libavcodec/x86/mlpdsp_init.c > @@ -200,10 +200,12 @@ av_cold void ff_mlpdsp_init_x86(MLPDSPContext *c) > if (INLINE_MMX(cpu_flags)) > c->mlp_filter_channel = mlp_filter_channel_x86; > #endif > +#if HAVE_X86ASM You can combine this with the ARCH_X86_64 check. > #if ARCH_X86_64 > if (EXTERNAL_SSE4(cpu_flags)) > c->mlp_rematrix_channel = ff_mlp_rematrix_channel_sse4; > if (EXTERNAL_AVX2_FAST(cpu_flags) && cpu_flags & AV_CPU_FLAG_BMI2) > c->mlp_rematrix_channel = ff_mlp_rematrix_channel_avx2_bmi2; > #endif > +#endif /* HAVE_X86ASM */ > } > diff --git a/libavfilter/x86/vf_convolution_init.c b/libavfilter/x86/vf_convolution_init.c > index b78a47d02b..fc9cd49de7 100644 > --- a/libavfilter/x86/vf_convolution_init.c > +++ b/libavfilter/x86/vf_convolution_init.c > @@ -31,6 +31,7 @@ void ff_filter_3x3_sse4(uint8_t *dst, int width, > > av_cold void ff_convolution_init_x86(ConvolutionContext *s) > { > +#if HAVE_X86ASM > #if ARCH_X86_64 You can combine the two checks. > int i; > int cpu_flags = av_get_cpu_flags(); > @@ -43,4 +44,5 @@ av_cold void ff_convolution_init_x86(ConvolutionContext *s) > } > } > #endif > +#endif /* HAVE_X86ASM */ > } _______________________________________________ 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".