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 236AD40E3F for ; Thu, 9 Jun 2022 23:57:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85C9268B876; Fri, 10 Jun 2022 02:56:15 +0300 (EEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070100.outbound.protection.outlook.com [40.92.70.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CA3168B86F for ; Fri, 10 Jun 2022 02:56:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=my1E6rbLOoWqO7j6MaNEmtHl5eAnhFydrm7ZLr4RIloL+N9uAD8CZjVWRx2XxN7k2hBeRiSeVDc80RRpUu3j0xJtNrf0o87r0HtBXdpa3Xnjfv7DOuW5NclwUVPU6uS0GoMibNP8o1gX1NBh3aJRj76GsFuKPaZLVDW8n3H4zFvSSq5Y5Nvml8jb9docFYmR6HgqST1SqkQnNQXIg20ysO+rQ8NzcOi74mc4zaXwjsy+S35eiKd59YSy8+SMLC/exo5E3/AmZmlkenDCb9nr9sNBbRyqGW0tWEfdDN4hbkGWZ7JQrkEU2lBE+TiSpa6+3SQpWLVjepTgSACvbGAJDg== 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=kyE0kuv0RgVZkw54HSIOgOkFBghZz7tSragUmBt//oE=; b=mHqmsG3Ao3RsfEi5BBrW955g+mw4MCT570V49Ykq2BahBkFUkRfX5S/8Bd5vkcSWYVCWklMFke5GMb5CuZa4bjry48WLyqTD+2jyW7nxaxlHFhQ0PGvfbDk5dJYCgBj/XuTGJE4yf/MeYNQwryu8DySX7SagWjEoOLFcRDrGmQnTeXvZ7OepwD2A47FxL509gsjWKMuZ5grsnWbCrTavgem8iooDijzh41tlizDZoaD+FliZWvpEF5l5t8vES9y3npJ+6htTz5zYkvmJAk08/v+ABTHgZheJpPNXnZg8BMibI9M0+aQXcm1x/0fcMfTXbyl6Q+Fs9aCouvWCvcvK9Q== 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=kyE0kuv0RgVZkw54HSIOgOkFBghZz7tSragUmBt//oE=; b=k/AepTUAXzeKMGgf1cU3O24Y2AbXQzhBhTkGAlvvYXiSO0CmwJNcj5LK3n4jcA1PeSNFQfuz1++f3z+p0KPONqNOHhmaUjg+hEcHpniLRF/sTI0SGa+pR/Q9za4VQR7ckAB2AU7i8OL4ouoyHxUJBF1K24/wyHol/R8ZAImirzfMji8h6wuXvDrNwlXiQ47FrfucfQh+ijlUh8yMaS0WjxU19WXA2J3wrz4DFX4k+sASo++eGc2Z+9RGPd6EDXSQ+mQcPEyq0yC0LMH/VJwxTIswFNaqrUUj2xGbdJW6i2+F0r2HRHWqBFSqV4hB9nZMPHShQmv5KtfCtW8Rbhm7Gg== 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:12 +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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:54:53 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [kNu6c0y1l7pdwCExUqlJBfRy7DeVGlI2] 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-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97723fbb-52aa-4a70-68be-08da4a73a17b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKry91Qzc+7yph1Ez1nKEl6lINXSt5hMkr4RostdE9t/vLrsfebzNgiJ1KE83LwVbWHUldq5ioOApuCegC5SK5sY/5mxIwWARRE0wx+X6IyHHzjjDayESsVOaOsX7QqFo7QQgGzmjBxK1XhWaGMZSW/buEe4Ns913Zy+yIROCI4VSMuM1/cEknLNwYpfjYYXVjO7U5lrP58788D3RrAhuoIQUasV/sMoBAremoGRecZ6i8ExIj6mft5YhgmUyhIkj7ysLOvunzb9e8+OJcZUUBroDj8kwF3RNDB5yusqtGNy50g9+dEUaTqV0CnC4kATdniKa3wATPqTHgxJlZer6rQJv6YYp7Uy7Y/V7bKx4Zf8vRFTeyTmyHvUZKdRo3cD280uiB8xkPZr8AwDLvSIomXZnCFH8Qjd3cEY9CPxT4K1wrctjszFUlWGWFyi+UeTvc12iFizJQWmBxSg0n8XnSblkBFZ/tSRgHkr9gP9MJnVY8dNjIb5NHXfTLRZzRRmH173GlfoKMVhb2WuxV2CT++ijgvSzxKcAc75JlPdI3W3ef1fbreM2eiQXxp4SPEi/dPd5StNQ5Z90K3F2gFzsoMXQ/z8WAn+9HqnR9dRfH5FpwHNGB60YCzjb7/18yJ/xNlsXqX+mqgKnH6y9PGxcY7hOGZfQ95JTRQwNVdrBoPJ+CuZdQrdFvOV/nmQDBtSdIPfzTjIOeWwiySNKIsivC3Hu6q35GiXILWmdsK5pAggc= X-MS-TrafficTypeDiagnostic: AM0PR01MB5809:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aI758qkXwCsw4kMuJ3pFHzxjTv0FUL3CiWYT5py9WdnT3kjPMn+gMUuXacUcjcadhzZ8nCtPF1PkrWmR3gQLpHh+/KXfKDalR7xgd0+1Vcf85dUU7YKO6GDM/hPjyDS65GsP0kxYME1K/A0eS16IvM4NXCNoEWuNzkNN47bcNYhFZ9yQkQt0Yi10NQyQ9PYQnQcehv8azz0jMZFEO2+zbc67SQJ7L7oslkJCMXplsOJ6jlsXGbLroLv9SWakuAdUKbcQ8zyU7OFH4qy+eCkZgmKkLnl6HvSfcN+EfO5WM/9h3XU1jT/0MzoqRwP/LW7sl53YuMKJsyfz5EymFoTpK3B5G2qlIdYzyBowtSWmHOcUZS4svcj/3h3TiNE4LFd/m6o7ILBaoC6cPzifzLteN9OMyH/kUK+tWCJ93/8YJvSqBS0E7ZfqeSyvdJTzSItFy/MDHxFzVPlXp6zyue25+Frq9RLyOXtnqTD/P6bD7YePNCe3Mo57XiJDDTfhIYA4RPz4fEItj8FU9Z9EeblsPGxTzlR12f0gmd9NwckBrIoB/cgqVbVTl86WGlUxBcvUkXAXmZXuvGOxkP2ocxlF6A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4C1lUi9sK621DkcIgtr3PXslpoUBaFcizEKsexrviqPTDeTARf54V+L/hHIs?= =?us-ascii?Q?01AyiiHVzKalngjgqPpN913oYYp9t38aQycBCrgPIIxqZn9lzMhU3kpyZsdx?= =?us-ascii?Q?YdQY0Qb9FPUkc5ya72JjO6LSNMbytfxyARf2tOTw/qt/kig8TxPiK4RnVlC3?= =?us-ascii?Q?ENySiIflPhrSwlBwcvkbNjgQYFMhrGFonzyOvnRgQ2zQMSwby+n1zlpxnV4x?= =?us-ascii?Q?d3HX1KPm34jdyYISAxsCiHdIS00/ok/dkKc5ohdL6LsUJhEQuVUtNN03D1aU?= =?us-ascii?Q?DBAKLAy8/YQYFY/nTIvSOQQe+saM2Jlr9KXuwCLqkgrJekszE4evK27U76Y/?= =?us-ascii?Q?DGbN3S3tWFl4XH5xfwsvXfTOHh8AU9wnJAHUtX6Rn+qTJPSQ+bRaY9xZSYzs?= =?us-ascii?Q?b5wmg3bc6mvINaoZE5I4Ek27gR/7sPUiW7waugn7R6eC2hO9gAtiotz3/kgr?= =?us-ascii?Q?czZJaSHSv/g5RXbRwOoyC3TFYWJNNB0UERTMm0aMHk14R1HkGR7/ZBxt3fV7?= =?us-ascii?Q?TKat8pzJ2PpCdPBpwmXsbEfQiPtU7Bb/69AAeeKHcbQ+qIGakS76t+Wfvgyp?= =?us-ascii?Q?M+TgM58fvru5V2Zqpy92TYEtDPtKcbKJoyFbLGz5A7KaQoL0blaQGI05hMGU?= =?us-ascii?Q?LAZKv7uJ2wlKkYvrEVQwk6F8eKSgnmJnK8HyKtqDISJl4yGo1MM4FJoWqKOe?= =?us-ascii?Q?ck9ybK9Z5EPjeoO4VRGVcSYpjPtWWItS4PAZMrAqTW2KBTind7toL9kud8z+?= =?us-ascii?Q?rsHSj14mX6Vv3GPeKRhAH+SFv/Ggy6SNvYLkxqhRkRXUMdT7MrDSUqpEEmdH?= =?us-ascii?Q?f0RgHQmRAwezRQhvkp1Qahh5fYHSJ9usQTkCyv2yDAYSQDPcpAxyYtmzunSU?= =?us-ascii?Q?bk56fRMv0lddXZ4FrfnUzU0jHKyTE447VIONo2XZSQJoVMnycbPIHZI5/Hkx?= =?us-ascii?Q?TahNzjrwcWqq8JWxQ19nnFJ8NRWGQV+gmMo5PiAonI01CciNo7by7jj3Ydlp?= =?us-ascii?Q?P/+UfGYM4NZy8EFnKBYesLlKVrZAN+sUXkdZN0DeqNdePWZL3L0JOvH53JZm?= =?us-ascii?Q?MFRcv//TJsYnvRlpqjBp4JNcVNklJytVoN0UMQTlckgbZa5XazaLGGreA8S9?= =?us-ascii?Q?ba0itFN8Lu4QSfCv16hAF2WsKyiZXHknMKkFBDRca+8HeJj5yx1fOAltGOqJ?= =?us-ascii?Q?gRq3GqufXOKgV2X8GYTng+zOMTbXJVSrc1KK8pMJmCoXGpM6A1yxCtDNkoDZ?= =?us-ascii?Q?9rOKBkyS5Mp/CySP5yOcQ6C74suuTny2Qm6hUev+d+bK3BEn+b5sB+UGbVRS?= =?us-ascii?Q?rH9erWXVezRHzK2+UUA2QGV7m1uCqKKL7FgYruZ4g7O5Tb9nXQYnurnt2JlJ?= =?us-ascii?Q?TtPf8BPzftAmaqQzRGfM4fjdMMVY5FjIzvbEgNj4Dyh0xXYAIZFQXnlGpgmU?= =?us-ascii?Q?Trqt3n2GwoRQrwlao41Hio6HTwqRGUiiQwdTV7MqhlBgfJRm2dTKHA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97723fbb-52aa-4a70-68be-08da4a73a17b 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:11.9604 (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 11/41] avcodec/x86/audiodsp_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 such audiodsp functions at compile-time. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/audiodsp.asm | 4 ++++ libavcodec/x86/audiodsp_init.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/x86/audiodsp.asm b/libavcodec/x86/audiodsp.asm index de395e5fa8..e4a498b516 100644 --- a/libavcodec/x86/audiodsp.asm +++ b/libavcodec/x86/audiodsp.asm @@ -48,8 +48,10 @@ cglobal scalarproduct_int16, 3,3,3, v1, v2, order RET %endmacro +%if ARCH_X86_32 INIT_MMX mmxext SCALARPRODUCT +%endif INIT_XMM sse2 SCALARPRODUCT @@ -117,8 +119,10 @@ cglobal vector_clip_int32%5, 5,5,%1, dst, src, min, max, len REP_RET %endmacro +%if ARCH_X86_32 INIT_MMX mmx VECTOR_CLIP_INT32 0, 1, 0, 0 +%endif INIT_XMM sse2 VECTOR_CLIP_INT32 6, 1, 0, 0, _int VECTOR_CLIP_INT32 6, 2, 0, 1 diff --git a/libavcodec/x86/audiodsp_init.c b/libavcodec/x86/audiodsp_init.c index 98e296c264..ebb28ece78 100644 --- a/libavcodec/x86/audiodsp_init.c +++ b/libavcodec/x86/audiodsp_init.c @@ -44,11 +44,13 @@ av_cold void ff_audiodsp_init_x86(AudioDSPContext *c) { int cpu_flags = av_get_cpu_flags(); +#if ARCH_X86_32 if (EXTERNAL_MMX(cpu_flags)) c->vector_clip_int32 = ff_vector_clip_int32_mmx; if (EXTERNAL_MMXEXT(cpu_flags)) c->scalarproduct_int16 = ff_scalarproduct_int16_mmxext; +#endif if (EXTERNAL_SSE(cpu_flags)) c->vector_clipf = ff_vector_clipf_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".