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 E890943407 for ; Thu, 9 Jun 2022 23:57:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8216A68B884; Fri, 10 Jun 2022 02:56:21 +0300 (EEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070045.outbound.protection.outlook.com [40.92.70.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA1E868B84A for ; Fri, 10 Jun 2022 02:56:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LxjL1qS2GZuUBMm7GfUutuw4CDussOMozBYxO7jj/Nq/GYGxSrgXT3WycdsrN9Pgcgk30kAd7Pm9Yoeu/MCvqIQ434nGYQL1Z53UBrWyB9G0luf5hPrDn4w7Gj583jHVbH0UBHs67uNsCYaiXOq52kHEde0ec+MasLtGN2OxWO6wq6pgHCnucWwCa/6ftdCJc9syqqyy2UA8YelxTmAJt9iS4wm4K2OTDYl90e/rImkGXI0xpt5MbZSLAfga7YqrqJj4d3eB81PLqhOCTmm2gZ6DfVaaVTmUEXOGxrnus/sR2eJKI1GpT0DhnSDuOuELynImR84QJSLRv7HqKXBNAQ== 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=zTBTY8UELZY24n/b0cGoH/HLCxYOQxbWSY1z5JHjOjI=; b=a69r5gMGQux3Ub/xkjlNjkm1SbLul7mUXjv+G+BjCTilrTKHbkSQGkU9W91w5X5HjjL/rfXPoW+/yRsgy9JwlsvRmp/xMydG34vYl9LHYAbTcIglc9FcRXpaLvxTruOtJdCifBwXdjuNrguriWeYESoVfRxhlsJ8AAgftfVJjGI8KDCHXUESmYpF4b6udPLyfkHCKp00VNj34W5XbQzhgA+wyzruhprwwjofxqtZZgGx77XN+xtEpXZF7gishfzYxu+Mhum2Ifo1B8bcSaOZ15Ua1t+iRx5iZy/b4wsiwktf1GrxExm7471o0+EWhs75zREA1slgl8nl6+zDSZ2Img== 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=zTBTY8UELZY24n/b0cGoH/HLCxYOQxbWSY1z5JHjOjI=; b=UWVgQDrMvos0rBc0z78WfXDT2hm4jY1FRrMUsZ0MnqRQ3f+irDqUIN4A6/JiNi3m1cv3d5/cfAFGTi6cIP+XWpwvWTlfn0L75i8QmdhmQRfm/WOhKVYLeZoFODVXY3dyKOFc3JUBeNYpSkDr1CMFcYbjZjTKsGKP0aTF9DZgX+zEaxt6Gpb4JFoPPlNq/QUW3rjCVTFaCJBAIOZGa5f5wM8u0rlu7GeMyH/mLJMzUIVDH0jK7Gt1lK4Tk+zNcKQY/K0fF/j5CxOX3aMtTCBohlDYWmcBtd9L8ia5nG2e8jBwm/5s/g/2KKUm12OorwZIbp1YP/VkG+Y8U/sOzt3RUQ== 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:18 +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:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:54:55 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7snq1LROpzyYBr68lxxLKQUnbPk6XioG] 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-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d92ae2a-9575-4e2f-7805-08da4a73a575 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKZUEsqnalwNSYM5G7njFZZnSZ2ovhokaoSm9EbfPh7oz+zl/yolkbCEqtn3kdsUUqeCdTtVnsYNZCA+t0iuuJO8Ce0s3XPXyBWGSSSJV1t7imod35rTJ9klDelqa+wqYqBnw/7WBYeWwgzX8iUQS3uT5bvBgozRJrhxGNMBnEE0DADCrGAB93NgcRtqkZMNOF08PJj5fS63hmCj5ePBoOA2Napz9rDyupyysOsxAs+1F3GXRrCbRAJN13rekSHlAr9nW8raJvi1+8J/ivB/Crlxcm/VtJHF2yJSyHjJhjAxLN3wEqxJb+N6ihglWBneS+rNBIZtrtyCijJTusragN9+Zqq2NW771llad8nMlNNu5AzPe3KLnaJzXpwBNg5HkeFbTwowmaRbeE77xpQbfEU90q22TLWE9yvQE+HRZomCrJ9acS53tk4BefhH6ubwBxxbhQehiPxTueAtZw1HGgY1qZrkE6xKwdfoGrI4ENNKZBHao0aUX3XZIEFrowcLNlkvm0keky9RGHQxNRcdkJuiFzNKyeopYX3yOMmt53HZgM0fUw9qL75uHHoyomyLMsIGWWpfO2fy5m054v/n7J7TEiyoikvJ2Ik+AwDR9BT6h/rjv8LN1+wOJ8q9p5aXjwV9xAfwZzxc1VZdrNLtZyQtpwvBW5wq3fC2fqap/0L8dGjgwGa+K/RDHhKwnN+zdDip7Hp4QarX+bhe9/AiNBkzY2/e1ujph0H665Zb2sMdk= X-MS-TrafficTypeDiagnostic: AM0PR01MB5809:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AO9PSEhEJ0LhvBB6vyLJkxiBKoZD4j8j73vWrqfmozkazI1hsTlbGB0LtA3PK109TqvD9GANn8vNgK5V1N/FazaILi2m4Ib0lelU0p/Y4y207RPL/tuN3s2TKTb8Jjewv8MKLYEaqHgF104F6j9I8kVQ4nXTKeWlcFsKfz2b5nZ+MsjMKlKBMRZur51ArheknT9+X5X8JLHESux4JDB0Af3wl2sTDJYJc+SNlYgu7Gwiroeexf6OLTRyr6Ww03duAgwOPysjyrQWtOJqU+JWwT7G4jYqDqONSRygIUy3OLW8NlIRyeyR/jXHnh8UsWNbG0Oxc8CmNerDYcWUQQzdbuqtOK5yRE9hzrkuu0hZttRSGR2Gj+kf4Db8yGKVmuFu+W5mYGYiPE4tLjn5ILGIKZZ5hVytj+OeQ7B8YYimuuruBapQ7VRgaOEzLxq0VtPFUoRcIrCKlpYjXksbeamieOOaYcLNq9ZuEXaoHseaR+CrWyZhAVtlRyq34McQkD20sf+apPxV4xKllg+24cSNKGC2pnBCboYvOKS7nkYMi4G8Mqv8M+Fs1KFrzi/7vsr6y6fJyCaRtzhrLRZdGih/NA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?quRUQzM+wIgy+cWgnDEtUwIxKkrzafDHrfRC23WXIOE6/oaCjEDmqP352NxM?= =?us-ascii?Q?vTobdV5HyN/JAozWvbTJiaEpbkJxzys93y58Ut2ZKhgHroDDrNz9cwrMawba?= =?us-ascii?Q?7hpcsyZJBdylEJD4ZYE5ucJaLfYv7kC0rgIbbrAJsdi+8E1Lsn4yl+tcQpx5?= =?us-ascii?Q?SO2Xsqm8/DBM7VOP/vDha0VYGPszgDJ5Lmho4csc7FYMCp1SGNZhzIfypgmg?= =?us-ascii?Q?v3uGkY0pmWc+1vsjy+G4FF6O80aAm1bpQVwC/fyfRJ2q1M+UX478EDDuxWHZ?= =?us-ascii?Q?RcQELHig5ItxpkTQt5EwyxP8TRLYRRFNSRWUiwGL6gR4TgTngSo7yfOOXH//?= =?us-ascii?Q?x4CUowjs78Qhe7biqj4CjXBS1u+5PpRqvMbl20aAsVa2MJXnYv6XYQf9X1pw?= =?us-ascii?Q?cLsx2rf9Bj0P+OHDNywNivBYKnuULSRYl5DRVItEFcHsgCeOSUDLG1418Qiz?= =?us-ascii?Q?6azZfmaEHkZJd2Jym4cTLa0HnNwxPRXdM3brSRBkrAK0hpT2tN36ZpHVDupx?= =?us-ascii?Q?BdgM/Ljsv8bV0Lhm9La3cgvKV+ke7P6Wa+QCAldZpcKGyUKX5wKStERc348d?= =?us-ascii?Q?EcuQpYoM4FDXqza9YV/IWo6GsaPdFBL1RxzRGXSfD43dE9WeZl1V2D6SC0S0?= =?us-ascii?Q?yJL8IJx9ooLclHD9w812nX38miiFwqdDiAlQbCAeG+M05wUlem9PPy6gU60f?= =?us-ascii?Q?c99/ERPTwcprtnFXJyxM6MxyVTBvCWBtdyJrU+r+EkOQ8/n+GiMgCSYoqwY3?= =?us-ascii?Q?sXTDSbtJfwKGK7A+7YkCY8w4zbOIQSWak5IIX6ka/HGr27Hmcci0EcgeHzxy?= =?us-ascii?Q?1PIUEu5LYPrhlwr/M5ImZS1whyG67wsg5N3YBGVAuhtEZ5vsjPsko1OQrXnl?= =?us-ascii?Q?ktrq9+VowWyspUZsdckO/o5sCTE+Fba2NQTTO+dQhJFwc5FyLg5T5ZUwVIvh?= =?us-ascii?Q?pnoU6wkhaMU/x6FzvrFsguOi6onVenGrzmD4K9lUUo7f2LiyC+ndZeEyYhYD?= =?us-ascii?Q?I+2S9a7baOVektg3kGg2FcaKTZmGxwx6zuxO4v+sgo95K7kATTc24HEjUrNW?= =?us-ascii?Q?MrP8qzMsRvd45zleks+HoZtgzFCgW93hMYAMlRdsAIKCuvys9eaAE+1uNRLH?= =?us-ascii?Q?phOQyoZkD1vo7igTYxPuUD2g4h6ORmOX27CI+Z9DnbARXfuNT9w8b6SJ4sdq?= =?us-ascii?Q?1ELCh3XYjolG0DYK9GQLC2CrOJV22UOWXhq+wxtJJp0ui9pHZiZjyJO3AmG0?= =?us-ascii?Q?xNQ6dzb0f0cHMsvHAzsepTChvWYVBOOIZwg+leNa7iJFzgptWbRAAJxG0qkC?= =?us-ascii?Q?qTvSPo/3E599AheEyR9YkKgzFQ54NEzEg4yMzz+oe64zDwnUcKQ1JmOLN0GE?= =?us-ascii?Q?HCqM3d2JYw1JNWP6B/Q5j9bpwAzN9UdoZeTdGLWmbC8OV82EHH1F8FQeGsPQ?= =?us-ascii?Q?MdChXoRC0oDr9YBVX4QOGpHJCQfA4naEegfQM9IBZLYj6yMoeoCy5Q=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d92ae2a-9575-4e2f-7805-08da4a73a575 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:18.6323 (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 13/41] avcodec/x86/mpegvideoenc: 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 mpegvideoenc functions at compile-time. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/mpegvideoenc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c index 3691cce26c..d9c89d568b 100644 --- a/libavcodec/x86/mpegvideoenc.c +++ b/libavcodec/x86/mpegvideoenc.c @@ -42,6 +42,7 @@ DECLARE_ALIGNED(16, static const uint16_t, inv_zigzag_direct16)[64] = { #if HAVE_6REGS +#if ARCH_X86_32 #if HAVE_MMX_INLINE #define COMPILE_TEMPLATE_MMXEXT 0 #define COMPILE_TEMPLATE_SSE2 0 @@ -64,6 +65,7 @@ DECLARE_ALIGNED(16, static const uint16_t, inv_zigzag_direct16)[64] = { #define RENAME_FDCT(a) a ## _mmxext #include "mpegvideoenc_template.c" #endif /* HAVE_MMXEXT_INLINE */ +#endif /* ARCH_X86_32 */ #if HAVE_SSE2_INLINE #undef COMPILE_TEMPLATE_MMXEXT @@ -96,7 +98,7 @@ DECLARE_ALIGNED(16, static const uint16_t, inv_zigzag_direct16)[64] = { #endif /* HAVE_6REGS */ #if HAVE_INLINE_ASM -#if HAVE_MMX_INLINE +#if HAVE_MMX_INLINE && ARCH_X86_32 static void denoise_dct_mmx(MpegEncContext *s, int16_t *block){ const int intra= s->mb_intra; int *sum= s->dct_error_sum[intra]; @@ -218,17 +220,18 @@ av_cold void ff_dct_encode_init_x86(MpegEncContext *s) if (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX) { #if HAVE_MMX_INLINE int cpu_flags = av_get_cpu_flags(); +#if ARCH_X86_32 if (INLINE_MMX(cpu_flags)) { #if HAVE_6REGS s->dct_quantize = dct_quantize_mmx; #endif s->denoise_dct = denoise_dct_mmx; } -#endif #if HAVE_6REGS && HAVE_MMXEXT_INLINE if (INLINE_MMXEXT(cpu_flags)) s->dct_quantize = dct_quantize_mmxext; #endif +#endif #if HAVE_SSE2_INLINE if (INLINE_SSE2(cpu_flags)) { #if HAVE_6REGS @@ -240,6 +243,7 @@ av_cold void ff_dct_encode_init_x86(MpegEncContext *s) #if HAVE_6REGS && HAVE_SSSE3_INLINE if (INLINE_SSSE3(cpu_flags)) s->dct_quantize = dct_quantize_ssse3; +#endif #endif } } -- 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".