From patchwork Sun Jul 31 03:36:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37049 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1760590pzb; Sat, 30 Jul 2022 20:36:54 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vg9zVAaq4wC2qlGOZR282hrdp9jpH7rFyzdLdrrmpCElspvWfwswOq8lBfx4m2lS0U8beO X-Received: by 2002:a05:6402:424f:b0:43c:12e7:36dc with SMTP id g15-20020a056402424f00b0043c12e736dcmr9857315edb.243.1659238614044; Sat, 30 Jul 2022 20:36:54 -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 nd11-20020a170907628b00b0072afc15af40si8103491ejc.39.2022.07.30.20.36.53; Sat, 30 Jul 2022 20:36:54 -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=TaVWi4qo; 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 BEEB168BA55; Sun, 31 Jul 2022 06:36:49 +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-oln040092068068.outbound.protection.outlook.com [40.92.68.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F0B768B7CC for ; Sun, 31 Jul 2022 06:36:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bd+QOQeGdnJ/soRvMOrq6GvybQrS/d9b+Jgl2UryyCwHxcYx8luujiCQy6yn5j4o/abHEIE8k4buuKF7vKXfFZ2GWni42EyfC80L6VIAr/GXV5/S1bJwjBvNVFR9IoGqW+Whpca+I6LXP4PkmF8rCCPkbXW94iMzwAx+cUmdLwybt32bqGUkCjFcTgALAb4O2joJMHZ/+AWAlBZAB4rHqU+ig1amMcnMWp9bKqMa1h7yMWhN/Itpk+22J4CDoe1t1grnJVar97dq6Wsrx54aLIjw3QXQCJDGk9PDpttuzRuAwMNQ6Ac2vosnbh4ZGQ7x5fYSFlKzc320DRbgEKjZsg== 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=XVNBG+a0k6iN27/MlLbsXsktKdJD9PxpKb9zyPieYqc=; b=jlVtPFa/ZkksmMVNN+lvRYEq7MmCFkKcmnUKCBW/SFdhFhnbk7ciO1ZgAMGk+ZeUhqQTheJsYM5IxmoEjieus3ZERAtewuE+98z64Wo2XG98UY0J37a2Uw8sNaOBxNUrkWStgb4PdGD9vJUathVLm1NyoUfVIlmgkhG7Ax2pjaMramZ5Nao1A9uhyDNYHYPFeESk6Z522twZ7FgJYDpLoCpCK3PJU/ZPSxtU0BEPo44qU6+dXO0qfsO3nGDgyEhw10jATTuuzuSVNvhoW/umsScXJgz5MjWo1Zkf8UNTnKGDyiImZZFseto5TwfIjsFx2sKGFlYoRi/tVi1nblAcqw== 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=XVNBG+a0k6iN27/MlLbsXsktKdJD9PxpKb9zyPieYqc=; b=TaVWi4qoLDHSobLXPqXJ4KblL4B9dH3dC6bMV0wx0W6zqDA8aqbDIfWzpKgrVFSOq3wURB6BsAxEDf/u7nihhmUzUG8/eqPlRyZ0zlUWn44jQttmLKnKF8TS2E5IYYdi2UzOi+wu4bLKQASj7sE9StHV9za76hQGJLOuq1NAsPoYBwSFEO5PxTvBFufgdKAhPaKgN+XTpQPwrrvHwmFNNp3pK8BJAtX7gizdDhwR3knEPfhgJsD4Ap3gYjll8m2VXwI8XQAajNYi0lttqpDxJrNbgTUYrZSOFPIRDKoPVpjQyndE1MsSQdgBwxPuT3Mlk0LCD9lmmXA1KJ2TynErbQ== 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:36:41 +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:36:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Jul 2022 05:36:32 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [lfNjGucN9xd2rdBt1lU0y+CwlL3UC32F] X-ClientProxiedBy: ZR0P278CA0007.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220731033633.1324710-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1fbbed2e-fdbd-410b-eea5-08da72a5e1c6 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULClokFJ2g0E+CoZoyiL1cq+uKZyCo9FP+RWTkbFdJXItZi7ujjKp2j4SskzPRUOmX87/kTZ5XTlAfMpMmQ4a6fcxSgn6A5CgyUwu/kqDTXZ1X+elW8tp/l+qqarXw7DWkdnR2PtwLw1jMFl24Svx3z5vyUVhhHy5Vhzh22X4KkTKhjo3J/j1F+LjezZnA4r7ZmHGHaJPU5L9EElLeyIuk06TE3szgtmIym1HGoGF+LGbEZ9TB2vGEo384j9RayaR8HiO4VXvrLTA0PTwmzCACiR8bjD4B3n3t4OGd+5oITDs0uM+fVeYcyTwaE7yOZXF2er0wk59HgmZEmOQNOJzEDsJzW80I6iJgyFBNU1NN/QiR2OB+QaOHEgYESDbFZyNGVaxpdQLxRQcqNW1Ofrb6W9wwpEwNMrgvxogcw+wzRRCUiltkOKMKEppZaKaAhnAcQ+rLMxgzzSBrFcCUJ8+z7s/A5dnqT9ChVF69deyWGx9A0T62PfONSGU5MFofuqNGep32MJThBccj1RzUnINqcvGc9oSlVOsEpKAiwtjCVvVmF3RPuGjby+EqsDSKS2+qkjqr907e88OtcppUkuJlvX4J+8vwy9QaSAGUCD6JBQQI0pr8AdDq1PuHznX6BVW02bR+uncFUG9k3PzYjWwnGxgg7Yt6+G5rBM63oZ9iaNxlJxLcxyPmrr0lvSecr9orFNrvMxQhaiA== X-MS-TrafficTypeDiagnostic: PAXPR01MB8485:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tQDrIc6NVnXMCCCGm61PDgLnUdtbYA4CNEQKiUIstO0DOySau96Z5aROBlS4gVLtwiOuOq3u8jbZQ7vetnrT/Sav5R3wP1r2VpdQ/9V5aMKp+jqVxWWfCM/KDJmpOm/Jlv7YSPsMStoOjCiSRrJhPTTJAUgIbwiO6dy754D/2zuAy+aXefa7TklNTTFPF9z+QUzibJ0U0bpjBJFPGOwByt5IIDiqy0nNOKwsM7HZcKZfqLRzragl7Hlav6fQZZ/kbhL94iBWkAQ9qGsFAtMTyys1LZpDbWoboLx6lxYaP1+F1puz8Ky73tn9Mu8v41Ws+g6udL5qpFgGfJ6lS8Ovbk4QaRBzPGhm0kBTxyaglrgOEN1w2tPrOupIxQ4+brZVaSUEJfI8ycaNtVhW6uNQcGoq90w6JcUZl3cpV7pJxGAS7dtQGjC/Z/kKZFpZfs9tp9jopJeZbkcTRHBXOWKsj+btcWq+Ik+IDen/kjFaW4SpQGks9RrMWCPbxJC0jIa/WRfZ5d285fnRDUqvb8sLGCGg7JW8Rz0woDREQfw8e9jUPj10urfqjd8yD0Plonb24/9unbsJCSgdoNJa2oOlDAQBbhSVtwSiKJP+4D3E7XR5AmqFN0is9phczXlSPGup4g67TnaBRJiQAW4WPRKttQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mR8ARGpVoiIc/gZSVpzQsSQurkBGqAIpUCdQBN7HhUlFzL6g1OyaSpjT7dr/ZRGr16nTUDVg6xZQu87y56nb1bBSGHkw4FzZRMLKhQGd2TbvIPWByBQSAG6EwWOtKvss4dkAvSm4ZJ3Zr8N8LytQAtRXk1GiwIuTLr+yrF5wtm5++CDQptKpNqNns8Vz8DBObVxDu4eglZUwxAe/kqYDuEhjfT/P+J4hxBJmmFWMY1pe6gqVDY4lThA37CzTkeMNzYm6URBBOg34KBo96vXoQXz18nBdAoYGc77Ppf11ZnDquPU2xTAAMEYQkIlLsXeXM6jpnPkpuz1bIskF34zzzJE9RbX0Ii4u6EmiwRLtyJg7XER2DfwslEM9bnLPis087wCD3lRj1xTrpKEezvDpX33h6Vvua1AFnyYUMFRA32XRBQADftGJC/SOmCEw3GUdmDND0AmvKV+jJqETlbFZKaOVRR+atAQCzHJeuqnJzmpLZQds8eUFyvOE7kQN+LMEvnaHL+QouXcXDQywsTTwt9UGFsZhuIFRSUei7BZE/2tx+9r3k9YnUUdh2cdq+/YEVYGXN+XoW7y73a0XXjeel9yxaDKdeYzgzcJEWjUf0IuejNhmOqpGgkT/07MJC9ekmw4VcOwe9sQEP1PIJX4RGw9RTFvVHQDtvOxf47K2p/KPHg4mBA1iWErtjEq9vEnbQlqj/nWB9Ql3ORpcnf7EmXahgm77eeFRuzMBMZLGw1I/YLH8PUQ2ZXCXNGkI+dE9wgSOZegvrsviE5PXfrpiDFCvuGyUYwbZ6gfsJ2/DB+Qnu2ddIj1TJsY7yiusne9Z8sNeRHa9lodCMnc60vbsSqyVeAL75pr5O2i5nSGhXYctMTVY8BRQS0VekUrmWuUT9v58aFJRLGd+S3hO17JKL00qHh/hmhU7AcQAE1QhVDq0pa39t1HHjsGT4PjFHggz+hZSVm2KIhoXPRE9BsybZRyFPZtGxMNHmJnpG1K8pIiMHQbK849iPkjId6oPrkm0fKBvLwk/CuXsnQTcze9kDD6d8ATn6D6WgE42lmQM8ohFHfnOsiVzqAk4QGSxPpOT6tub0Vt6241DBDkgNivO/eULF5z/J+jy/kP7uZGhUMAN6cvMSUWuHmxrSkY15r/AQn1/9mtseCQ6BmTKWNccnTZPy679l/eJEzEWcMxwFQTn/YqiKvHJaQzSTVsn/Z6vllkIlMt1LWjcY6jJHQbM9QouTGY8R2hkJoX5RgDTH/XKA65bLt6HaZN3RI11LT2CivHeCQ11NxtBKu6FnefAqpsOLNX0eyaimO+i3jmnn0U= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1fbbed2e-fdbd-410b-eea5-08da72a5e1c6 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:36:41.2396 (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 1/2] avcodec/alpha/me_cmp_alpha: Use proper me_cmp_func type 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: WffrJ9FqYWrF ea41e6d6373063c3a2a9bf48ce8e1c2e6340b694 forgot the int->ptrdiff_t switch for the stride. Libav didn't do it because Libav had already dropped support for Alpha at that point. Only compilation has been tested for this commit. (It might be that the ASM-versions of me_cmp_func functions need to be updated as well.) Signed-off-by: Andreas Rheinhardt --- libavcodec/alpha/me_cmp_alpha.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libavcodec/alpha/me_cmp_alpha.c b/libavcodec/alpha/me_cmp_alpha.c index 4e9e0f88dc..d5a78f1247 100644 --- a/libavcodec/alpha/me_cmp_alpha.c +++ b/libavcodec/alpha/me_cmp_alpha.c @@ -23,7 +23,8 @@ #include "libavcodec/me_cmp.h" #include "asm.h" -int pix_abs16x16_mvi_asm(void *v, const uint8_t *pix1, const uint8_t *pix2, int line_size, int h); +int pix_abs16x16_mvi_asm(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t line_size, int h); static inline uint64_t avg2(uint64_t a, uint64_t b) { @@ -44,7 +45,8 @@ static inline uint64_t avg4(uint64_t l1, uint64_t l2, uint64_t l3, uint64_t l4) return r1 + r2; } -static int pix_abs8x8_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2, int line_size, int h) +static int pix_abs8x8_mvi(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t line_size, int h) { int result = 0; @@ -119,7 +121,8 @@ int pix_abs16x16_mvi(const uint8_t *pix1, const uint8_t *pix2, int line_size) } #endif -static int pix_abs16x16_x2_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2, int line_size, int h) +static int pix_abs16x16_x2_mvi(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t line_size, int h) { int result = 0; uint64_t disalign = (size_t) pix2 & 0x7; @@ -192,7 +195,8 @@ static int pix_abs16x16_x2_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2 return result; } -static int pix_abs16x16_y2_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2, int line_size, int h) +static int pix_abs16x16_y2_mvi(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t line_size, int h) { int result = 0; @@ -245,7 +249,8 @@ static int pix_abs16x16_y2_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2 return result; } -static int pix_abs16x16_xy2_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2, int line_size, int h) +static int pix_abs16x16_xy2_mvi(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t line_size, int h) { int result = 0;