From patchwork Sat Jun 11 22:25:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36167 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp510913pzj; Sat, 11 Jun 2022 15:25:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUSfBwh95PxMYC61alewSFy+G0KbYrOqJPZF6ScNiEuQKYesrVaUOpPoF47zR94qIY0YfL X-Received: by 2002:a05:6402:1d4a:b0:42e:93de:17f4 with SMTP id dz10-20020a0564021d4a00b0042e93de17f4mr49885518edb.8.1654986334062; Sat, 11 Jun 2022 15:25:34 -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 b26-20020a170906d11a00b0070790bfa9a2si2650782ejz.154.2022.06.11.15.25.33; Sat, 11 Jun 2022 15:25:34 -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=KvCJpzfM; 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 7268168B3DB; Sun, 12 Jun 2022 01:25:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075044.outbound.protection.outlook.com [40.92.75.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95A0468B1DD for ; Sun, 12 Jun 2022 01:25:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eJ74DKO+nPeym7cjPYpAlAt2NPYZ5b1KoB6zI8A6wjEzSdrn50WZhwn957efQbGi7KvAP1LxaAXoB3YSCowZgBluNhC6qpI4YW3Ii7vD0iBrUFMbjoJ3BR4WWNZOFLdCxXluDL8059P/niBEfrHva+D069bAPrEmmGeBHDb7ndEzIfnJDdlia/sK8p2sd0SKKWUwEE7u9ALnLQiA21Rw9HYn7fyXPpLOXK0icWjbcDztL7bKGULaNy7gjYUjZDU7Y8SxVRWDR4ztstVLIuaEhdkuKrvgRBvEmpgCl27MV3B1gMuZv8XoDtIp0O4N6Ra4wIu4ouh/J+rbAbh6MG/Kbw== 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=bLRYM9DLXRf72Fd2i6kp+FFQh/sjrwuMrrz5PtBaAgM=; b=QfjVNg258AyOMT+Wdl4L+JuR7aeHKYvVbKrTtxxiZNeuhJ0JAd3GceR0aTdsCtvlj54sTiZN+EDCFHoJiBfjDU4Y32Qbm6nUAfSoC6bj4QWtFsujBPzv/zb+xhLuTSpKGV4JwO6njWV8AGDuQH4vPU+IXJqq2Cc41GPu2zRfjZqWAcYJkkhz8adSi7n3HzK01smhzm3KzEIxEGDMjhm/ioHrnSPBzdgCbDj0EJrlf0hDI6iJAWAav2WJ2ULOLXJSUna0M8yrQsSFwUwGXKRg4Z5Ax0zfhUaT3Vn4hqcFO3CAPMRVRKhfXBogdnYUh7UISWxRB+lGMiHcYVDvjzqMEA== 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=bLRYM9DLXRf72Fd2i6kp+FFQh/sjrwuMrrz5PtBaAgM=; b=KvCJpzfMOj/DdOgK6+ngNzltQmZS7sNqJS2YiGPJpVSes8/CvXV+p0+oKvAnFaND1Do7a87hKlAZk+bmcsxCtreUfFrnjqCAVkc1+7Tca6SupDWH8ZPzgKs6ARAVizZAyM7dGcvh4krTeHBS5PcYESIIa0qsGOQmXsnIa4teHmq+Gxa2Usb2pKVDk9Qm7ES9GCdZp8iuq7rb6SeBBkaHcRd3FA3XOzRQpuV6Si0G2i6jJedZLKS5wZBi8eiwaDyJ1XF07SwXeKv2T4HyaENpxXgJDw1pS2X7Dd7RONEi+50vx0fTG8GRdUo/0SEFfH/7P2S+1P7ZJ0ys6sfy4b+7DA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR0102MB3267.eurprd01.prod.exchangelabs.com (2603:10a6:208:22::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Sat, 11 Jun 2022 22:25: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.016; Sat, 11 Jun 2022 22:25:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jun 2022 00:25:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [GKDHgFalKog/1K/Vt/QxX/l9JXOn9i1b] X-ClientProxiedBy: ZR0P278CA0163.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::10) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220611222502.3754378-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b715ab6-a730-490d-560b-08da4bf94174 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3UK2i+0mlfdxnJIRCWJWOE9kYZcUsReS1FANwYlA86q7/5bQAz4c7s5FlTq1iRQ/NUbrg1M3GOn0xJzaSBM0kV9NlEUh1oZLJd3cVowUPr1j7bl97Cod7KEEddJcAXjdHJAy15h+1qO3DYg7gwalMlFTKRw+F9ehGfdefI5bQMr0wEznoC0RnrtVXflXgBNw/YGva/UCujIBFAu+HP7G4/0KcWVvFhzNL7RTmK6+fVvDGXlrkZ1FMSht7952uZ0V23IJigDxi9D154saENNCGNVDMXqw2tamnp/F6w7dXp+iq2ckK+4GPN3RLa9cvuRQ0K9+diE+1ZNa0C+BYNNlEIBtlglnBOjFDdw3uUTDkFvtj3HhvhzVBekfKajxSYACvgmmDw+vsQ+hJWyaXKrwfQ+f7eZXinsrkhjeIaymkEpgvtQK7PkNyEva9FL0r1/8yIu0YH29GiwC9w0vL0yJs9LKRPRXLVmhjYUIjwijgXGOOJ+whVRI6gmpipoRRBfn441Sr60JNfq82QKhLn6kVUUf2KhxsFIWmUNFgqwBuApi0uLMbSdNPgW2p6IK6pYssfHXcvzi6hW4Xk4TGhNtlNhMQFJLCG4NIfUKoseObcRXV8uugXxFtaE8Twg82ds8qLpP/nwk4H6ktuBme2rgmElgIcv2JsgNBFl7+8YjefxN7IwcF6sg40hFu+IBVaO6h6IonRsh8FoD+lENYtCjXrwPdGFuZg3Znc= X-MS-TrafficTypeDiagnostic: AM0PR0102MB3267:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Hyn8lPCT9qAhTjige6tSQYqZL/4ZOHfIMxKE8jtT26YNTo1oE3wZv4DwJJdqe/jbH/eD0whG63GWtN8QN6JFn1L4MCe4GFegZyNHkpon28/cueQ6UqbgxZb7xggcK1kpjM1ndt07cj4UGLQqV9HECHHSwJzvOUPIiU7IhgHBP91zSUmYa+E9eqYTEXVQx2/BjLWdn9FKQ7RvPHdrzoA+nj3+YTFLaO/CtwOOaSK4O/8N9QQ9smJtf3Oxl6Lx/URY/99j15Yu//nFLrEZP0TPPG6J1SiJpHanNVlY/8ihH6CgJ6XyQlT1/5mxOrddzqua4douWN7EK3VXCPvVxb0qasUd8JyzwXVmCVQg5lh1ygZ3hv/M9Tba+nY2N3YTjojbi88b1uAJZLmS+b+y9K4KdwgdPYf6iztWa9RFWXSGbWCilywRPG3fBTDGTG92TasOSHreBivzyVi+u1uPYOc3r9zEAgQWXkNgJP/75RTUCg6c1tZNlHyUVlf9jU00xG31VD0vL59AHDCnATt490rIz9K3phdXJH3ZmwtJhADJouPu/KrWrPnqD9fQwgejtzbxTxR3SlG+epP129SccciXA8O0NVSQm7C8iEAswkJVVfsMuizF0EGvEZWDkyPogBZA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KptNeWZ5x2YYbmvltXeZ6Rzd/PC4gnbFwsLyp6yBQhjvPY2QDHKLtjy7Rpp/hyCqtUQO0B+kJB31EnR1cpPiO4kVuE0gmTgh1qWc0eNhqzS1rpq0AyfYijOfAMLDYhHim9taMgPjD9m1uNt6Vziqi0DBbVFFrWaS7QeMg86ILch/yKne/8/tFJ/dMksxslb1WJbxNGcpMPxMQmN7oulp1zd4pAAFP4K3caT1gVvg0Irvl1N7bAsz+3XBWScoxgzvaT5n/1vMdKt0kuDJdEhIcZAYv7JMfuF8qDYlBOdu9Z2jSeKhFaMOq/715l34I81aREm+W6/1WRidx9nhuCa5E/rvdNxzZTVwSH/+EOh9YhBlt4e6CiSeWQGhzsG7Z9ltT0Hcq6rmdPPzZ7/pT641m9qrgo2zXU6I8YbK4zW/QArUj7ZQWQLWy/vwFr+001y8TIFYHodzxFs7bm9+VaqTdhhHJtHqgPMQlHCZ2MP4BV2VizNdG3sM44XhB5MryimPLcM1oCkRhLETCmjGntzPTAyNipA8P8tckREoV46/k+ZcnytVyAvS5aQ12z8t/ArKJtmNE9I+McUwy4V/heS0htDM2BwGrWcIY2yYNMl19uqPX8tgmNs/+xmVBHf9TaAiPKthSvz+lAnOqT3Wp+R757VpqhZPkgBf/lznevchTVqyI08m5QRatemsdakm00MbpvZdMEE6NuWFrMhfE5d6kcrORHPDudqPhURReRGktce6Q2ieRCgL7mcG77JYvoN+2Meh7EIyAnG514L8iRVdGyxwoOebXTB/V4NBc/o7pQYcdrZ+oX1f2q41UFVYN6jUzEUuT239SXz8/ri56KRML+9FWLy3e0B/F9LURm0ypORh6a7pAEemOevUrwDldQZilHyzdMXHhMsxsYWF1TPgc3vFu0kE96NDbNS0h1WdvTXtiqlJe9XWIGr0ZZN60n+oQJOIIpNYtOqy7+lciRydR9XNOgaF3Zs6sm9IYr3uqTWiYNDlUdiB9dxBir88YZtuBGLeSLxrmXAz+X+IySY+aBZMqIZBLcsS07AWi7qUHI9RNGnlUaPm/m/6cZAMURotS0+CSyq2i+I5+zKVvtT8S+dIKdj/UoB+tDQQ9QTMD8G4UQetyS31ynOKaSOSQL8OiVHO/v0W7rAg6Wlq63fSWr0LomWUCSl37SX+TqnD2PzcIUyeURqLwjTwMGhKo/6zovLMrIs20W175oh2BBcEkxWaC62aswzD0xjJooRsGAlYXdn28jm7qIZYOJ5MqEZfBajlsta7ohAezbrvDELUsI+JBP1Zfd1EqPd6Ql18MRwuLbpUA5wAcb4u4rEESZ1gYsvvD+Tk3NGYkeWVwrWW6HQKZc+8IHGwDRtCzwhCq23XJuSgghlaEs2BnIFT0ewTTn5gBUP7o2JiF+1dHLsnGPssXxOhx/jxpnxyjgUOdOONDvyTeVArvpHWdMA7AhFBvs02Kg/ZZnIfDE9ddc7Pdg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b715ab6-a730-490d-560b-08da4bf94174 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2022 22:25:14.7179 (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: AM0PR0102MB3267 Subject: [FFmpeg-devel] [PATCH] swresample/resample: Properly empty MMX state 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: hiUzbg4UJ6mG There is a x86-32 MMXEXT implementation for resampling planar 16bit data. multiple_resample() therefore calls emms_c() if it thinks that this needed. And this is bad: 1. It is a maintenance nightmare because changes to the x86 resample DSP code would necessitate changes to the check whether to call emms_c(). 2. The return value of av_get_cpu_flags() does not tell whether the MMX DSP functions are in use, as they could have been overridden by av_force_cpu_flags(). 3. The MMX DSP functions will never be overridden in case of an x86-32 build with --disable-sse2. In this scenario lots of resampling tests (like swr-resample_exact_lin_async-s16p-8000-48000) fail because the cpuflags indicate that SSE2 is available (presuming that the test is run on a CPU with SSE2). 4. The check includes a call to av_get_cpu_flags(). This is not optimized away for arches other than x86-32. 5. The check takes about as much time as emms_c() itself, making it pointless. This commit therefore removes the check and calls emms_c() unconditionally (it is a no-op for non-x86). Signed-off-by: Andreas Rheinhardt --- The reason I don't add an ARCH_X86_32 check is that I intend to remove this emms_c() again shortly. I have just updated my branch [1] that removes obsolete MMX(EXT) by a commit that removes the MMXEXT resampling functions that are the cause of this issue. A follow-up commit then removes the emms_c() completely. [1]: https://github.com/mkver/FFmpeg/commits/mmx2 libswresample/resample.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libswresample/resample.c b/libswresample/resample.c index f1ec77f54b..9c5b7fee72 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -452,9 +452,6 @@ static int set_compensation(ResampleContext *c, int sample_delta, int compensati static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, AudioData *src, int src_size, int *consumed){ int i; - int av_unused mm_flags = av_get_cpu_flags(); - int need_emms = c->format == AV_SAMPLE_FMT_S16P && ARCH_X86_32 && - (mm_flags & (AV_CPU_FLAG_MMX2 | AV_CPU_FLAG_SSE2)) == AV_CPU_FLAG_MMX2; int64_t max_src_size = (INT64_MAX/2 / c->phase_count) / c->src_incr; if (c->compensation_distance) @@ -500,8 +497,7 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A } } - if(need_emms) - emms_c(); + emms_c(); if (c->compensation_distance) { c->compensation_distance -= dst_size; From patchwork Sun Jun 12 00:29:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36168 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp548079pzj; Sat, 11 Jun 2022 17:29:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbmiqLqPIQmqhUf0wNt1/ORkV5TfEWrrkkYIl2JJByQabiGqax5z9lEZ2t2S+fS3skLZxg X-Received: by 2002:a05:6402:4241:b0:431:574a:d74b with SMTP id g1-20020a056402424100b00431574ad74bmr38364059edb.374.1654993780940; Sat, 11 Jun 2022 17:29:40 -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 s11-20020a056402520b00b00431fd4040basi4118455edd.105.2022.06.11.17.29.40; Sat, 11 Jun 2022 17:29:40 -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=pUMnG1YR; 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 08DB168B3DB; Sun, 12 Jun 2022 03:29:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2021.outbound.protection.outlook.com [40.92.91.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54ECE68B235 for ; Sun, 12 Jun 2022 03:29:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ocR/u5Or7EtF7oXe248oOWWP/ar7UXqDuZawQ8XpF/5Hyyq7uhbgkMtMJO58jKJ1ZG2ORQDp26zhk0lrnkBVqrC2d+E3xWqQdNiO/h8SaCYfYuHQVWbOE6CLFf2oO7IUMB+GPXL8YX1BBQ6Yd0ys9SUwlJ8QHt6/NUJt0H13A3j5V5W9aLaN0KUOGkxw6vi1M9+q6l3DcpGxr8K1EjRtYITuXvhdPHh1Ijy7J9JT+pb4JHXjSVNO6Uxj5v9uHgES+UW2qMbIKKpYJDDfB46DrbTMLOhgnQERthLkfWP+3GljgsFvb6fo8AbMW1WrjxecvcLO02j5hp0MOpJqorWobA== 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=FWSYo81s3E5s6aqgU+8PwJmAj011fyLfN8nlVwQlrVc=; b=cWbUYnReYAX4+TIk2s9KVXAmHLz0I3p+BOOrqiQsKWAKNazB8BfK3qNZlMpxF1eUS9J9yEKi2MxsvdkrEhmOQM++Bm39xKrUFRbFLrvEkoi5zmFydyTQ4ogEClkt6HkjmwmeVNca8MODZUA2Px8VPgiIyn7WGXplnd8bnqOBigJRNQLOr8iINEV8xPIvmLqofQDK1KKdDvev19XT7Y24KwEH0pMwd3Fy/YnvpW/ouVGq3Lt07SoAWVT9oQfKszvpMzW3p2Dv3DPc0WIFv63lMweFT2PaBgkZ3RiG5uccJTAn1uqBoCTXETa0ugrTJFxAQXI2hz+nsUTJCGmwgnlmgA== 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=FWSYo81s3E5s6aqgU+8PwJmAj011fyLfN8nlVwQlrVc=; b=pUMnG1YRyXHjN865moHLgk6ur6Pk+vFL7j8aEaUnGt55yDtiMmJvLCdhkS7XFRaF3uJ1d1GdLtGuW7Jubpg7Cgcj4853tpHytr70NBWjperBTBBd69RGVU3LLnQlDCCpM985exAeI41hPIESuklcGB/bfOYNcwRMfzq1vdFjUQJ+pwVa/fDjaaolpgWg3A9yrU3xEIsew5miDT7UsoXPXuwSoxP1NDPCn15DGFGiPXFT6ci8Xt+1nXahDxD2YD/AKCjc3gSGtUcpUJxyjv0sWBxAf0+AIapTOmc77kf/sDKkFyUlOlpDCXUO+hEgxX6BDwXocukrEa81DmC7zBBIBw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR0102MB3413.eurprd01.prod.exchangelabs.com (2603:10a6:209:22::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.17; Sun, 12 Jun 2022 00:29:26 +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.016; Sun, 12 Jun 2022 00:29:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jun 2022 02:29:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [srP2je24vMKN9MBWpaqbtj5za/PhZ3Dx] X-ClientProxiedBy: ZR0P278CA0097.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::12) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220612002913.198265-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47cb0def-a358-4424-49c9-08da4c0a9b0a X-MS-Exchange-SLBlob-MailProps: EpEO96k6WolZyfHRr8+buHtGic1GeA1D/QudRl5eSRhMDnQUVHVAZmiy6uUD3foP/PqFeTWAVN+HtbRS3urwxwK+GN9FvmkgjfaBiYPXcdWLai0W3WXLYY9YS585NTevYIn23CJJ1kWrcrYtDKN5XTp4UJlSdoRrysHFgYpSgCi2CpU5bw+YoHPn6jgjhCZaYrIMPEW8Ao/oO42IM8itJ8orcb9mfddTBifMdxfknUfaJx3Olz8s8DSp7M+wpIO1rL/mzQO1PRyUBvEJ3wT0g16DdcGOiRoPwo8lMVryV7Rgzzn+NnQHsE1t4CNKWB2TuogOrqIqnLv9CoztOzLC+egRPBq+XvFQ54RBjUav9CCb+RuUZKfpRVBGVmtTbemHrU1/6j5v1NEj8N6T8OLilh7envt4xZRBennCN7wBLkred3zn5/Ot7XU5u/F7yA+hbv55WcSmqdJgQYkS7ocJmGADy+CYFo4Dy7/o/oi+gttlE0A6EJK0szTC3C6kuX68FZ9v5IZtmiS/bWY5nGgH8667qneRUvkM8mhCaOSDLsVe8Sb8d6pETGFimzmc2WrwsbwwABtqRTwaLL6Fc2eoHQTJmHcfkZO76EL9q3V/V8Ehkq6xHFA8bSnKOmIB4nM4Yklk6sxNQbkDqLBi7bJOunf/YxPuTS/f+IQdRfE91LJ3vt9OqIoI1WmhSrfaj7s/dbBShXXGOpJ8iAi50I3HfG/K/rW3n1P1g9Zp7CdfVMwNPL5Eqt1AJAZdvXGaxt55Ixq9E7DPDV8= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3413:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TizE332PgiExpy0zevFHfr6p5R/64BYFF1cfIfmBFs7eXPU01B0LSIpK4EtzivaGQO08conZN0mihcmzbC/8ZyEnnPcaleoVQdBEo3RrNpjM/v7iMjf7tzwT/OPqTu/PqeZvONhEjteLymScxdUf3JXmks8v4SX8pY8508nsvogarnBNjBBowjkSMjI2IEb1vSCPF1AJriQ/NLyERVKNSV4jt97fC6nRtnuW7WdMiXU30VPFUM173Fzij8A/NE7tqP9tSTJNNb9AdX77F3bl4f0FpB1fpsiSenFtFwsOZLNNvroG/wPt30CILCdcLCfPRFq0b8g0T24PXGMnpSY/kIB0/+6cenaubd0olGHXuFG+2iybt7DieJuz1+t2uQzFoONeLRSabILd/NHp4uP8zwnZyw0qJRhKXAasSY2r2Febf+0y9OLs3x3Vs81LOcHJwJPJZtB6/G6EIeCEQxc5/VfeEzusEdjfJbzysQUvNZPNDh6YHgsWFFodGuJCK3NZBLlhGEWoBdu5Bx5qQJYM+2/2TTJTrhoyMOPuMmdknYmZJUlhjwk6wG98WpSPdU7DqdwHW1olSVjBh2PFstltcA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G8+5HMv88Y8iVqwG3gcfeZ7Ew65J+2eG0JsVAr8gnn0Tm5NhViMzb9Ugue9zcF7Kdd9Z9zgsf4jAi+XWf4FShAyv6c7lqyVZpG3ME2ReQ5qmFmi4cdut/4hr6PfYFyf/QME1muqLd5nxWSVZw7DB5g70xl0uxLO309mlCc+XGYKAzHaCORsgJEK4FvxdqHLAGPCDiGH97O6QMMBl2YNAOnyeILlC4sT9cYT1LzIp6QZkGAZmFvzi3OgGsS+L8Jwbng6cuKN7MSbQkmJq8Fi74l+AxhEJjOdxHSQXMXAUDZ9/tI/ttMSGNpOsN79US3tYB2glMweDk61cBa1lFqIACTvkEG8B/s9QK4tnHUrk0uGgU8RY7ZT5NLetcgdafAyNvvppjGLmGRVz0bTh9pXA6CZhWkErunb53GQteAabTo2WTJmTBy2BcEI0DedguWh3NdVN3WtJLkGH09VrSHtu/BolB+Yqcgmr2NTwcR5WvYhUo5Qmw2vJBw9a1O6inM5WuXhAjRKq9F65mjKkINZ7t1O+bPRmQUWQ2G4W7cKJwvgH6BRS6Ark74HK1E08/CQHHISczQ3DHK24UR4bkjfvh2VRXXGsPbeNRcrpRauaR1nL6De+wVnTus3zmOGwZyfHsWjoHYuFgHEN3wBRJVyvAB+juHr1ivyf5BZFwROoAoWVA0TCKcI+afEn7UuQDKgT6YiKnyO2ZTJefY5vg5UVxqQ4RXPnC45T6kUSGZ5DoOmZhIDQmr1gdkC22bdtT2UGJvkyMFa1dNLNJ/oSa1cEuGNkNsxftNhjwmCsrxe2eSM+p/h3QVP8TejobLolHzCgaZdrzDNDKxEcxv10TgMg2S89okbI5kAOzkNnXNSuXOfleotUG77YuyIU1mWYUMmXX3pzZg+LtjhQ+W59Y8z84ymwDWVKOKWdlf0Umds6sO57ht1byL+6GWMa7JIZMsgwM+z7W3NWamS+sLevgz0TzLnisAE4Ot8W3+QpJPqJJtj+96Ljtj8wfwGUvcyLp/34TKRL1MUasrQM/uxm8s4LLfkZPHsJhi5lkRVUFvOKDz+qCPyCxdxQBd38a+9NNpX4hj2zTqLD5jRKen+JY44YfCTmvrmoEpYjtDh/+ReDMVVhzPyiCPsB90/6E7KxDi9/pJROzUja/TMOzeHJG/S7k35mkwfASDlSudxhYgbxwit/EBFW+LaOZmYB3i6QuRHjqglEfyHVVl3Fz7I9X8vkn9w6QYoeSXWxg1Nqd6+kdEckYqz4D+I6dO9ql78D59wG6wQ+WrEtK/j+y/nE11XM9+moaQnnAH6h4iFv8WRz4ZnnPMyzymVrevCN6KDQnaNCvBV12VRYqdhWwIB/dMdoruQXyDEb5Jh+1K6pGsJxf11UYWF1RqZt9e/n05YyITXHLdR8MOtSSxJX8cNhN51sdXlAgwBxYA1rAERKiLjPoLOrDIyCJp0v1/IH6jnlwYk4dzSt3nd56fdIxSfJDpSXYg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47cb0def-a358-4424-49c9-08da4c0a9b0a X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2022 00:29:26.4154 (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: AM6PR0102MB3413 Subject: [FFmpeg-devel] [PATCH 2/5] swresample/x86/audio_convert: Remove obsolete MMX functions 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: Py64CLaZObY3 x64 always has MMX, MMXEXT, SSE and SSE2 and this means that some functions for MMX, MMXEXT and 3dnow are always overridden by other functions (unless one e.g. explicitly disables SSE2) for x64. So given that the only systems that benefit from these functions are truely ancient 32bit x86s they are removed. Signed-off-by: Andreas Rheinhardt --- libswresample/x86/audio_convert.asm | 9 --------- libswresample/x86/audio_convert_init.c | 9 +-------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm index d441636d3c..d6d6a81495 100644 --- a/libswresample/x86/audio_convert.asm +++ b/libswresample/x86/audio_convert.asm @@ -608,15 +608,6 @@ pack_8ch_%2_to_%1_u_int %+ SUFFIX: %macro NOP_N 0-6 %endmacro -INIT_MMX mmx -CONV int32, int16, u, 2, 1, INT16_TO_INT32_N, NOP_N -CONV int32, int16, a, 2, 1, INT16_TO_INT32_N, NOP_N -CONV int16, int32, u, 1, 2, INT32_TO_INT16_N, NOP_N -CONV int16, int32, a, 1, 2, INT32_TO_INT16_N, NOP_N - -PACK_6CH float, float, u, 2, 2, 0, NOP_N, NOP_N -PACK_6CH float, float, a, 2, 2, 0, NOP_N, NOP_N - INIT_XMM sse PACK_6CH float, float, u, 2, 2, 7, NOP_N, NOP_N PACK_6CH float, float, a, 2, 2, 7, NOP_N, NOP_N diff --git a/libswresample/x86/audio_convert_init.c b/libswresample/x86/audio_convert_init.c index a7d5ab89f8..f6d36f9ca6 100644 --- a/libswresample/x86/audio_convert_init.c +++ b/libswresample/x86/audio_convert_init.c @@ -26,7 +26,7 @@ #define PROTO(pre, in, out, cap) void ff ## pre ## in## _to_ ##out## _a_ ##cap(uint8_t **dst, const uint8_t **src, int len); #define PROTO2(pre, out, cap) PROTO(pre, int16, out, cap) PROTO(pre, int32, out, cap) PROTO(pre, float, out, cap) #define PROTO3(pre, cap) PROTO2(pre, int16, cap) PROTO2(pre, int32, cap) PROTO2(pre, float, cap) -#define PROTO4(pre) PROTO3(pre, mmx) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) PROTO3(pre, avx2) +#define PROTO4(pre) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) PROTO3(pre, avx2) PROTO4(_) PROTO4(_pack_2ch_) PROTO4(_pack_6ch_) @@ -52,15 +52,8 @@ av_cold void swri_audio_convert_init_x86(struct AudioConvert *ac, ac->simd_f = ff_int32_to_int16_a_ ## cap;\ } -MULTI_CAPS_FUNC(MMX, mmx) MULTI_CAPS_FUNC(SSE2, sse2) - if(EXTERNAL_MMX(mm_flags)) { - if(channels == 6) { - if( out_fmt == AV_SAMPLE_FMT_FLT && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P) - ac->simd_f = ff_pack_6ch_float_to_float_a_mmx; - } - } if(EXTERNAL_SSE(mm_flags)) { if(channels == 6) { if( out_fmt == AV_SAMPLE_FMT_FLT && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P) From patchwork Sun Jun 12 00:29:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36169 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp548120pzj; Sat, 11 Jun 2022 17:29:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVFMHHD43iah1XPw+Jbs5Bms3B9nCjRgaNCLA1AlB1AhKKvxe4TJNv+TD3Y2b0lfn0mlGw X-Received: by 2002:a17:906:51c6:b0:712:2a1a:afc8 with SMTP id v6-20020a17090651c600b007122a1aafc8mr8232242ejk.649.1654993790908; Sat, 11 Jun 2022 17:29:50 -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 b11-20020a056402278b00b0042e2a928df9si4416001ede.287.2022.06.11.17.29.50; Sat, 11 Jun 2022 17:29:50 -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=DRPWI5fJ; 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 1273168B4DF; Sun, 12 Jun 2022 03:29:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2021.outbound.protection.outlook.com [40.92.91.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 690D968B345 for ; Sun, 12 Jun 2022 03:29:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nc6dIY29WOmfqxKgX8GpCgrgM1KG4ZoUX+0Szs+Ns3MW5Xb0W4mjDnSTQM1nPMpZHHVXsK9by9ImBFKG0qTlc+zV1hiHw/HcNTtIzRtwQtdc2IEbfrIR21IKdMCi34rXLajrF5rzc1pUiaTX9/HB3b2fVolFafOi6ASXjcGJ4lftJM6zNH+8iUps6/X08IqsyW+vP3kzBPrFzlpd+n2TTihTIgp2GfYot6gi6GTXpCgTlE/1TQPHUzel7VWlwUCrFax0r74qo3FOFP6qfVuSa69DM0EEHTWFp/b/oX/K/oFZPqOjLHdgegczwuuLypsjE5gKQ7ZFmUeBvbAP+pwojQ== 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=USTGY4MZaQhYXgoPm2jG1UHv9VWu8HqLT3qxZ6Zks2E=; b=K40QgNA184m5X4QuxaR6DjVL8htDtbBfWyT5nL1KZw2c7qAKuU6GZJHyEueTUSYSjJ8jCZ2Thp27f3xUK6allQ3etH9Jw+QtFfp4QPipBacbIMgplFhKp+Ws/tRT9F3usSTM/RVHb+tU5P5Z8nRhqeiq4toZFMH8PldT3BIpX/KlETI8XxsqQYcCyqE5SByGo4EeNGrsOyhgdMEMTTT3bKcq8fVA76ZXRAVklrqW0zsUbs1i/R3Y4DiD1ZkppF/b4+61rqo9uWUawXPeDjb6hbjDzjAZq7k9LBX+JqMeaouXv/dZPtGkVIZooFXZ5h5t+1Mi7VDXf6YGvFQj3A+UXw== 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=USTGY4MZaQhYXgoPm2jG1UHv9VWu8HqLT3qxZ6Zks2E=; b=DRPWI5fJA2XA4ayfWz6ZTkuDYQfgiiAxCX4WjvPbE0bzZRS6WYx2gkXGgPMNgSxHJwY4nidKgLjHqyZRJK7yTKN1hUcq+DVLFXHgtElbEwdWaZaO/EY/GTpyRX18BTOjRjukf3OZdXv5E4xqY/p+xLOmDanXmemniYCvUC496GZ0nKR1wqJSkEJ4+jb0YGDwy8YkZ2Ec8RkH45kx3BYvj0d9+wwIITfVNkmFUttZWCszSQ/8h4aNdzV9jTaaUSr0+VBT6doqm4O0IO1Ke5EEJzld29btTaTFZjDwABBnRDmY7N1trIkoaNEgpIlVsoFLVfI6hY8kyTJAhmyV59MjTA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR0102MB3413.eurprd01.prod.exchangelabs.com (2603:10a6:209:22::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.17; Sun, 12 Jun 2022 00:29:27 +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.016; Sun, 12 Jun 2022 00:29:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jun 2022 02:29:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [HdJjOG8BTvjGQ7qN7tMIBvXbWE8JN2uI] X-ClientProxiedBy: ZR0P278CA0097.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::12) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220612002913.198265-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 23d8fb84-a9de-4194-2c30-08da4c0a9bef X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQiOqKDs6sIqMRJcumZqmNKngEvVIzHpTaO/qdScYZhrqiRrq0DauxzL4oz0SMSFHCGpti3AnnsmcrU8hVULErFQ/ThJVzgL65Px4bFM29pXtjUdCvmsN+zFJJavunazgJT1TegMB3QvAszSJqcWPKwF1sBQ9/JZe6/AkDNtjrTabX72xiIvNevamAMUn/T05l/YyKXVs4GLxZSYghHprC7ZERKP2IzF0Sr38hdru9GwUOTeNK3m2NL6b0QRzcRMORq8Prr9OU2Jr6ubiMHAxJsEyDsiIf/vnI3gfu4zDkLtp7ZGnQvJpwFfEfxy3cr2pBhhSxD+M7nOsU/fygVTqoH8at4uoxRVSqZFiLqkpl4n4dztKbEQXR/5f9taIoVhrpZZTssHCU6btGAgZtEL8W08a0Zv0ieRqxsTvk2UE4iigZqXIiX++gjhc4K/UTAeRPYPbRefneQRspJ0MSEdzQOtt/zLoa8jvoxKQ3XesViSWf9EPCdV5L2Sf9QrkNsfzUpekSjk04UfHhDTxF697nHcHMDVAsSxyztyica8QP29Dw0Q+IzdcnxOqugZ9uPtagXtZMbuQhjs+zV00eYhoyTdN1a+4wEh12ndKRVVzVtTIq9BxVW7/ABwVzDCMcTGnBld2HoP+SikAQRJwn9g1bwq3CO8e0iVFK3Sa5yfNjcpLEyj4iVLGSPl/eZuW6yk8AhI4tLM6eC1xsgs/3jpCZ8MAXuae3RTAsrCBOaK52/UhBLYPqK/CM686BRK8Y4p+U= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3413:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w4YSg4hbv/nSDfwZpEnMSTJ+YAqhvqw2+DWZ2wEYfqKowyASzJUo9ghPgQ5algE3xZyosCYInh9NFF9q4/y1SsGOSE+4q9Esc4/umfqmcr1AUimOTRw92uzX777yTe/390YyzXDKBvcTnoL/bF0NpAF+TU5ZCCtZkvUb9ZyrrNzwDV8lzh8bxM8dJC5NUlfUtUw2nbHZWySOBgdV8xNLCw2skjy9Nqi7JL4bW2GFk6FazjFSr4rZ9Nd2Y/TU8MAWQVR8NSLslyg2Cke5RjcNyNHK5420j5jLCx4AlJBvi/yHtxldnOIPFHLYPiphHO5HvLypVeCmVTbBtCTJ+4urELWXnkLwIC6PGRCn8CECr/Ec7k2oXPCGciXlekM55baDR66nupqwstXPKnMmrOaPhkxnkJ6XND+AoGVQyUVFu6+WXq4ofit7W4WRfToC/rzcBOUKfVjQ4C+x9qXuCKLPeDqcGXfcbBak+cYzE1DwSBckZHAc1u7R38EWdUOEjFAxeuDSrBDEEAtbRRmLX5cQ/G5HX02ObYlo5ttt3WIKFADaoWqoVe0PMTDXnGz/wVndNEF9+Jfj0VXOIROBcHrYBg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dYy8puPL0jyfBTqzm+TvPzjR+JCk0hty/ogmxyyRIjg7wQy5FLlFsmtN4yMWpKkD3qHgdm7tMaJrV+28xZo869pLbtn8SBUAdkZPG4dMaci1+AMwunTXTxtbqwvptnrrrXRRRs3nVRd/z63DlwassVZJkYpiSpwuJIKKQyxDLWSOHKV5YSQnkuTbsScphI6mcOeaqvF/eS95AhK8sxn9ECnl6TwgnxEVic7ot/SInEFWR72bgDrUrirnFKoT+8+hSeTPNnOylbwGiUUT0BiAQjA1PDyvjeYELaxZeUL0uo8qDjthCZEsO8t0S6fp5KmWHw9RXnHwJkkMGS3IuMNLGSoXXKr8LLaTnv2uY1Brk8MZ+XQqyQ3hAb7kEvvDVvOVPb7WMGht+qPLSYFHMXSce8TZRxSdec3SrUVzMyO6oUJ6duh9Ntq/RwPajI6V+zK18KnLBXLhrSHbG6MfmvjvaB8jRYKycZW+uEvI6KsS+Jhqwm8fYoou0nIp9dy9wwGP0fEL2klW5tr1jVIm7EccyiE7cS1UWZWqhwMNVqf1dsUPbloktu6/cq9q6OBm/hAVv8VlGUp8Kfe6g7uAicZJvMFNT9UaDne4Ijo1nNTJvHbug7aQ7e7Fqj6k3PLg80JPRQjJVV+thZX+ncZoCj3E2TqwrgYjhdceuH01vOcMp7OUN0jdXp6urhw5tgQrsrBGyp6O22jUFX4rJJ4ycWO8iyCaziGQ4giCecevFcWHoMScGxZW4saCxHitdEjdaDPVSNdhCZAtlyAAcRCv7Q6vkJIs3IqfTC7keOaaFr+vB1+AXtWUUKD+32dDwsH0oy3Dp0nlfO1/CVKPtG4v5SRXj4TC4n/eno2ZdgS2JbAgwBGkS9g0JJKTwwg1RF70phU0b/Cm1xDLg5Ktk7g972WraQKKiR2POP9DRrjw5I8uxQeyVks4yZ03umXLelY0X5Jd85nE45wTDFsgnFm3tGjqO4IWuOz4mkkjjZqJQ+tfs84SDj80Ri+ltVzNnOrJZCLy6FP201JT4960LhVSESBr2zZgd9AF2Ho/WbIpkeeg9f+lNSASZjf/+aWtOVZlWXRCOqwQsBBDHAWYnDXY+dy68JT1KSlsO1Fg86Ce1wBgeS+K9aUe5K8UQRcd1QKCooJ9NDiDwgR//i3ih/Y19+nl00/Kayqx3If2lNcyarf2Px8/WUNR03X4cWGnen8XGWO3wUtFGoeU49/lZog8AjKQGVoGhmYDuMiOf0/395kqCGpBxyRoIvDpJXKK+Z9497ToWZUeHT/u4tspwukQ/8ZsC4Yc96SdeFd4BiJaCDIzgDtnnPv0H0zfKPrcBJSfvmC6a+HFWg7s+uejASxhiQPZmPWmSd96Pq+VKf0YKDuOiPekDXXsiHZaquJTCT3KgpoOqut5GE6Wx+WxPgMthJ4ux1zRFowbkTC85X9WJ9XRjeXn8eXRtfHr6dCTEcHmwrntjFnpO8NMhMQ5Uxjoz+m+mw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23d8fb84-a9de-4194-2c30-08da4c0a9bef X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2022 00:29:27.8529 (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: AM6PR0102MB3413 Subject: [FFmpeg-devel] [PATCH 3/5] swresample/x86/rematrix: Remove obsolete MMX functions 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: mwyW+cg/GIhz x64 always has MMX, MMXEXT, SSE and SSE2 and this means that some functions for MMX, MMXEXT and 3dnow are always overridden by other functions (unless one e.g. explicitly disables SSE2) for x64. So given that the only systems that benefit from these functions are truely ancient 32bit x86s they are removed. Signed-off-by: Andreas Rheinhardt --- libswresample/x86/rematrix.asm | 6 ------ libswresample/x86/rematrix_init.c | 5 ----- 2 files changed, 11 deletions(-) diff --git a/libswresample/x86/rematrix.asm b/libswresample/x86/rematrix.asm index 7984b9a729..968010701e 100644 --- a/libswresample/x86/rematrix.asm +++ b/libswresample/x86/rematrix.asm @@ -223,12 +223,6 @@ mix_2_1_int16_u_int %+ SUFFIX: %endmacro -INIT_MMX mmx -MIX1_INT16 u -MIX1_INT16 a -MIX2_INT16 u -MIX2_INT16 a - INIT_XMM sse MIX2_FLT u MIX2_FLT a diff --git a/libswresample/x86/rematrix_init.c b/libswresample/x86/rematrix_init.c index 0608c74e7f..b6ed38bf67 100644 --- a/libswresample/x86/rematrix_init.c +++ b/libswresample/x86/rematrix_init.c @@ -28,7 +28,6 @@ mix_2_1_func_type ff_mix_2_1_a_## type ## _ ## simd; D(float, sse) D(float, avx) -D(int16, mmx) D(int16, sse2) av_cold int swri_rematrix_init_x86(struct SwrContext *s){ @@ -43,10 +42,6 @@ av_cold int swri_rematrix_init_x86(struct SwrContext *s){ s->mix_2_1_simd = NULL; if (s->midbuf.fmt == AV_SAMPLE_FMT_S16P){ - if(EXTERNAL_MMX(mm_flags)) { - s->mix_1_1_simd = ff_mix_1_1_a_int16_mmx; - s->mix_2_1_simd = ff_mix_2_1_a_int16_mmx; - } if(EXTERNAL_SSE2(mm_flags)) { s->mix_1_1_simd = ff_mix_1_1_a_int16_sse2; s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2; From patchwork Sun Jun 12 00:29:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36170 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp548155pzj; Sat, 11 Jun 2022 17:30:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJ15eE/SzvpCEoJGWi1Ox7tGpGbOtEwVA0P95ZakROUKqq3BOdSHWAZ9pNifDTa3+ZZxJi X-Received: by 2002:a17:906:6483:b0:712:1bfe:eda2 with SMTP id e3-20020a170906648300b007121bfeeda2mr9983338ejm.306.1654993800334; Sat, 11 Jun 2022 17:30:00 -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 et8-20020a056402378800b0042ae7984dafsi3315512edb.46.2022.06.11.17.30.00; Sat, 11 Jun 2022 17:30:00 -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="u85/9f4t"; 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 0A8F668B546; Sun, 12 Jun 2022 03:29:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2021.outbound.protection.outlook.com [40.92.91.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C84668B4B3 for ; Sun, 12 Jun 2022 03:29:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KWCJmReg3mpbdj1uPpyp9mv0tprvd14LaHoIo8F+7UsktBjSbJaXcEh0yclwMZD5xxCbDrp+6O8dSHM0GDWyOEHGDtzV4eJbvuChCVTcSRsfKj6eHRRr7VmTfDa6+gulhj1T81ztJZHUKSRALAKV1RrGIAw/D2s3y+MFt+0wUZVrQ3yOLkTfEoxX7XlJIWEdRK1sTsMBU4/HCkF7IcGhRAQxxukXhPPyzpGGuaIyh9kmc3Dztu4CI503iZTNIrkE/KxVl54WbEnRyneVNuygZoOIVqsYi2InTGIPLNEA89v/qPNEVAH2yHvREyxkuoLs1+8uQdVIaFRAjtsNt2Sr2w== 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=NAg/uMBT025PreTjGdZlq0N5N57dn4LpOtvL69bwblU=; b=dFlKkwTbIJH3BsttIRO2GwmA0TN+fEoN54uRrdH1zt1971J2RyeGIOTxyELoTpGlbQpeGbRMkkmenxUjExwUkTAwOjaIDmzjUy/A7Tx36/vuQvFw0SPv+YLbFyH7Yrh4PLDnP1T6CanY0xXgBsQx5ol047og7QKWJvn5E6nIiOseBNihMDruR/qV+iYecch560N1juozXkD0n6DrFxZLCiN2EPqtSKpolRc69WAJLS2b3PmLIgK8RyvEoZ6yguNdHtlnjTW6Bitc5PTeNfri2tKvFp+5utMvsGopkrmehidiDYnHE9wr65ZIuBiP/3ifK/BZ/dQCxVOUb6n5Tponmg== 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=NAg/uMBT025PreTjGdZlq0N5N57dn4LpOtvL69bwblU=; b=u85/9f4t62qmp0Z5V3k322uBxZ0BQTXyuQ7FYfwsY3ZUbcEqn8FtuL8hr+TUeUwuquJw8N/1cou6dpZVZedffStdffVENE74o/+Pc8UkR1FhMZgeMyUkcrhoquzbNIrw8sZ84jheW53sw/i7sZNSiwZ3jItIQGaS1JXs9Uae2KX0PIJy/JKhdCZFAZKNBrqPgivKLUwRaqb0BmzdpNYb5d+E3vurqM2BpuXrmwZUPEvdCz0fxbWIMhSQKW5cj0DNXQiKWILVX+Jn7yxZ0olRm1I6Qwf7oe0xfZxM6ZGhtXXF/X5tuo5YyBkm1mykRfNVjzSpUUYvErxOYnvppD8OQw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR0102MB3413.eurprd01.prod.exchangelabs.com (2603:10a6:209:22::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.17; Sun, 12 Jun 2022 00:29:29 +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.016; Sun, 12 Jun 2022 00:29:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jun 2022 02:29:12 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [d6fxsNSolvxiO1otwB7lLlahhuIVUZmI] X-ClientProxiedBy: ZR0P278CA0097.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::12) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220612002913.198265-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b9c7d32-cfaa-49db-3710-08da4c0a9cbc X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXOgn4wKLTlrzW91FC18xji4U755DiKSIi7tzlof1f7ZaGfDZMwxp5TfF5zgYsO55912XMIzNxzoPt1nIe2xn41oSuu0leRVwYsAWBl39whJlKinqy4rJ8apssJgY8gpbI6ccvppNV1sAq8VnpDUfnFKYASqhKKMHrUuw6l+HsOyvHuZD2jHSz08W7NSwwlJl0DRjtU6yZbZjeiIXbrO8xjbCRQYzMfYlLykZW0ycFLkfBXfOqqLp2ZWPxt23DdwCMNm8y/Dp0fEaLuM5jlvce+P16GuzOhOM1a4USaEojgNgt4GWtSjJfuF3L83zwo2EIO17IgWFFA54iEql5Yd8Gq7+htWjdCC6ivDavT+YmVZxQBlNl5uiTyJeenyTiVSwhUDL83ij+qTLdtDjrmRMNDGUBH815MdTg8SyPikrw89TwhzjC1393wSX3jYyFNFnNYYoVYRjNKT26ij24TD/9zz63qqLjtmfYulSmjO0MZWwftf3BNLUGOoatntOWBFedlq614OKpmVV5qp5GsXsN03FuDEpWczMBFuPzx5nIuVVh032iohzrmybY0U0dubS3sfvDx9q8LlAOuOC6vJHG5E4vwYCgQ3qYw4o1LaxfgaVpFV8Zk6nCudCMPUR2qcyUyhsjpBCKwGzsVMHdpVaYxsbZpL/ezjOLp9L4/cy8RkrKgy/q9U4zMee4ibhdJLU3GiSPpryKGBuBO4heJ02xvjb0zxEKlOQY= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3413:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T0Nwws8FxJnvIEOjTDMW6LvZnTx3o1Xf5ih93u08RWK4nu04rl4cMPsm+VVwXryxe6fDY0r8MncliAY92c0/qhDH/YKeNiztdwX6PcNf+D9F+ggPqATsZ2nhXWlH+OvOA9Cq5lkyR30C+yQm0PltNcJ4GKbzL88QASPI1UQccOa8M8ssjs7WH6AK/5mbBRIsLB/F43OuT7zO5lwx8swCNKfE4OEN8BzyeNzpMx1cl7IPbJQfHEZ/7C7jjURypnM0e6kX2wYc9iYEEfS0KtIEgjLK/z5HUbv+2o1g+v9rELjZPVD0Hma3I1H629xVHpzgBp+Rt7W4a7Wwiq1RoE580FWCQO/Vu+AEU8XH5KdHZ3mmWx1Nf8ryJWon5m5GkHUnOdEi09rXu9ovm/JUawivUKufNIf5MeUOzrzlhapxWv4sGK6UOQ21Aj34lcg7PwWd3ZSJK1U/5hGG9CuL3/cTTv2dJjvHzxvshM6+RFncIqxbdCSZt5khme8kbo7WLUOYJnm7ybGJwTwY/oLLc7aHOa56gYD9w/VsWGd+mDC1/qfGhz8Pv1KNmeGBX+/wuoKoq+qg8nTn+iDCThj+w1fXxQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: coJEhfiAnZOj3rP64pnxu4c90+5lKRMZEd0Vfdlj4nFdRsXTwoCtVuSQmM7uVJeVmfu9doZAoIN9pGkudvHoNQr99Ql6POG5MegrweOjMt1YPvPDGj+I+TyCFUFPKQ2Bg3248pcCScVXipbl2RIP0GrZ/ndq1KnoxlL5/b/S/cGZL5mbL49LqbVuwQWdDFAVw4RI6XNPRqYIKySHGqbp3Dwt9R3lPA0QKBKNwMpte0kW2WPluju2QmX/D6B4ImSB4gtI3/ifZlZ3sqsXgcucIu94TFY6Pc29WUaCD9bm7IZOcNoSxr+p19vkK5oGgWm5i6t36Pagh01DNnVZGoUpbwAVj4aKD5r62ueKP3Urh5Hh7WVMapMpzC4fteWbttTH25dceWtO/iJAjWgdPY2vm/xBC71BvoPttMR1E11QFWGhyHR/GpnrBJzjSpQRn0EzfpY1cpHAKRVwVly8Z+ZmttqKQSJnc+UzbLSIV/EtWrwWsMlN4AABvuwobJb9Yj31iC67TICugRtp7wZxM3LCxnDNbjUQAfv4FoV+DAPSYa0ZMTjBC0xfxK3oVqB8rmonj7qW9QtyC7G8CDFTgFm97rzaVE3nbnpJl36p/JsEd2o8wFkIN/C3MA39qVEZQpvdXhofBK3Brxsn7hhpYelyQK7xwyqXfNWssEH8xlhBonJ24KNklkcdz3dW6HiQ96eFRZVZdHjPnUK3qYdouu2mas58DTz548Ie5dlOi1/tVIsTpiqEHdT5G6w6RMfOP+r6bWaKbRKOK9+8GNi1btEqOQWidaJiMlQnN8JrOmDaA3AJhZhaBLb9sCmHUhB1UU76s2VbVinVCq4dK4Gj4yQ+RYuCAYcE/tqgTsP94R/KuRa48kaNh1U+FFeBiyZXHQioOPHGoB5RxlRk0J4gofl8ov2WHda7gdl7n6/debBSR6/pDT9Jd76MEKYHb9OkPRPN7wXez55YTwVVEDeaXulg2q8zhKz6rNG0NIZSx+DKpNUcW8GAvRtW2ftbDifGjrzEtfVSS+kD3qG5f1SXkWJJSEJhpRfVXuqy2WSRGpZ0RsapXbv26SUyfeslcEL/vpuRjKCvRPDrpV0oqAMRLtoMO5M7RBKgbRF57o8fEdUSF+6q2sauBihtd4jUdKp5s+nXYn5Zk3UmSAeQmlolATCol9QpFTT+85TkxzhW9ABmBK5SwB+cOCUG5I5u/Lr7fYYuymyx1MLKYtUa92zrto70l8d8942nYAEqmo/TQQlR6LXQ2knxhz9H3ipBWoTZxWGnVHaWF2BAyO7u1ddiAgqcQGCzlh3XMJeZxkOeoFD2Ky7MzaTR5jy/HNV6c+dlueN/547E59mogrFoV78qnfoNMEZFrlNR3ksWeTJSDp+pdLrvroCRgyNGgNFmNS5ogvYiFq3GK9P257j5g1jrV4G0DKe8ljPNj18A6XVRhLQwcIHZtpxZwbc8F6jcDeqJrqR/D1jw/u+RV8hduLK+AybB0g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b9c7d32-cfaa-49db-3710-08da4c0a9cbc X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2022 00:29:29.2123 (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: AM6PR0102MB3413 Subject: [FFmpeg-devel] [PATCH 4/5] swresample/x86/resample: Remove obsolete MMXEXT functions 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: x+oymPpQEzMe 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). So given that the only systems which benefit from the MMXEXT resamplers (which are overridden by SSE2) are truely ancient 32bit x86s they are removed. Signed-off-by: Andreas Rheinhardt --- libswresample/x86/resample.asm | 5 ----- libswresample/x86/resample_init.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/libswresample/x86/resample.asm b/libswresample/x86/resample.asm index 7107cf9d42..6c3dc28703 100644 --- a/libswresample/x86/resample.asm +++ b/libswresample/x86/resample.asm @@ -594,11 +594,6 @@ INIT_XMM fma4 RESAMPLE_FNS float, 4, 2, s, pf_1 %endif -%if ARCH_X86_32 -INIT_MMX mmxext -RESAMPLE_FNS int16, 2, 1 -%endif - INIT_XMM sse2 RESAMPLE_FNS int16, 2, 1 %if HAVE_XOP_EXTERNAL diff --git a/libswresample/x86/resample_init.c b/libswresample/x86/resample_init.c index 32c080ea4c..d13ccd4833 100644 --- a/libswresample/x86/resample_init.c +++ b/libswresample/x86/resample_init.c @@ -35,7 +35,6 @@ int ff_resample_common_##type##_##opt(ResampleContext *c, void *dst, \ int ff_resample_linear_##type##_##opt(ResampleContext *c, void *dst, \ const void *src, int sz, int upd) -RESAMPLE_FUNCS(int16, mmxext); RESAMPLE_FUNCS(int16, sse2); RESAMPLE_FUNCS(int16, xop); RESAMPLE_FUNCS(float, sse); @@ -52,10 +51,6 @@ av_cold void swri_resample_dsp_x86_init(ResampleContext *c) switch(c->format){ case AV_SAMPLE_FMT_S16P: - if (ARCH_X86_32 && EXTERNAL_MMXEXT(mm_flags)) { - c->dsp.resample_linear = ff_resample_linear_int16_mmxext; - c->dsp.resample_common = ff_resample_common_int16_mmxext; - } if (EXTERNAL_SSE2(mm_flags)) { c->dsp.resample_linear = ff_resample_linear_int16_sse2; c->dsp.resample_common = ff_resample_common_int16_sse2; From patchwork Sun Jun 12 00:29:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36171 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp548201pzj; Sat, 11 Jun 2022 17:30:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyTmVWnrdr5Idia2bRLbBU3uc1xQafr1jFGRUgE81JaI3pXtt+2+Te/byjzTZe5zNnnmQP X-Received: by 2002:a17:906:7254:b0:6fe:5637:cbe6 with SMTP id n20-20020a170906725400b006fe5637cbe6mr46053551ejk.612.1654993809975; Sat, 11 Jun 2022 17:30:09 -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 n9-20020a17090673c900b006ffa19a00c8si3212824ejl.184.2022.06.11.17.30.09; Sat, 11 Jun 2022 17:30:09 -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=Vgsy2Vvl; 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 3279C68B4B3; Sun, 12 Jun 2022 03:29:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2021.outbound.protection.outlook.com [40.92.91.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9053A68B4B3 for ; Sun, 12 Jun 2022 03:29:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nh1NEF63IB1OEvEhFKbloY33bNpP/tRMHZ5neShJK3D1aEj4WCx8xtk+0OKp1m5ofZUt9UA9C64pT7kbsI7gBWRAdAtVUHXqyCvvmD0iNWU7wE5+Ad7sFCxoU/rGD79+0vxC6JkcfPSfKhKmKEMmcU6MGipGCD/qIb5UQSX4BB1wX1o6eaeNb6B73MDRV6Oy6sET2UTbmjxeN659rjBupklz3QIwd2L/5dxFk13qSw1hfGJwrXgrJypYCEoOKUdD/Zy+uTwfCRQ3FPVFOG43zMyEEUTRAHmOZ6P/VfBFovfpKAXbRnGtWUNWRXuQvjAmM8Suclxg0cY8YFSlthdu6Q== 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=aNa2YTIv+6xXVpTpDT7mfhabLB+3VcSBx975u5HpT/Q=; b=LggtPo7qYWFx2Kbh+pOCr34WVAZRXQkxF6gzepaVtrimPC4/RTdc2zMR5do4WXO1HZRSGl6w4+7WZctxdQd5t2FO/aZSkHIHHLCp6hKICoGqW38WrLGHdLrS3ExPM0xQLwtCnEubs/uRBFaMjC9jq2tsGWIMEq3IXSXhWjsKW+rEZHT+AF2IlE0tYyXLNUamMgu6TFOP328235KyCKepGXRn0JIeB4ec7R8Md/KbKMVb53gQ1S3mCG6ADmmpzGsnASbKkfHiGm8K3sD43RAmT4k2SHJ42+1QEQJptsXHB+KKbUEH9Ed9aOb/vvzjD61jKbErVv1H6NeGx6LsH0PkiQ== 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=aNa2YTIv+6xXVpTpDT7mfhabLB+3VcSBx975u5HpT/Q=; b=Vgsy2VvluqumGz51jq6qxCVacf5Gw+b2r9IxrrbUq6CsojtPa0CnrB0pfz/06jjwztdUJlhKYTleUyBTF93ZtG/2X4gxRCx11gKQkrfWrabVp3Do4Mzl/t9/tJ3kuNZFmkdnalCWC59u3ypJqO8juG4p0sUAa3MbkLb0dxw+6alFO32ps1M0ySrWmObcnUiWUYaKCF/KDsW1Y6HdiIcWZgoLtb2rrPEJWQT5jHSB/wLUSHH7iGmb2/UwqQY+/eEsNvsJHwuE+r2uEc9eIp0VoX4wz2kylT/1vCZLKEFe5n51GeWBHnBzxtduC5tKsSJ8GDjc89cXNKSWP2KwTNFWQw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR0102MB3413.eurprd01.prod.exchangelabs.com (2603:10a6:209:22::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.17; Sun, 12 Jun 2022 00:29:30 +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.016; Sun, 12 Jun 2022 00:29:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jun 2022 02:29:13 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [fyrg1hH5aU+iiCGYh/PsW8NXhPVQdptl] X-ClientProxiedBy: ZR0P278CA0097.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::12) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220612002913.198265-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b97fe04d-cc74-4277-7e8b-08da4c0a9d65 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXOgn4wKLTlrzW91FC18xjitDR/Ci68ayVmc3fMku+gobw9KpQ7cgtOJLn7TandyZGiBVdwufJ+PxBkAuALAstOJYE+Bb64Ucq2LEqzGPCNQFhTofmOMJobj/G1vv8vUxSQeD5tkIny7GkFqNznOFYHK6IjwhqeOC+xFgSnk3vbgYX2JHNOM9zk8ybKSps18Hf9yShentwerCi0sRr6NEVcdSz8ySf/XtYWTHqsYp+ZC/A9bCbaLM5iOXP1Le+lPWi05UdxWwxt049lB5amdT8zQr88izMQHJ9bhS6XYsBTwKV6zM9z2rIdvU5rn8Elx2OKQyHUonczcDmWW5YTpsyWmO/PwhkyNfPOVJ5b6KkBEStp45vqNvou/2wCL7HZAARwmlEJ3Yb3+/7PXiWnNPabHlSiG2NXeTAn7GbtfV5nCpodnbaGyGqMwn5q/GTdfQhIW6J1Vdh8/LDVfnwJgUnHpEzy1yQdRdnIEUI+HTbgkLZRhLZWrXmIu73l2+ulkVOHAU/dkqj0/nd7PZqsI70ZvL31nEMvA6QeE9hvEWp7tycTwgTtcSrWjUzBpHGXuf6oJKpJbRupn6dQsTjo42aT5lAfClfNwZqYZEVpHz1MlVB6am+yKIWhsoP+mfMFMN1eFEPL2pPmevFWhYuJl0W2TcT+1q51W2ktMrGQXtB/gw2vLa2DNXC1KphEvWE9m1/AMjGZiqe6UvDzWMotNipXlYurwojSZ50= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3413:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0y9s7HdA7gzC+gxhEGMIUfi1bNmtpMepY4z9d8FDPppC0PjVOPl8exsOFUONA5yaO2jfVAOFSGTNqzEC8rMZKQQKJ3NQYsHXOU8x3cMMt957dCKhq7kNgdYgQRuawR6OjurnFJap53J011bc9p4lCyMwpZ+qP0+QXAEPY16xZC2WBBGRaX1ip5AzoMi9ELxavvFvhbyHvFb16avCBcmGYAXxlID44Ld6iqa6NBqIgkkeqSWiunNgyntnNo3ZPjtwRPmmFbWOA2DsYTHGDskDUzheRTz7fADYm6p0ezEeJ5LtzSuLweV578cU8zsaxtvdpLBvzh6qHLCJRFolz7+q4BD9gFvUVVPiYIzNKCnFuEf7CDCblN1Pr84aabM/qUEoDmlFRZD9lTsjVPW00zt1WeRS67f1n6phYhB0kDDXh7jXTCqGaMZltyjUD0imMOG+i4uZMh1dRYFD0uSgrZBkPsVyFoPOdlH3z6pBfZybYAv4uO+U0GJ1Q3Gv5Md06OLF+RerB5DzG0T9LIsYg8CtK5ZAhS6JCe+OnRZ/NUWLMOJNDu/KqZCRun60Lanxdza/GiCRYRW8iJLru6uELTQVgA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3k2LDlBv7e+ICMDwGKUwJXyE4qwODOSfQS16Quu2sqMXm0ar5Av8HiEe0aVWfaerpRK3l8/m4MWGs2lx0KxN2ipswcEATvLQlreaDS1xn3zi/3b5g/vRcYeIUfLo0f07O28Bx81w2gQRrGLLTX6XmGmGXsDf4UVcDB6nqq+sB07sG4PqGolmkmrL7Xr1tMHvNU2u1NQRHkw/bLtg9wSe3rzNw517LFNWoxAEb/nTjKwxziipPbUx+aab55YvMdZOxTPqDDZ0yOjWlBFuhavMPpBYFr0ivf1CkF1JYwaWAmsMvMkhukzZLFPtrRG1ubYouG/VlpnASSzw26u7m6Rt71quFUqXMWzBVV14a5r9vc+QDChF409ClGhRs5EzQJQZuOsxy3l50PKPWWZ8S5ceOm5vxySPMu7/PTJhYNCcDkQz42knFY9DMVF4KOW2WWLyughzw4O9QxU2K3KVQ4J4UAQDWdCb9vAMsZWJGbU0+/l3Tv1hQGpg/A0uQktR270W2KukNTjsgHhuql61n69Ned6aSMHPco4xOGTl9KFRd1sLQLJZPZgHE9EnFtxTuKxLQYRnKwXmesGuJ5QPOiUAMe7rRH+bSGPBOTT/f7opRCp5ZS0n/whuUEO/gj42C5JL5d3Bih2z4Mzxculx3seF4OYnRveb6z8Dt8ARgamaWPnTEjbAsJCzsZZ/AZFWaHiQY2LsF+a2zaxWnE0DAKbbI3UpTJb4YldS4cdUarTXV0TDCsaMOM3vATVqiCcgtj4caXTELZtoZin58jieruv/wbrRLAIolfzDOdrSFCMLuCxsf/NccIhF3Goea/iB3/oJQaSlHNp2QldIphVy1AR9FpkSSnfOLTmg5SGQjn0vkbUGQrt4YDOu6EvOSlarooft2kvCE8NvAFEpcDjt2jyaQq9/lXFiGWTFB1FkO4OGwcQ7aXsmXv4+jgBW11X8hT18S1x/zLqQTOht6Yp0ykrS+fwlCXu927aZDKfqFsW+ydzKxFxXqOamLLMB/yFBNkux1aD01OfF+DYBXuzzbqgAxwGgqrxcfH0hgTOwGIyPTCDWDoUblNLkkvAAq47qFYd3ZNij0Q0I/udYdgScCbgl5IZ9lbHu5tUlc515+EXdwojGldb2cApeTaWfVbm6VMh9d7L/g2mgdTEjBFnHjurhnJuAHFlO/a/iJvr6dWoCOP+Yr8hN9o0MYjV+Jrl6sQEcjZx+QIbWA/cru27K540zmwXs5YoGBtYmNNGxknrqUGJOYX9tKTAkY6vy7rAuWKXr/llA9s/HRMyO93FE18fPsqWP9aNVaq1DUtlIJ0EAiOXFmrJKJgZZoJJecRZoY5EvUrATKBqUEpf7ZNMu9h/Tl8Xep7/w3iE/1nK9Z6g3TYKmpDLT6GvPSYAukDEPprwqBQdzv9ahO6IfGhM6w9JovGchHtMQHG9WdpCXuHrddmCCY7kBHLArAblrYcFyLPpYsd1amRE6q0+8dldntevhVg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b97fe04d-cc74-4277-7e8b-08da4c0a9d65 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2022 00:29:30.3373 (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: AM6PR0102MB3413 Subject: [FFmpeg-devel] [PATCH 5/5] swresample/resample: Remove unnecessary emms_c 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: b17LWo8uPq3C The last MMX code in swresample has just been removed. Signed-off-by: Andreas Rheinhardt --- libswresample/resample.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libswresample/resample.c b/libswresample/resample.c index 9c5b7fee72..8f9efc3f21 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -497,8 +497,6 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A } } - emms_c(); - if (c->compensation_distance) { c->compensation_distance -= dst_size; if (!c->compensation_distance) {