From patchwork Thu Jun 9 23:55:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36157 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bb42:0:0:0:0:0 with SMTP id b2csp888917ybk; Thu, 9 Jun 2022 16:58:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkOaHTR4C1yLPcC5FZ5xfZtrInplcSXPOh3M8rwg7SVQwPkPafVPfErZwGI5jtNE/vay+8 X-Received: by 2002:a17:906:6985:b0:6fe:988b:d248 with SMTP id i5-20020a170906698500b006fe988bd248mr38566252ejr.226.1654819133905; Thu, 09 Jun 2022 16:58:53 -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 sg44-20020a170907a42c00b007120074c1d4si4985665ejc.747.2022.06.09.16.58.53; Thu, 09 Jun 2022 16:58:53 -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="E0rgML/8"; 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 7BACA68B88F; Fri, 10 Jun 2022 02:56:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074058.outbound.protection.outlook.com [40.92.74.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B020368B7AD for ; Fri, 10 Jun 2022 02:56:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z5RAP05VMvWZN0KPMb41xVRqvMPvr617mdIAAe/Fy7iNrs4YAZXbPUyCrwv66SQqfTIJlOque4Ab9kMC6fKzxpzjJWS0hXG8x2pmyyiBSdQoWD4G2icQBfB8oGhjLsOAkrjEvT7qgWs7BWVX2Bp8i28LxRBjAAXC84XK9c7h9y85MCwCKwZk2uqhZQ5K3gH0kaFCUWk47twaH4qXYw3Yx58AQntSBLPk7XHoPO00sHyIxrH2s75nC1BDOpbj6WeMv4AiUqEndolvQ9T+D3MMdE9baI1jVT/zqJMG25gZ8Zy/1sZtZgkFkebXymfdaSh2ul6sIzYORZomIxuoXLWLzA== 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=pbTGxb/RPNgubUIAZVqiJL78uBpp7gsr3XHcvoVn0Lg=; b=IQYZ0XtNK630UAMPOjADN6Hle3In+7XnYmFIkKSpX67SNB2aKwUptF/iWDDrVODGYJZR0yTTA06iq8pZpdx03H9dolCLMfKaPDKesfUXUXW56P8Hq/AF/4ntDIoLn2hwN7w90rDE41nxtCjuOoa36kebTEZGhDCT+G+XgX0ur+6IUAnIN9qbHQzY7crD7DlbYEn+zepdFyZXHgtdi5Lpmqn1TJcJUGZtooc0NnEfcohZT+Blp1w/Nju4Rrhb4p0lDWjsEOX8/UU7LuZL/dfs7uUvlVRIQtAslrWR6cauWbiTMEE/cFtw/zd+8Lwqy+/PetH+eYOt6p6fdXy6AQAtRA== 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=pbTGxb/RPNgubUIAZVqiJL78uBpp7gsr3XHcvoVn0Lg=; b=E0rgML/8HMEy3TzhyTQPE6pDZE20Dy9+Wq5r05/3EAaBOHe4T4PkZIVo1qhGQidmjvCBTMZ71/28LeVlYitka/gK1o93z8pJbl9h7YYMCHTrdBuvgPNeAhylQvs879TEzJFL+0u6lZAUWkCJi5s42Mc2jCbh3ic4BjTjDkqBw3+/v4h8IR4rRxrmhakRLsys92lhgiRAlibV5wTO3HThbMABc54J8wyhFvnmd4sk28u9ILkXJXfza2Te1AdnHyp9K8Jt8gagaQJFHXET2dFG7Vr8z48Vh2BsmKydzBVnZd5jkl1s6CoCxJa51vNoYIjJci+pFkMHjVw4hL8CK9SW1A== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB5809.eurprd01.prod.exchangelabs.com (2603:10a6:208:16f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.12; Thu, 9 Jun 2022 23:56:32 +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:56:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:01 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [y1egpJ7sOT+EE6OAZv6JTjoWraCnbh2Q] 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-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 391cd6ce-29b6-41d3-f4ec-08da4a73adc8 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKry91Qzc+7yrqqC4Hgj5YvMM96q35HTFzQcKwIZn77ThFeMtcOunjVco8CqsfS2Ydk2auu/YGIUWglr4DmnDS55LPdfau4eEaJkoSWBLrSaRWlz8R/+JWzkeAGDqsk/cDPZrgthmlYFEy01q9vRbbWHafeJfUVBq43chUd2BtM5anH1aphjnzPUY3rQHURKg1Yl2kQ93zMjohBO7vQIageyVfOV9v/rK7tU7rnNSZSeJBidNWVZgNgTwJX6wcuPsrnMM/pCsnIoHyHT0cEbRQ+8ZUOLuSO+1WZGcv7Nfn+ZLzMZqoF6NlUdVmqh+YjLt4mEsfmMtduu4ka9+dHPOYg6Q4la6ywmv7h1gnr42Da4hH76OxWTpWwxAAE5zRF9O9WNwdArLu5vJiM+OOPgd/SHJeukHItvJrB5zj6y/A/6gPX+gao9PjQQNtV4i8HvPKDvDpDPGAiqUa7QqfQG9Gv6hhzR7ai6kpNPdPZVT9uej6yvb9+QE2+SO7FLTdMQvza6BC7jWzqGmyiotnlBy5kyRDfEDbwdEjKmrFHZyMblqC1NzPfrI4hNfQQ8HUslFneTUk9/1axP2UkPmfmHScHmByE0Jr0kWq3V0TRAqUKFAh5ul+20oGzvCxx1SRoGhDfaTM45+qJvWqA90xOGqPQ61aIFlTBFWNRr1CeJStUBXvlx9OloCxikHP15boFc/4z4ZDqlHE8FfFDPHAaHhy2lVZ1wUOeOYQhSrecL69FpQ= X-MS-TrafficTypeDiagnostic: AM0PR01MB5809:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BPxpv3pue2Dey3Ix4uSTyQWsT8WKGo2euqXfS06w6bT9PH+IugmaUIerW7gbSWb8vdnfQKFPHnscE0kp8VsgnxrNct0WoBhrZHe6Dx8J3in3aYwRggo4wXKm1HrIvDk2vbNpzts6cTsupmCmsxMxY1JsAeIE7xclAhPW/KhI8GUVTPa8LtNuFVJQSl68HmtybbJuXchx/AobEy/c9GbP/QPsy1trsPUqc53J05p6lzMTUTgTDgClDXK4BDc8VTWHeEBNNbuR05WVoXnXKTziO9E38dzhSviCLz6de8I34jurBsmK9dz4bbQwwq5cwfUneE6r2lJRAFQDGC60JE9G7UnEWnrSHnvlN/vOzET3m1fWqQudRSf4v0YcVlY5AAx2rbeJdp1wcxzzoRq+Zu2rXDMk5X6oymxeKQy3MiIiHTyzUnGtKrAyA5WKnLKdvevc4gJqVCQ4RelkVChJwWDSZwro0NNrIPD/RgqCPrVqA1k9LB+8tNCmeXPB1zD6iFldKFG2JWDLTOWP7oYo5dh4z9Bgk53RySOFb7anC/MCGM9QfPmshHilB5NdNwgvdn4KwxF02CaiE/LRFW6EqOEi/A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 783E90EXHxex8FogpFJT/+5gAjaOvSIPOnUXlmTJP+IbJXpyD6qxY+ftWWsaMrMpdf5IYVwDl/jC5JH5lQQisJnbBm12nmsNtddQSMtalJZ9WnDEBKy/a1SkkTgQrbHJOIhPVm9koSQaHZvxeY+L3Es9u8mhGJDgE1GcwUJblvnEJ3B/jNS1YqHXWde2IZwLEvghcwSB0GEu0+ikecGOVf24M+cy2KD6M1e1/lW3sfC/R9EenUYZMOzF6zEcqIFG36a1V1W8NRABrN8cuOTxkYPeOlC6S4icmbWeRF2WvHfsc13aMBG4/PAAcrAXSgfHNgFa4F566k2hI36Ky918dvltMCvCRdmMtnxlkfO1WDLCyIryYsbn8u+BySycE6KdJZXqyYUODhC5lnx8lAewBpbTPAiv7ksE6XKQDJoHd9e+f7p8mLgw/AwvSzp2CQEW5DXU+ovj/FohynEM93SDfsEydY6bJnyEgJkJqozc6/kZQAv+vbu1hYOq/mTDrou88RIarcfr9plbbxFqbhDZEVtxF6Tpv9097jvSKqZv4APQ4HpcIuKuZlLksfkSX+hLsn2RpgyoIYFt6aE4Hik/4chKJAa8AI6eHk2laU8vCtZ/vbHsvA3UoV462EboFPzapalxg2AU8dSk0nsIqNYLNvEYrTvIQCbCYfH24nM5K8MXMjqDAtMWkTYFI7HKTROaz6l2wt3e9d3E+LJlCvCAvUO8CoJD5qQpc29z/MmvP/3kKdVVbQraumGrL41S4X0o0A3NWAoiD0ieOf5tsp34pIsqR4pywfFAo4hr7pyBLBWBV1kefa0instKwAWxd8CDTfA4mWtZdCnvbxshYfxeDtegH+SAeD1lVjEcmr4FM1bVTqVgyOFTQ8uwrk/z0DS/7btJG7bfyo55MU0AG+dmJ3Fqu996zZmv4vIT2DJDM4ECD/2n8pahcLFFBMazmeJCWT31nuWVdIOga3sP1RDZMLBN5S9ubNWF94bMjERUKzEgfQi0zKHyP3FdRzsAhekngLx5D76VN5WPR7fw/htqrR4WKiTBE+3a0bK82lrDH677xgSwy2f6R1cPz5wmijs6K7VB/T/O5ZbSImILwxlRhUe6QlxFcKViknL4RSKFxVnQ5SvkWYmJ2I3lPZGDs4P5Rh2m0PaMPxOBGFZKu1SVV0azhQP119wq+C3ntlqnwo2MsfinBeLxOQ6kIc75uqra41Qg5kGfLZoMmHa7oXPaN4iMh6HqAZdp03jiSu/2/F01c5VIJqedu7+xmpNeu0LZxzzGQQQR6hlhWMVWO29QRN4cSUNhORoGwwR5RUhC+PNREQjM7shRR2NgM2qyO7jmTY8VtVDeDULqYkIVLf7UeoHoDlF0jM6owRW0HazUNO0Ioa/9QNCyJiCNJdcSQgHZSlxlmlE4UOtZhF2VYq5XMxG1y50Q93suxN/MEnV/gLwMqgbdNCf18sMYHeBRuy8deybkAGOKXvuodlLGWnRtwg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 391cd6ce-29b6-41d3-f4ec-08da4a73adc8 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:56:32.6325 (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: AM0PR01MB5809 Subject: [FFmpeg-devel] [PATCH 19/41] avfilter/x86/vf_noise: 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: 7Kwp/8RYfutp Content-Length: 1637 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 line_noise_mmx at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libavfilter/x86/vf_noise.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/x86/vf_noise.c b/libavfilter/x86/vf_noise.c index f7a4d00336..ce7260e94f 100644 --- a/libavfilter/x86/vf_noise.c +++ b/libavfilter/x86/vf_noise.c @@ -25,6 +25,7 @@ #include "libavfilter/vf_noise.h" #if HAVE_INLINE_ASM +#if ARCH_X86_32 static void line_noise_mmx(uint8_t *dst, const uint8_t *src, const int8_t *noise, int len, int shift) { @@ -52,6 +53,7 @@ static void line_noise_mmx(uint8_t *dst, const uint8_t *src, if (mmx_len != len) ff_line_noise_c(dst+mmx_len, src+mmx_len, noise+mmx_len, len-mmx_len, 0); } +#endif #if HAVE_6REGS static void line_noise_avg_mmx(uint8_t *dst, const uint8_t *src, @@ -132,7 +134,9 @@ av_cold void ff_noise_init_x86(NoiseContext *n) int cpu_flags = av_get_cpu_flags(); if (INLINE_MMX(cpu_flags)) { +#if ARCH_X86_32 n->line_noise = line_noise_mmx; +#endif #if HAVE_6REGS n->line_noise_avg = line_noise_avg_mmx; #endif