From patchwork Thu Jun 9 23:54:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36114 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp654549pzj; Thu, 9 Jun 2022 16:57:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXPhpfY2BT4ny+Y6CuIraFRbM1y4Fz42Vq21Caxy9hM/Fhznqf7iv+oiWtF2H4aHlKQ0a+ X-Received: by 2002:a17:907:7282:b0:6fa:9365:f922 with SMTP id dt2-20020a170907728200b006fa9365f922mr37680712ejc.262.1654819042936; Thu, 09 Jun 2022 16:57:22 -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 sd9-20020a1709076e0900b006feeea7fe6esi7633151ejc.632.2022.06.09.16.57.22; Thu, 09 Jun 2022 16:57:22 -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=ZXm5hTMZ; 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 A9CC268B871; Fri, 10 Jun 2022 02:56:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070085.outbound.protection.outlook.com [40.92.70.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81BB668B83E for ; Fri, 10 Jun 2022 02:56:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aMWHP6Wqi6JurStixFTHkrjWHa9HTY8Ny3euSePVpXG4FaVwpn6U6j+J5qM6Mikyps5DgfISLVWlTPLl+xpX9a+h7DF8BDBUI7n0FwYasPUe4QbBIwNQMriwSqDmZ40IozYy4e9pkbXNYYsaGjkAVgn8lF0z7Alilz492pSHjFTv/GDxvtZjdj5tVnu0GLvxYsaVnFeS3BSSnvhoe5MiEW3ZQ9crUsrLMZ6nWT9Ki1Je8MYWqkJeY7UltPxP36AXlrzbdtz2s/5n88Xz86lks5h+gdukvzUx12qur/SCKcEY/i3ubkb911jTcBHBAFpeDH3X1rtHAniZZlA3S9fOUQ== 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=df9t1ZjBsBgL5Ej2pbyOVQuvEsLAlQQ27Cd2Smup8tg=; b=PDGZJe51qXaHE4PXIbbd54sxmupNXPjiw+CPvZFJ35//QVUMzhkwv2tKwq+juiuQBmGc9NUQW+jmHJ90By0I2nvB3ip50s8Jb5aGw57QW28nJhugiAAPJkXC+xqQVaynyaJLMEkZm6ef70a3CgCmkQzG1s+E0hByA6YDAg312y0WJgyFwjpVE14m2ch6whour8f5MbVSt2UL1tFVFTzj8akGNkkXJp5y1qrigtB6BldJ+Ko/jAJBHcH1iaoZE4qv6KFrW4+HyWYANs33eWLQwBjyMItN5S1FDB/3GZaxse41q39VR8sHR0yLmRAdRl0CZ7WeLRSe+hxzLlbyuuKlGg== 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=df9t1ZjBsBgL5Ej2pbyOVQuvEsLAlQQ27Cd2Smup8tg=; b=ZXm5hTMZIBmNQodSZegKdVhO8D6XCMBOTMSzqxEdZlZZff0THuFT1vFCI41Ogv4MVi8VieE8ytgIo6exOrjmxxorY9YtLmiqkJIGUO7DXraFNDAqvurN98qztYRrNj5xjrDUXREwE9XLS5uhjBuFtGezIopfSP/bq+knVJAFv6pRARC5fNu/vmaHUic/vKEig2YhCRe3Vf1lKIBG9hFsbIuPk51q8qZ9umPwS/XPaiHDS96DuaUJRg2rhTYKfaSzhjYBOtUfCfn2feQ9iDWpANxc+4J59riCuCxWEJv7mi/X+heLEr/ycE04Vf9Bp7mhBHunMjxLGfMzKI3+tJPcXA== 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:08 +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:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:54:52 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [+/ATqcvKbm/0ntSKHJBnOaPPBE3zRO9y] 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-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a50be5e9-1a74-4b6c-6f35-08da4a739f1b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKry91Qzc+7yph1Ez1nKEl6ioi44PeM6/lMoplXpEt0KJ0x+przxYAitFhWqApYpi9HEW/7+M70RdKdwvPixrAf7MlqDrUKpfKvNY9k2AXD6cDEOu1OMHaGw3/AryP7VUiBPW6ZnupmQ6S+SVUltLR39B6DO+L9tVKZqfpryQr9g3hkjxA4oSkeGlcM7rkhz1w0AMktSAM2Ez3Ksfm0qXAi9U92HniT/euzM/X3Hg/l8qIyPwxfPmqstzFLssePOyEGzoAslwoULIOGDo4GL1yhB7ol0bZM0xtUaCvgOyVDfe4f/FMXVF5yfaJ6GG0AwnowCM0j+yl38BcdEK2/YjwPLy6aBoFTNYkKEYvGiwUZIbopLyfZW6NDcr/4+lir4DrckmNrKgfuFoWeil1f9ZR4E5V1DrlsdalOpvkW2janXllw3DmcLHInrMc4dxlWMwJ/xEAwHE+h4ZDSRMXvLg8afz4taa6BNEOQZJrGbmH3xAZoAD/MkIY2rW/k/DzZprAsAj7JUvw9Snf00Z+Tk6Gei9LSWxpMhDbo/Fccu0kAVR+L+XB/mD/GsHfv6olCAsoGyIxcMCYoJAULBxscJ+ph7HG0lY+2RmFuDXR9Hias3R0Fp8+iPxkoaNDarOzRbqDqwAP/Eh+SowZMjKQP7MNtbHwgZheYh5+tIpMzsfhkJP1hlY6/nKkJrKCzZg9l+ikHrvjs3SDYSBGzP7WztdqNNecHLcE1tMUIm0WFmYqPMI= X-MS-TrafficTypeDiagnostic: AM0PR01MB5809:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EyfGiPM++Rwg9vtexMZPJ9ldgnS58qcFXcyRVdGMTV/bhm1GDUZ2WaHeqLcbK2PfbLo5VEKIl4xtOy6NhXfFDFwTLeDp2MpF+/6ODpVx5Q46qT6lfBt0SOPXo3pgDda+u/DEG2UoejT5HInNQ+mEseSKEL0vVBZV8xgkm3SUlny59Td5IjZTaHp5tTnRvFTWJRAUswgQpKwpv+gfGT8uIhKy9pPBu9NB+mj2yVJ9Tgj+8jvGiG8FfDXPJuwOENKwyrFdIlKH11u97VS856WxrrexqgxQkbubGLfZcfVdCtD845ptAvr1Gkz7ge/qhKu9eCJyDXLCI6e6KvHMOsr+ZxZIIEBZ7WoFbVNHazPSypapyQHy3IVYq3tMlxLpoxGfCMzFbqJnAHZtyx08nexW5wvN5JKJBwwxPaqgZ2vlCp4EVb3T7zNe5UmU4JOr5T1lQzaEmYiOtgGwBa4z6WK1PNzXH94nbBMGH7cX12u79ym1Qy0YHZNJTfUu0SbmfcpPJK+CzWtPYIbbOo/b4cP7f2a7hwAL70H1l0/TIDsOjrt89sKgSN/7DqpQEwkDVA8t4uXnxOOgF3nKjfVWyzQGxQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bfpX7F3/69ap7Rub2AxgSDU4o8R9bhRzNBJKcmbyuKe3ewaMngtUS7HH62adUjSBZ5iwpQ0VlQYbzkM6/C3YscuWFDx6nFLVq4YvQTxvZYBAT9LTlv32OeM6jacH7M35RrsQzj2rr/d7dqVyaNfZyXcVxwlIPP6I7XobIOlhcUxmOaiZWg8t5FFRpyClgnrDSC18PgCU6uK+gjFeQ9Cq0IsKeykDf2h5PgOxaNHi9YF6VkjEbaUo7jLrJZftXrnhOPienxJO1PhHqcgWKFftuIdcHSM904o6Yn/qquJWXFvQOaxn+BUs1bGnlsV3YjtclTdtrEDWX6EhFwPwVinZvHBwCC+rVDdW1RuYR/DWmtC0oSuZqoJaje4u6n5ir3JfR3yqIqRSB7kFMfaAKtpbOK6Tx9pO2LI/DSdWakic5cgc/mTi57qkL9awEhcbWPqkE3kgN1xAD73MtU9cFjDv2DTbbepRWXluTcXWTZXquvJSqaiEv2VHQl7sJPzv4tN1PQv33xLfLKjG0y5whcArtmoR2sj9vASfNHNNnsvk0BiXqy2mYF5J/UlAWMORbLYT99+hbZ6MoatGJIr/8bUPuEzj0ixL7WZ87pWytDyZWZ2bfyZUjUMl1BcR/ciew08BECyfUeD/bHO/JM7nZo113fm2epD4BbjblRG5VPofEVaWW3jtbKzquVkDsiITlL2RSbegCKmLNBKzag5DOVsofVfSFE5SSca47uWBRW33Mhw+2mtto/DBjJJuidefUNwXZQ+np2mVcXiJnQIikXQLNJirxyHwjZtkfBwEJ/GPtfhGKJY2HSGMUoQ0Ky2Y0KTeCHt71ktoswa7a8ScgjyBrB1ROTKwpV2CwscjgRR+rJ1nRac6+8roqQCnsguLkyvk1wUJuMHdtKMRWlWYkluVG/rQSLbOAooxCxebjEiR5str9xKXRGWBB0pkQtbod1uev7G14kkQBZuJmOzNh2iNZPHiSCRQMeAn521wgsRvwxtPc65jR9/8q65Quxq0L1xsqkTgoaz7/5Eu6X+ejXgYqk3hzzbYukddb+UTgCQTSNcyuRvz1tv9ucsLpmcKVwjRnQUs1/4SFnT4jPqNvgZ3pEvCggFKeZSN/HAMKVRq37YpXn/4gLepD0cli3CDr6Tocc8IonyMQIZBBVc6Mo3PE9Byvdq1lX3xz8iYlho1s+wRyikD5oPMCKIEHRQW4BZIzIhok0kbTZMVWVvRD2nSAexyc2pP6sUz16mBgzMIoSxxeNm4LV17nWZQK0p6eojQvhHdPqezvNYf0WkFLXhi738aDNKrGwvBSdt7gLoJKd8vBqfINLucyAhvlc7MZJn7p2OJ2g3HQGCiKtZl+i9HfAfdL+NBwe/2UToiuh6O1rbbo5GsdXsAked+CJRI3T0K13GApPrv/4svMWT0EtJnbFtoebU5NvehaJIxab+PiczbrfhWpPRUCh+MHpY1t+mSIYqxDQNdnmWzLcRHntNH+A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a50be5e9-1a74-4b6c-6f35-08da4a739f1b 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:07.9760 (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 10/41] avcodec/x86/ac3dsp_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: Qi/hMArWRQ2W 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 AC-3 functions at compile-time. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/ac3dsp.asm | 5 +++++ libavcodec/x86/ac3dsp_init.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libavcodec/x86/ac3dsp.asm b/libavcodec/x86/ac3dsp.asm index 4ddaa94320..050cbfe06a 100644 --- a/libavcodec/x86/ac3dsp.asm +++ b/libavcodec/x86/ac3dsp.asm @@ -64,6 +64,7 @@ cglobal ac3_exponent_min, 3, 4, 2, exp, reuse_blks, expn, offset %endmacro %define LOOP_ALIGN +%if ARCH_X86_32 INIT_MMX mmx AC3_EXPONENT_MIN %if HAVE_MMXEXT_EXTERNAL @@ -71,7 +72,9 @@ AC3_EXPONENT_MIN INIT_MMX mmxext AC3_EXPONENT_MIN %endif +%endif %if HAVE_SSE2_EXTERNAL +%define LOOP_ALIGN ALIGN 16 INIT_XMM sse2 AC3_EXPONENT_MIN %endif @@ -81,6 +84,7 @@ AC3_EXPONENT_MIN ; void ff_float_to_fixed24(int32_t *dst, const float *src, unsigned int len) ;----------------------------------------------------------------------------- +%if ARCH_X86_32 ; The 3DNow! version is not bit-identical because pf2id uses truncation rather ; than round-to-nearest. INIT_MMX 3dnow @@ -134,6 +138,7 @@ cglobal float_to_fixed24, 3, 3, 3, dst, src, len ja .loop emms RET +%endif INIT_XMM sse2 cglobal float_to_fixed24, 3, 3, 9, dst, src, len diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c index 5f20e6dc31..47ec5d8070 100644 --- a/libavcodec/x86/ac3dsp_init.c +++ b/libavcodec/x86/ac3dsp_init.c @@ -41,6 +41,7 @@ av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact) { int cpu_flags = av_get_cpu_flags(); +#if ARCH_X86_32 if (EXTERNAL_MMX(cpu_flags)) { c->ac3_exponent_min = ff_ac3_exponent_min_mmx; } @@ -55,6 +56,7 @@ av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact) if (EXTERNAL_SSE(cpu_flags)) { c->float_to_fixed24 = ff_float_to_fixed24_sse; } +#endif if (EXTERNAL_SSE2(cpu_flags)) { c->ac3_exponent_min = ff_ac3_exponent_min_sse2; c->float_to_fixed24 = ff_float_to_fixed24_sse2;