From patchwork Sun Jul 31 03:37: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: 37050 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1760791pzb; Sat, 30 Jul 2022 20:37:34 -0700 (PDT) X-Google-Smtp-Source: AA6agR4seDIYDnG0PSZtlzHMuVeaBFHl1cTdoEjT7w0LkI+y1A4KRquJzo/Fgb/MYDXuQXfu/g/E X-Received: by 2002:a17:906:8a68:b0:730:54a8:ac71 with SMTP id hy8-20020a1709068a6800b0073054a8ac71mr2899224ejc.585.1659238654508; Sat, 30 Jul 2022 20:37: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 ht10-20020a170907608a00b0070f8f93e1f5si4362072ejc.306.2022.07.30.20.37.33; Sat, 30 Jul 2022 20:37: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=II8ROwQZ; 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 DDB6668BA77; Sun, 31 Jul 2022 06:37:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068092.outbound.protection.outlook.com [40.92.68.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FCE468BA6F for ; Sun, 31 Jul 2022 06:37:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cCmDQd7tZCeBgl6vQT1DRfhi+nXH63Fri4zM6YEH13Vwyra9aiw78BSxgPfd2qpxaFRaDfqEbAE8XitXrzCs+H7yqKNnPvCfAdxXhE0NcEGMa1PW6CfzxdMLCjBDoe/kuNA6QR6Vr3IZtqOTMXzr3BhrF6LoDipDiYLDKMZUL9mlOy78t9ivnDy8VEWxDN1PvboyCn/Vfw8oSeLBiphImMdwd+2ZkSxH9qv4Nh6K7rEEvktnOmw1kUAntVlS80ChCH1fCnnHgU0o7MVcVTEaJ5yBMmIx80NdWNcLgh+NJa9rBWQ1XSx5R/ao4VxbhpvGnfT3R1b8UqzU/6juDbjCbA== 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=PQE+hzTl7YEEPGRIoadSt93mzGnFW5xNCP1eSYz3B0c=; b=h9uVRM+ZmqLkAbA2eR/mO1CYZ8c2Awmy2pLtaBCrhT3pyKXWcQnpF0O5EOB8E90Ajn+jKzucdo1R9EHayOVFb/UayVjjfjIFsbB/cBgBw3ZqnTnFu8FXrF1LviqqnNxvn2lHaPgkZ9faIdRkWfESNBWonFxSv6Fsf4Ei353tqkl8uTGZUO8CKMAetC7GSf8rb4tyWOXT36iwLDKRzEf312Ksp7R163diQ5CGwknNnzfOlRkn7/rtnmt1U9wFQ6auTJP1VxagcopjldDrXZ8CYFi3mbfqYpJUAvKjyRAJ8xoAC//HD+OVZuuPNhS6M9OMrTBIYphiu43f/YuRSOZp+g== 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=PQE+hzTl7YEEPGRIoadSt93mzGnFW5xNCP1eSYz3B0c=; b=II8ROwQZpkfmSXlmw4fqM3EVVK3myjTvWCYpQVK1ojuD13QxqjOuJ714wWV3W6SWEelEsJLNpi/+NH02OyAwGVoeBFS07NJ/W+92boFxMkDpW65x1fT/zu4Zs1ape4SLSwZHMtmE+FcF4HAitOhJEoiXLJmgXwk0xdB4Jm6L5wno3k/Nd/YkmXj9lO0NeRjEO8g999SRyk1yjLFFaQj33Z0pbR8VBrvP3JOn7WAnw+BU/wxsf48NCOf8fJVy/OI7vLLalyUXcVfJSMfg5/glS+Qd2b68EFv5YCC/NBww8qWuBm6dOYHANQS/C4IFdBtGVVWfsyTeKhz07Jo9RwjUaQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB8485.eurprd01.prod.exchangelabs.com (2603:10a6:102:224::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.11; Sun, 31 Jul 2022 03:37:23 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5482.014; Sun, 31 Jul 2022 03:37:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Jul 2022 05:37:16 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Yjj6apruecetyT7cIBp4ebW6Au5Wdr6Q] X-ClientProxiedBy: ZR0P278CA0066.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220731033716.1324759-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8f7ca357-f19a-48ed-afa1-08da72a5fb35 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU58DisxPLgm+GX+j6FbkJ/kAEu5W0boX6+CM3BQv/HCxb3E4nSiYSv4Z6v8h/FuUcQkiGvdNs89dMhCNE5kQcmKqyM0gscr78zuapRcE840zAXZfI5Yv7fzxjTJPkdePlZTx3ek6NsY671n78J9f4U3a8lATEUU0k3T14w85ZIUGVAXfzzxjSyf5A96YHSlpZc2D8o7GGammGR7JQNxk+j+cAuVwERPN3lyk2EU048AH5A1sS+oderJKW40tHo5acjtpI0SKgRFRSSZbBYH5iJCLqEldzHlgSG1V98dnztRR3QzBZbPtGE4o4hsUd52BlqYcdouhVjF/6o6FI/0Xd1SblJtP/l71lf308SG2cnkeRVz8c9T36f8tGLBNfroagQO90Ce+Wmh+SRE10F1g1lFqhZFXT0SjJ+MAsiKfCy703ztiinVbaFs65SSmFpT2M4DgLnAjTZHkWeFQwbGO9W6CjDlQTLuiSSg9Xvs+P7HTvJGMVg4wziwEKWyTkprgz7Q6En80gOji57XF0l0rpR4JzoyieLZqPAz6HPx/fcNlORdEA5+asMl+r86oSk3Tm0w2OETpf2inGF3gAt7dbcDwwqWEzktmd20gHQYT8Emn8DgmfXDGtibtpEuH9REj4AwdBHI+pnbnbTy4bnCxOHzS0x+ygFBQrkUrw7Zmx4SuijdVVhxufGRaAAlZOXrmXb/7+jXmv+hjyZ0ZZEsF4uuFdd1x3G1Fw= X-MS-TrafficTypeDiagnostic: PAXPR01MB8485:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ulDDDouKlh28uCUC+SoLUAWe0KgFdkrad7eN7bqPUhBJaUwanWp8J4DKEFDXBhviTXcFVcDGY82buj7a9aICygST5bsvyZkRH4aCjHXKegcAmpt6q4I/v29LYJ69KCetuVQgycyhg/6MDvPK8ekt/Waca1vD/tt9bBKDizHFdudDwlkomYBhPWZeh6qeDLME+XBCUBKgUcN8bXoeLq5WjKRI+agxlV+jXQjEt8VcwX0nNgIijpdFbXRjmNV0Zn6TDFXzVoIv7rkpVE/VYxn6l91MB+uVzemdpazdDBs+9bkQSpkoKy00L/QazwN1Osp4qnkW2516IlUqjOVz4NPPNcXQvwj8ieXBhpsx87fmyScSwAlIUkYi+ZJRi2U+I0RrX0cePXs7rFaEDHWLldJDdoV5/0uMqBx5jEsSf2/UytPqIdBreXmVfI/RLelFVROhMOVEizPpSQ9cqMgOVT02Hyx66gMWycxeAUT9Fjp/goRgVG6f1AQm+ISl6WmxZqqAxsuP3Kqgik5EGFhqotxxXUYTwPbIVsSVt+i4Q2d0gyQ99nFGh7OmLyXc9D6zoH2YxmysmO9SE3IVPoM+6fMGiVYvvpfaW4Cm75CL8zBmOGrYymidn+4Iqls6q6PEaCY9C2QLfYn6w4SJi/0FYfBoAw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XOqWO6BvrCHwL5ioE61Wr9ah56gSEJETvU9wxfMiXSgR45+feE7VXnesh75hSThE4wu7YCtz+k0kwxm2Hpllj230VjewSiuR9PZviErH69uCN9lD1bAsLyObJl/sdP0i7Fa5sHavwPJuMYMywUF2vJiGD/08FPWwlzTtJSyhwpQAk4IazELe2fPAU0kRXDBnevoK1gllZ3s4Sg6cK3kqBGPK0BSoTAi/pHCN+k8QzoXJdcYYv0t0/3FR8VAUfoEmEbzn7hfdU9tsGvndCqcX74NZSH7lUENeaJxvBrNXlvn01WA+GF8/PQeW1VD1e0lgsV1otFO1w51MLq+pgM2Q1CpOFOU9BkAuNN2XvEtmsC1TaY5XiASP+mjoo9esPKGXG5otNTPGJJI5+OhSGng5m2Vf/ZofAN2dnDvLZcmfRNgp2srhXOcFTW+tNO2qbDLq3izg9yUJqXCSQ4WCevuYoMB5Nxfdj7jZs2gmFrt12cHeFhZ9SjXcp5cx64xhTPbQPTv1E4GNkui67Np3hw31QPNACyRa9pgd6daWzc9YUvdQjBcimMvElk7a8q3VuIe9mKg9ti48w3lopZrhl9zeZIUmJ+l0kP6/iVKIr5dD911mgd9UUW3lvn/EtObPoi+a5F3S5I/q7A2ZG8/1zUp6jNOs6RNo+B5xVHjxmD2PE9TixIf1bWDf6l9TZqXJqoZGZoXGDy2kUQHiiA3THYO8/5TVWbHz1M6CAW3aHY5If1s7nLMHUDsfoLAHOtn1pXVKTgGOHe2P/uecd5oi9uyQqZ95F0dVsxVYGjTkxhluylZS0C7kCuVua1zZctGJy2jcOslIJzRfA6X5szx3ljOaJpBtdNw+AGmIfLDFWQTnnsZY5aMVK1n2fIUFoJSVvnWiVrv/zxyNP8of4xBhDnzP9nmcg+m90dd3RNSuDP8LL5WCemhNWJOq22zSTtiqsI0GCzzaP+zOXSWkveLc1zwNM68u/brVf4dZV02R1lImNWfonDP4eU7KxQxq7ggrvNyfjhA3qTptyR6hsKYH0uLV3QfI3KXPEqydVdHcpsfrY6okjDbUbqvleYkvnfn4Y3dsV8LJdy/8l2SR8WkJ6mAxhlKLYUmxgQedbKZfYMUD84emUvPpiAP7lUPo7q8kYrUlYDJ2a/7qS3ohP5tdfncdE6wPM9PL75By1DtFi+Xs498MFzyqOP7OD3k05zxJduy4PqsNSD9pt5SPgB2z+NVfOJT5ao1GU187ibPRso1KvdE3YSC5qa3OozQ5yojlz5IuociM++k1ZjHO+fZpFIgdZRVh+g3A6lwHk0dLTPkqCMs= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f7ca357-f19a-48ed-afa1-08da72a5fb35 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2022 03:37:23.8459 (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: PAXPR01MB8485 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/alpha/me_cmp_alpha: Remove commented-out function 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: yNm/DdC+RmhT This function is bitrotten: It uses different parameters than the corresponding ASM functions which replaced it. Signed-off-by: Andreas Rheinhardt --- libavcodec/alpha/me_cmp_alpha.c | 43 --------------------------------- 1 file changed, 43 deletions(-) diff --git a/libavcodec/alpha/me_cmp_alpha.c b/libavcodec/alpha/me_cmp_alpha.c index d5a78f1247..0c1a4a62c5 100644 --- a/libavcodec/alpha/me_cmp_alpha.c +++ b/libavcodec/alpha/me_cmp_alpha.c @@ -78,49 +78,6 @@ static int pix_abs8x8_mvi(struct MpegEncContext *v, const uint8_t *pix1, const u return result; } -#if 0 /* now done in assembly */ -int pix_abs16x16_mvi(const uint8_t *pix1, const uint8_t *pix2, int line_size) -{ - int result = 0; - int h = 16; - - if ((size_t) pix2 & 0x7) { - /* works only when pix2 is actually unaligned */ - do { /* do 16 pixel a time */ - uint64_t p1_l, p1_r, p2_l, p2_r; - uint64_t t; - - p1_l = ldq(pix1); - p1_r = ldq(pix1 + 8); - t = ldq_u(pix2 + 8); - p2_l = extql(ldq_u(pix2), pix2) | extqh(t, pix2); - p2_r = extql(t, pix2) | extqh(ldq_u(pix2 + 16), pix2); - pix1 += line_size; - pix2 += line_size; - - result += perr(p1_l, p2_l) - + perr(p1_r, p2_r); - } while (--h); - } else { - do { - uint64_t p1_l, p1_r, p2_l, p2_r; - - p1_l = ldq(pix1); - p1_r = ldq(pix1 + 8); - p2_l = ldq(pix2); - p2_r = ldq(pix2 + 8); - pix1 += line_size; - pix2 += line_size; - - result += perr(p1_l, p2_l) - + perr(p1_r, p2_r); - } while (--h); - } - - return result; -} -#endif - static int pix_abs16x16_x2_mvi(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t line_size, int h) {