From patchwork Thu Jun 9 23:55:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36132 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp656103pzj; Thu, 9 Jun 2022 17:01:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwF6GwMT6osiWksYf3e0b2AmXYqDh42cXhOwEWjytEJSAfUHw7SqoF3mVgS7C6ulXcdkuaV X-Received: by 2002:a17:907:3d8a:b0:70e:6b1:b004 with SMTP id he10-20020a1709073d8a00b0070e06b1b004mr33762728ejc.61.1654819301180; Thu, 09 Jun 2022 17:01:41 -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 di8-20020a170906730800b007120a60b38csi315400ejc.568.2022.06.09.17.01.40; Thu, 09 Jun 2022 17:01:41 -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=EDaP293R; 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 3CC0468B929; Fri, 10 Jun 2022 02:57:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 96EBE68B927 for ; Fri, 10 Jun 2022 02:57:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JuLFqvFnIVi1hTV9dPvGITDV2wTkzKD3mlpGgWBJjhEACb6yyxFw5U8FRzUE97ZlpCM06v2TMxE9r3iaEAInQsfnmO3LYzmLPbakiChfXY85k98ToPIvsUf1fHUOJ1NvA0osmwfjZ5y1np1vagKnkBZgpM70aemNZ/UuOlckVH2wyHao59PVzzifOk5Uk3YGxj0vAjhE7CBsFtZbSMYfruEUAVvXAM12rL6avr5Llb3BY0usZu6YJJFknKmF6h9+eEwF32rqUALm72t7q6hR9gwU/8znWelTlWctpPYbW2gyHwv1y3Jfm47aK5Yh6sJewRHpLKl/p2/Tv28K+snrRg== 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=s40nEzTx8PSZ/WcMsXNLsXYTJJxK9UuljFjCwQ01/i4=; b=nSr4n1ycc81XPpVPd2NQKh8PRIXJM68yDVpO4jtk1SNdrLDLV5GAnZh6Xlo9hhbIQfOrxWomxDD43zCceN9oiemjoQa1db+ahjfkm9bI57Bu1OYW0uz1nLvFqd31XzvFMyWYZxYHTRcdE4dKCcmGdz699LicmNXe2W+o/ahxLV+8QiC+MR8XFdN45VfUqyVOZV0hO9ag6d+forbLTSDJpkqCmLbe/JpBuR705LU+ZV0f88TXfmR7MlPvovvXKTbkQrpcDO29BR/A1asy/KpKhU6gT6bUtxu9TZjGthvYCqzywXpIRYyrCfLj7KU4oSc2rWbczC2eAHlGm8q+OV4T5g== 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=s40nEzTx8PSZ/WcMsXNLsXYTJJxK9UuljFjCwQ01/i4=; b=EDaP293RTupX0kxy/27Vx6vAqGC90eN8uFpxdeQYWD6zZPnSu7xjSxWU0W8gQgVzbVGu2amrd8CsoIizYWybT6HfEkHIkVxK1osio3aIOXxFXPvJyvXPHXLA9lwAgaVTxtVe6qOiuHjiopjMtOv6RavMbY1X0UpcOnNKdPx+XcYiyVMs8lZNk4s78sm7L8V3DyfQfcMHloaaATCupjjZlzfj5iAM/KpTFMPTIuFYi49lUhZseb5tYpgxMc9dCoyihFd+wNhsKJ7YEPbqbkHA0qLHv2AnoiMv0vBNj+wTQKDHzn01AwdgqLbhXkYFuGjqRrjuR86lzfHCo/Jss4IHJQ== 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:20 +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:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:16 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [64Nrs4oH4TRu40F0hLFgzZK+KB9we5yl] 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-34-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 29e1c6a9-ee64-40c2-2e1e-08da4a73ca90 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKLkAYCmHAduU3v4IIh4OQCHCavelasmOMjKdbR0S9nCd1bbZNbQQaDy1vqti8ey8UcrDOKTUJpABhSkXlDQ257MmLYQMXpOx+L/GZw4Jk0m84bgdln7xytuHI8RTb5BeiTDMY7EeVc2GVX5Wd0MaeKlSUHDORLBiiNL4RaMctgLqWLfR/KKSrN98ov8QikVeo4t33+zpllf0c8r79/XTn0rMvGdKIIE8XNMCS/9u7HeaBHsbJiwHucigSshDx/MGE8aQ0dwDt4To9V54+uQ0A0g6g4gFTLYfpMFfXiCUT2SrfTtRazvK8ZAI//w5jtTuFEdpXkwyv/BbeXvsu6NvQOc1MQ1i+le8ixUSI1gN0soNqq5UqkO+7oHraZofy6dVAaZRBUWfkr/EXhQK2iiESyoGjUdJ4K/ONQFm6k/rbEYH5pwSMt02Bu6hhIJ0Fb6k+ze3CYpxlQJClff/++KrKz7UMm9omfDVE6mAR0+AMtXYftstM4R73kUCyYqRfXg/fYVsugEYjuWtPSThsFvrzoLOnr7+Jog2/kLWNksZ108z0tacE0dL8iUtNQft6MTnplcfD/hd7vdHRX+G0rgwY5kiJIpXTVn0GSxwqZHIWUK2cehp4nrzkEed4EPGBqSm7pO9PQLR1SUXQ1A8iOuEJsZexbffwMxVcBpCXvltkshCnP1Rl8pj1DSbaA+XtO+Id2+XH10b7+IvhvxWb3mgpvfU9DZUxt9O7gOFJTYovy3c= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xnEf04mBihnJWCX3TpT0U3Y0LWLsbcZbsuwN4s6E6v7rHo64FelWA+uuyYD1xmdsh6R1C5qqUVFOpoZxMsFrsSEoNWUDCY4E4Xa1sYVC7e+n/a6AgHAd1tNsSjMFEPin8GGnRxT00bn7/6FxhVhJLKa9aZKf27WTZR1g/YAmx43YazBTDodO6K89Lx1NcOqNyiQRtEXFF5bCgudfVHJ+qnKqgCV9ToGCJMRwadQdia7WbjHHSfEFCjM9rV1Kyh2vO2If1M504fP9iVLBSo6+r8R1/EAE8GJ/Q6AUQEexkvrcorVrRjVkX4c/eI442EQp+S4rlnaIbWBdClT1DdZT0UAtH+w95pWOjQRpphqXDgt3E07vcEakpotJT6Ld70BnXJuOT/YujNeFW/jcyDmeGAG0cfiioMhjamXmn3YKnmGMhCA+52Uz3bBYwxzM2o1El66kBEVbHD4qOfsax2bdvHFrHLv/gWhc5vwdz6PuYJxk+2nxDMacV0N4fH5PFuqlqXearC2d81gXFUUNF1n5Z4LJ4/mtM1TpAhmPJ2Ck3LBvxQXb3FRsxLWE4TvDJ8dFHB0hGWko2rQQ9jHwMdW3Cg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jj4l45RlU123g1x4iQYObkhUkhIdUfU6HXnWorRAR6KAPrtG8r7S72xjaQoqrKwb51Ahjjymmthl93+ARHscsBzm/MxAaZj0mRwAby7eQ8JomYM+Tj2mljQBn/qDhzhQluNBF2DNgKuTAB79bNdqC0buKfmbbz8f2dJdUPakLRc+F6upqFEFDbXEUj4yjj0UJbRB2SxM02MSwRtMu9PtRK/gU+G9Kjqb+1H+ck0Pm8PFo8z3TrNZPI3L1UV8AmtK9zacoAj6Pz3dtdgccYFCaQYKFcCq/c5lSdBFbNr+C9UOKXkSMcSfldfEfGHkAWBjtjxlqhY6YB9poltfC1UWRdJY3GgQZ+fsSsuc+rQ366goniBHi2UXA0LQbJ+98GA81j8FPPoCg2Mv6t0+YMQsrLw/g6zJc3pzXU6MJljwbHOlPd0M9jCPxpLy0VtsomIKmQWdOK2uirDtmG/ouhV0fcDwBYfinm2phIFwYYrnoRYzeiNhcc2sjdE5h+Tji/JAyqvNeBpJb0lTRvfRETiiLPkE22djgDAsPwRT/SHSDKuWfwKvXyn5mT93/Ge3nfFr2aGS7Q/021jNBsMn7dJkvmIWcfkAoLKOGWKCjwOctUBcK18S4YjfflZjGvrue/coSclqlUqkbLzwD4MjbvIcfGHm76pBlAqZnKGQepNWum0KntGcbzUOJBaWDg58+zG+2f4LZ0a5SLgOPz2EAIEuXIQFUlTdDLa+Kl74PTLYpbJkzGn/Oa0tXLmvzQ1Q1hvXYyAVw3yLwpFSq75FBCYhVyAuGDy/xTCF4YK5m8v9/z2FPRs1NDjaaAyvSf+u7vtd9EUiShLUSEUwU9sGGfNfzhwkeg6AgfjFNeB1lGNsrEMvNN7e/7DoP7X2+5kpzAeaCQYA0kiK8Cr4tUL5j0v68zakFx4wqToY8i18lFE2sGlhstQZXple+iCg5TbuOdJ0bs6vfmjbV83+tXih8ZDewuT8/zGxyuS7YE+Urtdl7Wm3kY4bAYR8LreEzSvmBZa/JZXeD0PPnhAkkMEX+IdXAXJsxcf91y9uk1cnzlYtN77l/kqgTh7t1KN94OiKPE1qCKl1WR7pcifUJeuyPx5xjfCyUV9tW2+YEzC2nIo+o2YIaupg1GYUoGEsb5YVEriExq0n/+FAubsVHr7fZVNSH4KEkyn1oS4TLDA9jUn3LOL0ei7OtDEh8ZDcrrXxA5MACWoU2ebKe6/njFDQJsAudIP0fF2+odUyl2kwHmUkNLaHxee4JiP60HASa4zq7JJYhJm9SMg5c9NUPoKA4Prr7Jsrh+j7mW8AALip6LUNB7/uo9bw3ozQKqTPey77vDoFtMJz955+jnndNqYKxcRgOdp2DJ3uljtlDeFmVjRnVyc5yrZwv9vTN0ligaKDVUG+qo4tZAQcj4IC6yR86ln83+89W5XY0PKxRIUu53FBAUb2hQVgHXdhDAWCb/9lKqzkBBzUvdxMl4NJoWhykxVQrw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29e1c6a9-ee64-40c2-2e1e-08da4a73ca90 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:20.8675 (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 34/41] avcodec/x86/h264chroma_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: bw8dM5683ONk 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 3dnow implementation (which is overridden by the MMXEXT specific implementation) at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/h264_chromamc.asm | 4 ++-- libavcodec/x86/h264chroma_init.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/h264_chromamc.asm b/libavcodec/x86/h264_chromamc.asm index d59c183371..5704deed1c 100644 --- a/libavcodec/x86/h264_chromamc.asm +++ b/libavcodec/x86/h264_chromamc.asm @@ -446,14 +446,14 @@ chroma_mc4_mmx_func avg, h264 chroma_mc4_mmx_func avg, rv40 chroma_mc2_mmx_func avg, h264 +%if ARCH_X86_32 INIT_MMX 3dnow chroma_mc8_mmx_func avg, h264, _rnd -%if ARCH_X86_32 chroma_mc8_mmx_func avg, vc1, _nornd chroma_mc8_mmx_func avg, rv40 chroma_mc4_mmx_func avg, rv40 -%endif chroma_mc4_mmx_func avg, h264 +%endif %macro chroma_mc8_ssse3_func 2-3 cglobal %1_%2_chroma_mc8%3, 6, 7, 8 diff --git a/libavcodec/x86/h264chroma_init.c b/libavcodec/x86/h264chroma_init.c index 36bf29df02..26883d57e9 100644 --- a/libavcodec/x86/h264chroma_init.c +++ b/libavcodec/x86/h264chroma_init.c @@ -77,10 +77,12 @@ av_cold void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth) c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_mmx; } +#if ARCH_X86_32 if (EXTERNAL_AMD3DNOW(cpu_flags) && !high_bit_depth) { c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_rnd_3dnow; c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_3dnow; } +#endif if (EXTERNAL_MMXEXT(cpu_flags) && !high_bit_depth) { c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_rnd_mmxext;