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 33E0042E67 for ; Thu, 9 Jun 2022 23:59:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B888868B8CC; Fri, 10 Jun 2022 02:56:49 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073020.outbound.protection.outlook.com [40.92.73.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35C4668B89C for ; Fri, 10 Jun 2022 02:56:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mtIaE0w3pgSnOUg0ZNnQ8S6af9xT9F+uxttn2poWJss3WbISWn1HxbO8lmDF1sUJJuGC1o2/JefvROyOngosSM9dKGiBlgA+fSePMJulBZXdaeMEJYCvsOjqSS6JPS9qoxXhGRzFzekv7JrQqRIODlWcLs1sQA6Qjh/PE4noT6w2glgl2Z6zmkoHoPwMLuP/anGzkF0lcH02Scypiac1qR+LNQH/EW9wF1V6eVEobRibG71F0TXM0aguis3w2Z/CWuL8/Oc60KOUQX4Fyks+lNY42GkG6qILEJ4QDuUkbCJirQsrNauRioU0ylzhsRQtpIy5yozLojA1fy+ODeMfIg== 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=1YZHJ65jDgmO0Dfs8IM3s+FaBR0xMT7zfFfz9SbHaes=; b=T0qni9SkqtTmDuf83MNH7LwZ2Am7kDiRNx/4S0RpDhPxOz4ItsGq2QqupZ8fpsahE9LCgdC8vlxz86HPMX4BKrLkuUeXzJa5X85LLbO2rHkLoEjQlrqSbksJWgnUiVLXcV9wQfZG+oSh8faoyK5pAgxcu4pV+NbrO7CAhtfu/a+4hq+RldJmt3Fchu2yTzRyfnrp90eid7Lr6yR2dAtLVRIX/FXsDlYGW4mrbU1yLarjUZcp4W1zYRHUfd62nE4c174QZyHM0AWdv6FToEY31LQlVi24cUAySWzi6obHTwZc8vX3eSNLe+9h/QNuh3VFDkz7dr9MVgn6pUvCM5EWdA== 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=1YZHJ65jDgmO0Dfs8IM3s+FaBR0xMT7zfFfz9SbHaes=; b=oxXT1HPolG3YB46E86aQ2O/5ksH5trxlKITqTw43l++Tmr3AHWH4Vfxn69BhaEGI4mDku+et04pyBqrpQfqwMLw8KEO0RO/guZlxLb43IZLxzwDsLYYT7n9xrIw7tOZoYKQkH43obWKFKRlmMNo4b7YhWt8bkuMQnFFmfXy38x44CICFdilD8OjnEMVL2YCNYc8pGrUs8ZDTKILIZ7PgK0kXdW3wokWCK31lhpnThG/1j7nxXpIZFCj+FRpiGwGJUctw/VvC5vIzB1jjXF7h1TIBxd7lJHF30WZ8d+rIvHzZQBsImnwM1NOeWHR2vRHXTzMF1wBmewcTqaF9mn6shg== 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:56:42 +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:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:05 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7p+Noxxu3/iZXIu7X9NPDjON/Cjtfk6C] 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-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79a64231-4e15-49f4-045d-08da4a73b388 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKry91Qzc+7yrqqC4Hgj5YvJNAlAr0aD9v7vxl0C0r78+Lo9EeUSupjG9CVPqS2KO8TXP9EFrWaYk72m9xMZI+95qkzK4s/vusTqGROGzQUoZAxJP/lV4DtpLmwjprymnMi6H0vLuQFeHJ34M9YwZ1FhB4RSmHb1mx3oHEa3t7OrO+07tODduvT1FeV9EvNO0EdJ8Fir8O3pTYdNf4t71w9m9X+WiW5YqUFXXNlsVMQTodKQJahmYbIVSNPnmeRyBMUuCs4lLRhBIBml4/O4U3B0GLNY5Dx4kMTaVsby3GCw4zPPXR0CGVzpXHl/GHnU8tDLc3MriaTu8uHtYKCd2b+elTpZ3glkvUkuINewC8LB+7KGH4ZGLpeoX4wDJug69hvhlqJwmr5T4yEAdz6yHbc+/kwn9QqgLFUltd9YlFNk/gJSgbIMr3wmNzWkMdQvFduV0LTRzRUdRw1Q50LB1WLcPpBMkMaksEoLXoqFQZxgfmChL4wT/iqFCxyw4C9Tms9VY1Q9xOvtqVhgaaYKmQaHG3IjwsiwTAmfazn4S206Z/tp9l0KuVt7DhHYOheVIffqnZP3cv98GFmZG59Byhry3Ip82LiXypC0MuGKG7X0zO0pwCYnx34gc6UeJelMEXcNA/kDKjWrBDoq62V73KOhAndDZGApyXi8c0oev8mBqN56FD+DJoHRLHHCoSrIqHtcUlBBIcQADw8L9YvXCoV6US+fhc4QqHRRj+uRhEfU0= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yP6LFHUmPjg0crvI/6rMPYl9qSu4ktJsXx8pEdF8ySf06PTDfP6sGcUXqxquGXHW6Wz9LCCUcsudPUYn0oJ7JkeYGo8IIEn+spXjFFLzme4M7qlxweHlDMSWdsebiUx1S320cgH9W6CxQ/yOJcoaSKspAxw0HY1Rjb8yu9jyftT9IFr/j7b/krKsrV8JxwBVY77C1/UZG/sP3wo+h7MUWvBW38kpKSUEzhz5ACtEN6pZlJYDZckFuKWMA0c6K+cP2VmBspcSiP8Xcq9dy9FyeDmJsZ421eUDbcT/nG9vVmRkIfZ0Q1hOZFMeI10Z4Ow3OWG6mr98XaC6VqRGLUJfFghS0UAENQh97ozX2ej1FIP5Kc9xKR5TXKHiijPPauqcVf5eNtf3RBLNO5G312OIKmLWneRJJmD8Vkjmkm5IdLRxqVgQO9mRcnJ7BHh3w6eN/T0cHNqExtbGm0Zm/1/gdS9l+qe/cDxbBr3dOnttI9+bPXsgDl0urw7l4cqLatMvuexBrklEjMA6pb9CNoE8ERT2D7jn8xoQicLmgfaXLOeWt+rpCMNlYH7HJDScHnI4dI8VDh2R+2W1BjpYfeJDAg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2p3rQqq/JV6JVOite1j/F9T4X4ZJm0UGXrYiSxdmKC0RduDqLAzbMoBkWB3T?= =?us-ascii?Q?8eC4TbicmwPk8dq/1AtX9DP0JJjBFHQ07pedTbFrzkFIVPc8I9uc8IRMHo8Y?= =?us-ascii?Q?MAaENCBO9wwonAKDgSqkb3CHqRi/oh3Dv6XMUjvF2V0HgpUgwGV8BfoToIWz?= =?us-ascii?Q?AVg2hgeNhjPyTwK3InepgVGMpV0Px0SEWJsvcWVwNSSw6ZymUD7FkHub1TWq?= =?us-ascii?Q?n7gRyxYmj0S3DByDO5f/C2Z6tDd/NZuJxpUiDx1nhi1kNDbz9DnhfTDIS8Q+?= =?us-ascii?Q?A6yp7GspyS3muLzsvbcYbx47EGrsrEpyRJzybNKy5vHks1NuIeszaJ0ju2GO?= =?us-ascii?Q?Rp4ylGKk4E0/2El+YKaKZUqp26JaItOROL/JtK32xOHqn1fL72PDXlL5EVRZ?= =?us-ascii?Q?v21xdp9qRvAY1VVaWO33mZIm8qPzfBJ33TwT9tVmTA3pwRf3YNS02qWLamhM?= =?us-ascii?Q?JY/7mvcUuWWS03h4aI8lzxJlt+2ESrFMNIdryJbVpPvwIyK6QP9vQjpYEqBY?= =?us-ascii?Q?7KE6FcIiu790cRftxxa5ELCGB6LLUQSZT9rqPzuVmUqQEcRkQGa8tHaofB6c?= =?us-ascii?Q?B+/5h+ByIpG4lneayhOfwSxRkCHNzmSxF0Naw5D1zVeh7J//n1JO33bYKXIY?= =?us-ascii?Q?uPB3+9jkCsLdp++s+fv11OMwr3j81ldcXiYd7D8r9Dq1pqmnK7b1Mxl2R09r?= =?us-ascii?Q?w0/2OOeWNu0SHK/uSWe5Tao7rkoiGlct9I7OIB7wl226W03xHeOB9skFLqeK?= =?us-ascii?Q?9MIGnVugl/ZGTtZn2usME+I8SpYZcBJplI7HghR8Kqd4NNM86xGW1b8voFuv?= =?us-ascii?Q?1kFNYtO0uF2GXT6mcNBZ6Khkvog38D5bhU5hqqS+rFDKwvV8BiPIX8lURhRN?= =?us-ascii?Q?dktNKcgjEpoeexd2F066w71C7I1VlsRVC4/BP7pWikF9wq9wlmJ01Y5SkvPF?= =?us-ascii?Q?LOUcFhsFz9AP7F0tO06PvKFAkohsLDbiWfsdmviO6EZTw82RvTzGlJ+XZtQm?= =?us-ascii?Q?t/4Xg6YBv8Inrp89jGtHZrZy351wUBdml5z6/OLBfg+b54eI3t27tc0kG53B?= =?us-ascii?Q?vd86B3B8pmhW5izjoB53F8v6nF4yDwu+0+L6SP3BCgYD6k4ZltSLQBrH75b7?= =?us-ascii?Q?vXUfivqcuc5VjGt3gPWrboSIJtQUosHfHiGjrjms82mi+FwBIon5Q+s+8AyU?= =?us-ascii?Q?EZ6PSK1FWTp4SwfhgazuaSOi8yPYrs1LMwPAIoDIofYHbqCih3+s2EvoBOmN?= =?us-ascii?Q?ve2Yo439bPsOgkyw3RsgRa8fkUOL6IKEm9U6597PLv784TABHUNi/OLSLHse?= =?us-ascii?Q?hwGmQ40OY0VDtDkEe/3e4SZVWxZpASU+nu7eznp7SX88+/ChdcAY+uX+Afy+?= =?us-ascii?Q?xwM873k9mPD7ox1NVC43KwKcNjJy/6EJEq+R8FisJmMA7pEp9wwUxH5YQ8bq?= =?us-ascii?Q?KFl0F0MZ2DK5jwk3O9snnJFUUBXflbD/htaJ39/WhPwQZbmbHDodUQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79a64231-4e15-49f4-045d-08da4a73b388 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:42.2420 (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 23/41] avcodec/x86/sbrdsp_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 ff_sbr_qmf_deint_bfly_sse (which is overridden by an SSE2 function) at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/sbrdsp.asm | 2 ++ libavcodec/x86/sbrdsp_init.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libavcodec/x86/sbrdsp.asm b/libavcodec/x86/sbrdsp.asm index 62bbe512ec..ea5099a5d1 100644 --- a/libavcodec/x86/sbrdsp.asm +++ b/libavcodec/x86/sbrdsp.asm @@ -286,8 +286,10 @@ cglobal sbr_qmf_deint_bfly, 3,5,8, v,src0,src1,vrev,c REP_RET %endmacro +%if ARCH_X86_32 INIT_XMM sse SBR_QMF_DEINT_BFLY +%endif INIT_XMM sse2 SBR_QMF_DEINT_BFLY diff --git a/libavcodec/x86/sbrdsp_init.c b/libavcodec/x86/sbrdsp_init.c index 6911a1a515..a710f10dc1 100644 --- a/libavcodec/x86/sbrdsp_init.c +++ b/libavcodec/x86/sbrdsp_init.c @@ -67,7 +67,9 @@ av_cold void ff_sbrdsp_init_x86(SBRDSPContext *s) s->hf_g_filt = ff_sbr_hf_g_filt_sse; s->hf_gen = ff_sbr_hf_gen_sse; s->qmf_post_shuffle = ff_sbr_qmf_post_shuffle_sse; +#if ARCH_X86_32 s->qmf_deint_bfly = ff_sbr_qmf_deint_bfly_sse; +#endif s->qmf_deint_neg = ff_sbr_qmf_deint_neg_sse; s->autocorrelate = ff_sbr_autocorrelate_sse; } -- 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".