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 DF0C743414 for ; Fri, 10 Jun 2022 00:02:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E19A768B93B; Fri, 10 Jun 2022 02:57:38 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073052.outbound.protection.outlook.com [40.92.73.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 869AE68B937 for ; Fri, 10 Jun 2022 02:57:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KLRfLZvfRHs02seBnKok0qs5yjTEXEx/jKN5vV5GSABTUbpkPkb2axoillbEXdF5sr5ZxiMSuVdaICKt7NuepneUDIkJc9R27xjJiqF4U1IOrQH+Ssxro7yekGWVTxcZYqYtLbOTaKNzuuWQIGBPqAGx4bmLKGx4dG7vjooXCZ3WmxmZL4K2v6ZTKibXcSNDomjlvLX/tUkV9nc9WE7HZsU9BXIcolX2Z6yksNwkziBfqk5MBdZEul50uOkZhuqkdelBANKure7POwYOWpN8qpQlLveJp0n3hV6aZi1vWsahcoOpfV5eIrZSBQcX1X2xlmP1+avxqeVrwSRpkE2OlA== 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=xHVEnHzjzqMUacivAbnh39H58n/KLfJsRKRtqTLIRDs=; b=e4B35iKLxx6ygSI/cwjLkzNxxtpBbt83Pr1WCdBQ15+JQJIpTVRseFKH5CjBOMdMTXIaBN/obKbvS/IDuh13ZV3Gyc22ybIlm8MUOdlAW7oieujQOn5lFkWhMgCsFli1dkrK2W6IVJv7a+QUbDOlo0VFEmYmO8Mk3KpVwIKEJYyGdGvDDWE9Ba2YprbrmFQF/F+LW+s6wJt0C3oukZDogPhDeEn65cvl3Gc/DJ4NqkdM4gTyhlVcImFXzaT8bAp1VCWoaJHmI97fT3MbZqUTB1vMBL3rgLmIDi/QTLhomrN/dMhfILyfB8qmcCasoGrgpAv6FXWLU0xU6CzL7fTO1Q== 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=xHVEnHzjzqMUacivAbnh39H58n/KLfJsRKRtqTLIRDs=; b=QpPyTdJ7EHlOZg75L7naAGwWsYkdLzaJ8+GjEsVaQYXol8tABBZhYrx0APWDnGRqk7FxftPdnnYjEbll84fLjT+iFRlEpeHvp4TlT/6EvDOnHimRegPnBgpVPV1ovu+9tQQXlW5cKvnNfSub+xC6W2JmlNghL099dCPg9ajAYwCMYYxNw12MNU1pWbRegX1WsGFtW3MZYQnKzRbkANPcNxnKraSJSrlyBRwrNpihuSC9iiiktxkBRG5I1igAKKfPQwylEje01P6KpneHdySKlrDqDJdCEuGN0fb1qvwMmbpd/p8GBUZ/2uXTwJVCTZy74Z5EY4uL2emY5wodAVXLlw== 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:31 +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:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:18 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [GkPxjhOVBhMt1LbXRHNlZDYJWby1vEr0] 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-36-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb955a58-97e6-4bd1-7223-08da4a73d0e5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKLkAYCmHAduU3v4IIh4OQCKCyJ2tdAL8wnJAwzLYzxgoweCt7+kBiJtfrzycGSj/zf56SgcrBpq0DuqH731u6vOcGoT3W6fxyfYnktiLx9Y/Uw11AtejranVI4Ll6VfDK0r+a1uEBCEme3HWn8f85TLHAmjxFGOLD86Tv9jzHVRyJOEOT2/3pgkVjAqdWwO/qFKPS4WyskkXUBetKniDi1Ysk7+EoGa232+eVbgCMAMg8BnFJZbwIHA7lpYI/VUc2vc4Cvue7gP2dcW9lPpOMToxnazo9hbiJrPIEOINxTq7r70ujsQEKmmac0pwsBaI7Aa/5VVgVziTTyZCfEjIoyudX5TNKbF/37mhdGNiJJAmda9AIJrLnnekt0RGPHCEZhm25FjEv7hpUWQ9cGCArnfpGr8vYK7ybJO7pZhPU7XZ0hD68gO3WC9tx1KfRcwu+XdY9CXwjFamEzGH19BLaM1F+NCzstJxRyxG84oHHk9sODp2kUzl5z9q7PBtNsuBiSZz6RidHEKLOddzV4mhWgOQxYKyfZgU3j4veXnzVWUAFyCZta6DLujIuUlXAnwt8h73dU4sp3ZwqNHnjQc81nJ1kA//SpAgkBGGTFF1EEjZQ9PR2Vy4CTrjSXeMVjkVE24Eu4Ut67oRYs32rWnTj5/NgBn/iRlTp0IsyJrCPXUpMODy5vHEiJCTxQCVLpI9QQUAxRDbA+B9fG8dQR8mmpxAI8uCOk28O+qRYNidg39M= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fA1u3BiWc4qeRP5RR29o8IIFDYxe0EoX4JGm1n7SkOirNQQGR88v56SHqfLrBX/u7Qm8TuSSUtubn7/WJJpc8qWZgs4ol4HBYr+cbzJQtOZEUBnXV8Z2eAOBUyBGUvcshpLJ/hRtWGIjy0Lv+AxVyF71x2CqJObpsyuII8Xlddr8BcWv+w86whZuBwpgkNX3LXpcb925uF8K7K3lXrim3umeSnJbzeJQ22NxYY3mwedA6HKsHq/o5REzgK2PCbP7YWQYjWCzUQqWtK3BbZIXkGYKt16OCHf3YrMPgtL6XbpxIBsbgiHhbXy5AU3xwTX4MgjwXcoRgQHfHpRU+C4kC3PvEV+ZmlpzhG2UlYfMZeSetSseO0VPaxYjplKG4ahCWcrMaXJ0zJ72esMx2AMgv2oOvxil8mlGFxoMGGWBuCFjV3T3eW6uNmztOPRqOs7K25lZKO3at6tk+PJjEOF/54STtas1ch3FXFSg+0sFjjX+nnxx6DA7Zdain04YviK2uVQVWZRABnQlCVTmjnmWjBArw/XiG6WEWpnoWcYyvVu1mDf+8+C+/Eg6b4pT6m+EKEpBVezaTZb6e7DpyB4+wg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WSwar6bBmquUsHISPD3sS2wigBUKZTf4Ey35xpPcnURbK3zSn3ZBYeO3g6aa?= =?us-ascii?Q?LZJGhUb7ABdOh3AgaXPPWss2/8SZdqtQM+tLoP34pGqxX+pnjlAr76lm20M3?= =?us-ascii?Q?fdPbYIPpy3mSZNt4qgUQvIKAofhsbkdQsBMuo8aPAfZs4DTRyQOSfaqvu6xU?= =?us-ascii?Q?VMqIZQLMSAW7j6eR4xc7Lw0h0IBDrQrTvTVeaU15MmJjOhAYv/Krg7FyVeCH?= =?us-ascii?Q?GbsSF33bPeXAVQRW2YRclXve0BekYVskKHB/hmb7Xd2A/7x0yqjuettLhb68?= =?us-ascii?Q?AGw1FsSUlxodOfCJFK8/aUzOg5vUhVG/fpMsst/slr8sU5AiGgKUJoYqWrRg?= =?us-ascii?Q?5+my7XE2D56GNYAebo3y317ICGr+SXcVLSa04WH3m0wgp44gShW9Uyg9T/sy?= =?us-ascii?Q?cKWpTEh2Aw02KFhu8XBI1I+xqXp/uP5anxVMAtObBqmdMqi1hVJhuzG6DA/b?= =?us-ascii?Q?9YRLvmQOcEqeMxsfcxhTMsdEO2phAYPMbU7jsMnPoNgrHepi6ogk9EQH1AvO?= =?us-ascii?Q?/7Yz9tme5OrcU6jKjsq68vGLlPzkisJ2jKari7YkDt19nsvfJ3hd00yjcL7W?= =?us-ascii?Q?zZ4MUbFlTymHcc/rJLJHozmG0gnd1bw2SDhSkho62O7EFjlwKCvtvKYt8FGC?= =?us-ascii?Q?wmuebzEZj1Uq4FehAKS8rjCZ30w8aZpXJdCBxSx9JRtXJ2OcV7wi5/y/Lw7L?= =?us-ascii?Q?1xh53XzgNt6hT0xUNispAwd2HSvQDTYySRvXlTN5KZztFlc8n6vnc42lUWxp?= =?us-ascii?Q?ZI25+YVHj319/1qELdb09T78HzbvUGoTnnaOTiVyW8hV6ypmvP0Gx8eaWjuO?= =?us-ascii?Q?UPLzmXycaeqUjfkIx2XqAB+ROZyErPTXlbsuophQSfqPFzmLDiuHEKgXqPrD?= =?us-ascii?Q?DTIXxbNgfOvl4TuV7K7q7Wiee7Difil8hUGJT3s/fT026wMgADTL7nnzToJj?= =?us-ascii?Q?D4rQx1mc3LfVudHG8lGBRXcWEh5/Lz4VDysikORSBAv/NhstJslhSzu8SgPo?= =?us-ascii?Q?3Z/lNAX4qzdQ8lZCAL2y1a90Ll8sal4a6WmOHTCOESZKkfmS7NOsxK/7+CUf?= =?us-ascii?Q?YppVv3egt+IZKO/QQQkxrxc9Pc/B7GYpua0gPxQCO0VmZg9kxQM2MOhn1RLi?= =?us-ascii?Q?+r2ab67ArnEog6bWppU0OcHAn2DQ5r/i4YRXwumnYoWuk5xjAO96MwWqDXwi?= =?us-ascii?Q?AsPNBeAnHs7eVS55Z3wxHwp6Vr5R+/LjbgTyrn5cYOfA14fuAoDfOytCDlx2?= =?us-ascii?Q?lh0tOq40Qth0PcwO+UoJbkKqoHCLhRzyLv9zohkv+rXd618342jzHTxGmyrA?= =?us-ascii?Q?xdZARdQVAZXgfv5tn30Cx3OedeWmiefrZU0oDaz8odkTp0d4aS+qF/S6DYvs?= =?us-ascii?Q?gYcmmPN0nRXiAebpkUY87Og+m02ekTdn9MVu/XYPJJ1MchVYAitcQclqJmiv?= =?us-ascii?Q?J98SgYaYN+rFbL5rWqjUDcL7kNhaleVTVO1ZJ7kQ1WHde+SU81+C7w=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb955a58-97e6-4bd1-7223-08da4a73d0e5 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:31.5082 (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 36/41] swresample/x86/rematrix_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 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: 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 the MMX implementation (which is overridden by the SSE2 specific implementation) at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libswresample/x86/rematrix.asm | 2 ++ libswresample/x86/rematrix_init.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libswresample/x86/rematrix.asm b/libswresample/x86/rematrix.asm index 7984b9a729..1c657ff72f 100644 --- a/libswresample/x86/rematrix.asm +++ b/libswresample/x86/rematrix.asm @@ -223,11 +223,13 @@ mix_2_1_int16_u_int %+ SUFFIX: %endmacro +%if ARCH_X86_32 INIT_MMX mmx MIX1_INT16 u MIX1_INT16 a MIX2_INT16 u MIX2_INT16 a +%endif INIT_XMM sse MIX2_FLT u diff --git a/libswresample/x86/rematrix_init.c b/libswresample/x86/rematrix_init.c index 0608c74e7f..3981de4277 100644 --- a/libswresample/x86/rematrix_init.c +++ b/libswresample/x86/rematrix_init.c @@ -43,10 +43,12 @@ av_cold int swri_rematrix_init_x86(struct SwrContext *s){ s->mix_2_1_simd = NULL; if (s->midbuf.fmt == AV_SAMPLE_FMT_S16P){ +#if ARCH_X86_32 if(EXTERNAL_MMX(mm_flags)) { s->mix_1_1_simd = ff_mix_1_1_a_int16_mmx; s->mix_2_1_simd = ff_mix_2_1_a_int16_mmx; } +#endif if(EXTERNAL_SSE2(mm_flags)) { s->mix_1_1_simd = ff_mix_1_1_a_int16_sse2; s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2; -- 2.34.1 _______________________________________________ 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".