From patchwork Thu Jun 9 23:55:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp656650pzj; Thu, 9 Jun 2022 17:02:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhcs97/RSaxcbIw2c8dUWgzsuCs/DjsuRpzXM0HcpG27lFaP7oTlbB94P6UhpdTYS98XSd X-Received: by 2002:a05:6402:542:b0:42d:c7d6:4121 with SMTP id i2-20020a056402054200b0042dc7d64121mr47232489edx.302.1654819369257; Thu, 09 Jun 2022 17:02:49 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id di9-20020a170906730900b00710c2e87a02si5425011ejc.215.2022.06.09.17.02.48; Thu, 09 Jun 2022 17:02:49 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=okR2IHBl; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22E5B68B95D; Fri, 10 Jun 2022 02:57:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073023.outbound.protection.outlook.com [40.92.73.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B9B468B955 for ; Fri, 10 Jun 2022 02:57:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mYsKFQ6UG3HTCt0ljMDOkLvioG9+zgtz71Wn90kqAWfbQ9BMqBB/7ARFMfdiKU4Dtw7OyHl01NL+NmxsnS3CQr/Yi/CxOiTWB+2vCojYDAu1diymxtqSxEu0xsY/WGkVq+nl8NSl5mTm/MHAfhFHd8SMjx4uMevECD3EmDuiXcCXmZXj0vtQCc2IbHpjlV6JpRZxaXWl4DTEIjDBU81UxpdPZHU4QcmERaYz2L6MFjGclO1nICDIFL2m5IKihtvksiXppu+WfuiL3MDYc4spDHUc7Qs25TXgZq5/7aER8JrNr67fRPQ0AhchPKKiKqIxL8TyT7CFs1Z7S99xO7r5Xg== 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=FrWIJK7mzLoULM8tbwNdkUlsNR3P9dHtz1zNAqUznic=; b=PjbtgMdTYXDT3dGCe7ahp4YIE1uOkWqOPjjHfTLrlpm71mZnaQ87pCm+MfKDRQAYUf7ovs1YsM25Oii5rZvOE9HwLElMNTAOh67utAvIK9bjy50B/22B4X8QyT2PZVdrVedR1d51SZDIz6t4tZwkwPmj8mmPhTRQsj8a2I+cZEXariONGL0OLdGPCd37UDgbstImzcoZ5CSonmUB72Fzn2IFyoheneFz+XacW12kW+WTs78e2yX0c2mHlPLh/GPmT2cWTu+xbbnn/I2ubu9PlpAbmUQQPm0ZUcKulZRxFuBiVJDQB16udiMVMKwPjYi5AFr4gObOWTuNEeY1bLc+/g== 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=FrWIJK7mzLoULM8tbwNdkUlsNR3P9dHtz1zNAqUznic=; b=okR2IHBlw8z3XaME1UUDOGWlCo+Y020YSMbWvY0RlguF16xive1ldlMK4Kf+qUb+BHZ50r/FGQelSn4fg4ZatVtqSOCyWhtl/gkvuZtZmI5is3I+04ep6zmfHQhXuuvinPvIFNSew+AYLJgnQOL3a7PH6JkEb/vg4dxqqETkY2GJqRy7TJqJLbt2liGIhwdUoLk+aC3pqmPHsPotsU2cSYk5RhBQMzU1mr90YkTtIC8gjwq543/BDTdj0HP534/ckACL5VJDRIjxNUD60TwW3UIA7nk4iG9FkRd6H3pEQAjO5hcHomvBDlEfvJ0MY0RpHdDXon3BYRRj65IcRtMNIw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB6PR01MB3862.eurprd01.prod.exchangelabs.com (2603:10a6:6:48::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.15; Thu, 9 Jun 2022 23:57:39 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5332.013; Thu, 9 Jun 2022 23:57:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5WepWJU8Yxxo0k6ORKZQs+0XBHNzqk0x] X-ClientProxiedBy: AM5PR04CA0005.eurprd04.prod.outlook.com (2603:10a6:206:1::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220609235523.458689-40-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de959d09-3d88-4ca5-5266-08da4a73d592 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lK/K0mVwNAsvsdQ0E+jHQnnTigsWHWdPlAN5UQH2UfQVakLK6ky4F63AadDKheWZV+SPDwtet07qOHP4PoVUVu+K6Qn90TmVGG8QqixVoNMflU+QgMyjZa9eb/7CW/G9ccnd5vr8jt5oHsbrUY6KaAVhwEoolJVBvki/RmnRdqy3f8HEPFmYVoGLNl5F4FXm+18LHNeNdzz6Ko9O35URYae0iAji+UFM8ZlO6mQraV9UiKWPH8UVFhd5Nnlke5LMYR4vjF559GQBQjrQxtmBAkGleyfGYuaTDahT2xB6TXp0Aq4THLrL5idifKQWfG9L1cv8DMTJSsfatxQWSOLv4CQFnEQlD1mfqKDDR0cZ77RH05vsxlTuHYJBI7p2HCvsBvWg90gzG9wIsGyh7jLbzdysw7oi3XJbDfq7ZLbgk+mgzpg/0MrKty7sTHfz+WcalziPULrWmz4qP7sZ5SFe/JYV7TYvf4xbNHhtY4Eeu/wMzb0ZKZYnpk2/qb+fRtZuzAfOx1yzJktPN0b+3uU4tgrc9CCBjAhSK7S9iAghVntUobJTCkaVUoiSK/FUba5Xl4V/Ovrg2pMAMbG7xib1l1X+pIJzaOsrhFuswewHrteVuKZsmA3B7/0ThDRSnawR88uCi2flwllmgU0EHdYOk7klay/EvmqtRDvH/0qN/pf7NJEZjmxbg2wftHCHeXRIvl9DYgcGvIT5q3Cy278eNJyXPE8ORa90jBhM/doCBRaiY= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dkxLk8KtePbzU3JKJOEkx7PjuRcTmpL9T+ZXfaoN//I1BiRCBJYrFP0PIfRK7uBKkH9toIBhwYentkGpS3E/Dp6lZdtLy4K/pXZUkmZL3ZgIFCmzX04we9c59/idY6BUFvvSKaP+GT10WaL/JAkhh6jq4Z5ZCgviVE8TqjFEGW+p0Qduq8yksD7tf2DcRPiwny5a2d3sE/ObbH1OVjdWxpMZ+Stew1IzBeDindjM9LHzotz9CYrF0y46QmJLMBIQJ2HRDigr8wx9sxboBUS0UM0I7xbcFTypt8t915B07XPs6cqSBjm6sBeAtWZpp4Fmk3d/c0ZeU8hbf8IUysGQwJQVXiVXcqMYpcYjI5qEczNkJ9OyftN5jBlvis2eEMbpZyvO6DkxYADh+O63TD+ia4N39IyVGuu1jHRu3BexYD5LB9dx0vP/R3uhAg6IjKImSxzfYayRCIyzFqBtHOJWRwf7QbB781pAtI+2v3QKy4mHQ+Slk9QtEFfat7Ta5yA8ntRM1xOoBHJ3qW54OvOojpnaVnBgijnFzm60sueI91LAGSMcnbg+/PxAV099WE95cAhdmCdrKzS74/gw1QOMsg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1IilAOyAFBw79dUKaMBu8llg/+23CtB15/x5EBBEEm522W+TJFyOpP+T3GWfsFTZzQNPHYD18rwXeNr2NGCSwVUHKWZfCCOHOJKZAqyqJHePmm1D714gYZbM+tlCz0g5VFUzadW8T6H7nUP/0Bt4d616Sb+LeIq51zIJRcaIaG62j8II3hKg981ptmszYWZKNIB7VI6AwW0k+LStgsueCVZ0dxglBROTNnXEqv3TAhwhRcFBoOeVBqyuZJHM3hySZl0txzbZUvcNCZ4EbFu1wYhurgM9oNcK5VnB2TPHfa9JIrRn6q8taYOC4MxfwCIWaBTlW4DGgDXpeBjY7G5fbGws6WoeyuaqNa7INCj/is3JxgHjp13q0oE5NUx5yRo8SMOOHRKSdohzV6fvhhq4zP7sG/o85JrPDPGhsikjvzxZcazLBKz2LFWMNteu1b3Ljue3aTT+YOHAkIjvdSylz598oOFRWbWogWdq8DxyjAD/aefOi0Y/BLLdCd/yAzeLWgsuoGFcqX8/vUOfTQ2QSyMgVGz7cCuqaA0OPb/7hkuzPGlvlf3pVCQSinl7E+k4Nok2+EzGMeW4swkEAB7hrVhOX8AcUtXuRhFetbe3g2aZ3IJZjaSvuTkBsYFuzek0KqBdbaBaXTXzAiPdBrq2okGCJMxq4YLeKbGKd3X/JoGMYY7BTMhumJttCURDm0Lj3uGNCa/N7OsfORCyu08G7tk0pCw41J4+Ac+LDLtfymvp44HdZ0JnyPZROUDA15FO84ADz7tyCEYAr1VW7U5AhnS68QbD5I/FLADEKCfKzbO8kPeqWq+39Dyxd5CV/uYsdgEjd/djYkTKZT4JpGAP0saZtV4K0iaB9eSnudWNgZbH3g4gd3HyIrPqXaKYoup2b/j5/kSTgRJOR9rXsb40mKpi7t9Z6PStcndPxLr6Uq0u8bjk7CyCiBoRQWEAuoLWqa8hE/pkrCsVuDfNAwEdTx3whuKo1sapWW17s3LpcQR+we1bD7MzzUXy/YBrjDvHW17hblrwkvqbIA6Pm29S90e88OkcUmD+YWiziOua7EEdb+WTJUSfOHH49nPBHT+p1Im8vb1uuDA4/M/dG9MeyfQlJuLwqjlGIx6rtSFyDnjDJmW0ZsINQ4NzjVdFCPrQEF8OclvP2XWUjPSab/lSf7M/WGtKL1AxFw+6Xo/JfSaVmvBjhG0UACdn+5xFIhRf5xCyGq6nLPB8G7Ne9zPBaYLPdTmaTfA/qCYTgbppwcrwz/GpzPzrrU9lCLAjp6ykBhSN9wdGI7VIgklproT8B3vpMOjChaAC+UG8vaiXL0UIasdIObByFsBzl/9MHGqQcPalVm88B+zlh0W2RfYyK3BEQARnBg4MApGbPAFqCelIGKcbJIjXxe+k7llHl4hrE2J8+8HPp9Ck3AUaEH/thzVC4LkZL4CJtRDtDOxj4qyjoEAoisRp6IexuM5+kY80LiFi0mmqRx5hZ4HN2sfIoQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de959d09-3d88-4ca5-5266-08da4a73d592 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2022 23:57:39.3364 (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: DB6PR01MB3862 Subject: [FFmpeg-devel] [PATCH 40/41] avfilter/x86/vf_eq_init: Disable overridden functions on x64 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: T1qlYC7xPHgw x64 always has MMX, MMXEXT, SSE and SSE2 and this means that some functions for MMX, MMXEXT, SSE and 3dnow are always overridden by other functions (unless one e.g. explicitly disables SSE2). This commit therefore disables process_mmxext (overridden by process_sse2) at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libavfilter/x86/vf_eq.asm | 2 ++ libavfilter/x86/vf_eq_init.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/libavfilter/x86/vf_eq.asm b/libavfilter/x86/vf_eq.asm index a30a287029..0b55d28c6b 100644 --- a/libavfilter/x86/vf_eq.asm +++ b/libavfilter/x86/vf_eq.asm @@ -83,8 +83,10 @@ cglobal process_one_line, 5, 7, 5, src, dst, contrast, brightness, w %endmacro +%if ARCH_X86_32 INIT_MMX mmxext PROCESS_ONE_LINE 3 +%endif INIT_XMM sse2 PROCESS_ONE_LINE 4 diff --git a/libavfilter/x86/vf_eq_init.c b/libavfilter/x86/vf_eq_init.c index 113056e76b..0ca341e07d 100644 --- a/libavfilter/x86/vf_eq_init.c +++ b/libavfilter/x86/vf_eq_init.c @@ -31,6 +31,7 @@ extern void ff_process_one_line_sse2(const uint8_t *src, uint8_t *dst, short con short brightness, int w); #if HAVE_X86ASM +#if ARCH_X86_32 static void process_mmxext(EQParameters *param, uint8_t *dst, int dst_stride, const uint8_t *src, int src_stride, int w, int h) { @@ -45,6 +46,7 @@ static void process_mmxext(EQParameters *param, uint8_t *dst, int dst_stride, } emms_c(); } +#endif static void process_sse2(EQParameters *param, uint8_t *dst, int dst_stride, const uint8_t *src, int src_stride, int w, int h) @@ -65,9 +67,11 @@ av_cold void ff_eq_init_x86(EQContext *eq) { #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); +#if ARCH_X86_32 if (EXTERNAL_MMXEXT(cpu_flags)) { eq->process = process_mmxext; } +#endif if (EXTERNAL_SSE2(cpu_flags)) { eq->process = process_sse2; }