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 80F7E433F5 for ; Thu, 9 Jun 2022 23:57:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C25668B878; Fri, 10 Jun 2022 02:56:18 +0300 (EEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070065.outbound.protection.outlook.com [40.92.70.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F393668B86C for ; Fri, 10 Jun 2022 02:56:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aFLyVXMIpg/nkPDv6diWiXrx/BfrWqQo3WOA1rKtVbRhZaD4l2aSU8u3iK0PU8A8Ox1q+ShxBA/XpL0hbQqGu8oy3yVyGayEo48gEPVU0j972a1ow1bXkPGj5OBYikddCpFIku92eBE5/lhZVww2jbdtQHZDWpa7RxJG6U4+PWVzyYwntdiFL0OmbOSbU7gjzPYWn4WovL8BhlfdZw8VuxuvKH5ooDFZkizFbZNhHv5kHOfWVrv5xiFFojhc4nA5QsZYZgJLD0NK6dQjlvFQy+Zbhgjykl86v6HDKlxAUQYxP03tuHexYIRUvcJyzeImmK086n63chg1fXjhQHenpw== 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=EwMWeE0iI4bbi4jTutmWicgpVeLEb9TEVFYjaSsUHhc=; b=gXFze+1aT/dKKp7uIQQS9hyJcX8cYAnLHPjXUacjLfGhlvAJAvqzPDEs9nubDfe/IHo/FuOa/DSWjdCBdQb/JQLuHQdLm7fHnV3jxGbAFY8qlvNHsG0EBZwwmgtOdRzHaoiHy2Vd1gKJxqGsEiHjy1ZwLZgO8LlICzzZDsVa42S6qX3hUOElFuKg+CNMpdfDLIwjKLx6K8siOu3ngcHW+DRxfZ8uM5jVK+yGn/scyq2k/bf09ZbS3DxAPI5ddmr7kzXFcE4CbmNFHtlPUrk/gqDvquWQ3tcqHGpHajbCoV+TYi/JWlf/p8ND73bnDaOgPtI9/UyfP6DibBr3XkCkMA== 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=EwMWeE0iI4bbi4jTutmWicgpVeLEb9TEVFYjaSsUHhc=; b=eKL1JSF8D4s6j5meujYcAT7SA42GTVX93tg+DSiaCr2NytTx3OUP6MZsDmiuzRLDAqP+71kqwvtnQftekc8vW9n7R3AP92CmzwdGcCgwY4yQAQVDJKNvphm5lpLpsofRF4SMHy+sSCom4x5raxm3t1FkxRtN99+5s+5rUs76/TtQaV3ydDrzT9yYct+JDHuneDePik/NmId05D4MRkpaf5y1s01SLq6vbpPcxoMPScPpUYNV7s5qTWcyPhdeFnimqIa8iYRkDWt2mGfcgbl1E5nJr+pszx0MYLiAPVUnugMDggjdxByLhzs0gRvJoLpZVsiqNTQZBq/yda6lUkOuxA== 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:15 +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:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:54:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [c2r8TMiQUlf970DN7CMTdhtUBLjoRGkk] 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-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4041be3a-e42a-4816-77ca-08da4a73a3b0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKry91Qzc+7yrqqC4Hgj5YvO5zT0ngXti8FeD2zRVkqUa2eddzL7lVAtSSOkMH0O+C0+wc78WyO2TIUhuleXAlcS4NH04/5ZHN6r+00c/bgpkGeuPk0aPq770iRqz3MrW67AN9LUqerSW5cmTmrsO2rrnQlxhaT7Rn9w5QpfRCyB9K65lFB0G2nUuR2M6k51Nsf48CTzEBXgez+TMC+fYvueLNaz/g6WgkkllhuWAWmK/ZjSFVoaqBVof6N9tfP2Ok8C5BTCOJJq2BM/k6fs2aI/wTzMaU76XA/58YJ8vW5ubaod73nuoTWZii+W9AbE+v73ouVnxmyUSI7/H0xzulpBeJCMQA11X94Sf9BavwNqb98PmDXxIgHxFNFqJKJUv92yAWgLKQ75qAToc1ecj4E/dPECAzGl+KkxD8Zl40c4MyjoiMekgj2js+vdRc63LMRLFmAy2xl2aJxM0nxFrUBvl1rcfU+GlyXLnpu6YCkhF1YEdS/ZEavR1c9Xbh/kck59KVhXYFe8Ciq5vzlROmDFJm0vmY9lPX+H34Y3jA0CBHitce2ZqUL6MH/t5bk9cQZouK6laSbOq7Tmf3ZvMRnQkZI0Y5pnqOkDUzJbIzBhFdFsRGeMWYewymgDxjTatRX2mCdHH9Sf+G/2lKcCQVorg2XaJCCuN//l5bFAacw5jQGV8zbiUWH/7GcttkVY1VC+nMDu0yQYP5M/B35yKta95fZjz1F5+uRs3Ceupyp2w= X-MS-TrafficTypeDiagnostic: AM0PR01MB5809:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gbuINXaXq1wQuBX9hkX/6jO9BlwA7HSlAiHTbEtIz0QNgU9+SKPg22WO05ijrjbzsDqfkvSj8kViq63vI3h7uRseW8+La48yaO2FYwzSM/PjKgKeS3zGs5M7IGXiKyCf5u3lo8xE5VQT+GZyn4/8XmraKGZGtRlych8zZz2jN0tbd0M0hthG9EtFnCJTXi+ZwRqjYTyLqqSjRavF8CAw/kbqWDEA8iL9EI1ACdOVFQJit999d92hBFpA3XdT2S8mKyklrppNuucfQeThUYJtnQ2Pp7P0xk6Tc1W520CnNTBtacuDwQJgZuvY8cueyeoj17Qy4DJu7Q0dtyBz0zAyousr0qFKkxaZg56Svvq7OXiCZDyjEqWRnHsztfBWfkXh4H4Ltk08H92EUXRRAQMOB6JsyRrYm7xiqRuoNC0/l1ixt6BIsB/iCyFp++4C0rMbNkxBrsdpKH7yRmttaavCakSObS2qoghTcGWOE6N0e09LEYDACFSUgQF0ROAQzAljF5HZ1+dEgYf/rj2Ru/taH2lXwpcb7PMjgmaHC1frNKgn7SGsSCMHFhIuSv7BOv9pL9jLfkJmdy31hh0SXPHinw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cIspuwrH/hIdhYwKHddlwwqC5olk5eLZFAeedfeNQ0CLSGD0ZNSPiQWKmiuE?= =?us-ascii?Q?d6w82crSVcb0zKX9iTDDwHprsoii3DT/RpPzhBDwCiXCeLT11bLNVPiLmImY?= =?us-ascii?Q?mSuOQ0ltc1r1dQQQ3JcSQ8ukvEVjVG86V2/cUe4Q5dXON0X/x98QJ2muSZy7?= =?us-ascii?Q?C5nVw9FcO5QprBpAQo2YoRzJGUfCs0s70BLjqRmnge502PrhetOjRHpBYnG4?= =?us-ascii?Q?8bz7uk3dKTiD6Li5sNZSzPzZtZVGjfBAKTbL4wbnTNM6hvxitns+AZCqwLHO?= =?us-ascii?Q?zNpT95GhFXSa/yV6BQUWLXmEvW4bfl2EcGdilY9E7Jlo3glZtN06CHtcp3TZ?= =?us-ascii?Q?0U+Lt8f3rk0iSUfuqsShRNzN6RX6d2PbD49xKCwcU7DrrBUe6XllYNlOFDOt?= =?us-ascii?Q?/NKXc2dnFmnHlxF+CxvoKe8HMtHAAOdFcFug8W8vM4RF9XKO/gvO7v9i8V6P?= =?us-ascii?Q?Jk5Jn87Xaa8RsVfT6uCXINSmwGsIancGT9Q3MiwC0+0H81ikmF0e4LZeJPDR?= =?us-ascii?Q?r0x8Jn5DzFpKgGmgGg8JHKF8T5IufLwUyCzRw22AluUAqbdwdPIHrAHpakI0?= =?us-ascii?Q?4eC0j2APq/9yU5cbN5FQ1qcCCSoxZucWLowvWQ8jqcB92jmhQrftPNj/UW+g?= =?us-ascii?Q?BLP9x4Kg+9IWaSYSGhyZx97PVShVPJd4cKRvj4Pt8xVjjYFoS1wzx+BIsAjo?= =?us-ascii?Q?Xu4jMapOttlMDTuNSj/T34BBwpDRkOvNMZoUC6IXXkq3cwBJpXpGiQc/5oDH?= =?us-ascii?Q?GygKFFBazCo/qvMKiRhlDe6+MsFYuD8SYjTmPq9rFBJtfaG16naKX1cLn/qp?= =?us-ascii?Q?AWqBtjxwb+nKld+L+w45/Rsmuf00T56sGrysmNphKEHc+pVIEu6RB/SnOEuU?= =?us-ascii?Q?VGpR0MsppENFGe11ZcUKYM6YANVIxz/JcjCEjlU8bBbHsAheplBPdhs6my+T?= =?us-ascii?Q?UZQ38FpjtsibIoPD9R1gVo5sHerfjxlULVjcpUpc7XL5B1U+3bcZX8km2JNQ?= =?us-ascii?Q?HImkzww3M05ysYIwg9Rd0Uvs1MHbMnhkqKMMNq31kKJTDwpNOlEDtpTvTUPO?= =?us-ascii?Q?Ck4uBiu4DL9Jrr9xqwgXV5Qymu8m6yu+YMlKv0OZWG8pek3N6LdtFhmL1Wod?= =?us-ascii?Q?aWVCgTXI/8q3JgXf+EqFIBDIXq9uhvpffu9oQYei9MBwpe4G1Nz8WroWzHAr?= =?us-ascii?Q?Xn+Bux/KBNkkQX31VrISwptu8AnXZtkfcsVN2DnJzIIuqesYrnTFK0l23Tgl?= =?us-ascii?Q?oKF0mkV98QnNw/jei1Wa43kxzJ2Dq4QdUOTFylVHJYpytgDTiGkewurPk9Xi?= =?us-ascii?Q?cT7rdtnIsZd9tqZsFsFIKno51oGSKwQ5zHzFdSBPoPtWdbskKDI8VhkdzmBB?= =?us-ascii?Q?CDdlwDPNs4pADV+vSEXihmY6D7kkAg20poH62kRR0B1XChj4H7gN0wh0H6dY?= =?us-ascii?Q?mBnaQAWqCzvAagyXroqMPzuz1RYQmRiSiWwt4utG684lMmh4GEQKyg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4041be3a-e42a-4816-77ca-08da4a73a3b0 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:15.7260 (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 12/41] avcodec/x86/diracdsp_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 diracdsp functions at compile-time. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/diracdsp_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/diracdsp_init.c b/libavcodec/x86/diracdsp_init.c index 8baacf3129..c9dca58f1b 100644 --- a/libavcodec/x86/diracdsp_init.c +++ b/libavcodec/x86/diracdsp_init.c @@ -87,9 +87,11 @@ static void OPNAME ## _dirac_pixels32_ ## EXT(uint8_t *dst, const uint8_t *src[5 }\ } +#if !ARCH_X86_64 DIRAC_PIXOP(put, mmx) DIRAC_PIXOP(avg, mmx) DIRAC_PIXOP(avg, mmxext) +#endif DIRAC_PIXOP(put, sse2) DIRAC_PIXOP(avg, sse2) @@ -114,13 +116,13 @@ void ff_diracdsp_init_x86(DiracDSPContext* c) c->dirac_hpel_filter = dirac_hpel_filter_mmx; c->add_rect_clamped = ff_add_rect_clamped_mmx; c->put_signed_rect_clamped[0] = (void *)ff_put_signed_rect_clamped_mmx; -#endif PIXFUNC(put, 0, mmx); PIXFUNC(avg, 0, mmx); } if (EXTERNAL_MMXEXT(mm_flags)) { PIXFUNC(avg, 0, mmxext); +#endif } if (EXTERNAL_SSE2(mm_flags)) { -- 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".