From patchwork Mon Apr 29 21:14:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48384 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp2271178pzb; Mon, 29 Apr 2024 14:16:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXYAXa1imx/uJD4um9F2NyP4RVnvTaS7Q77FELoplg98mpr2rYZUMq3hQEqHH0PJgDOz/u9TAnuOa4AbFPu7U2GSA5vlaSF/fM/cg== X-Google-Smtp-Source: AGHT+IGDi5aExa26BC55iTwz3erqAuBPqXCJYGDEEVwImLhGEccizdMBQPzS7UXjNFMmbgHHF4Z+ X-Received: by 2002:ac2:545c:0:b0:513:dbcd:7b8e with SMTP id d28-20020ac2545c000000b00513dbcd7b8emr239579lfn.24.1714425404401; Mon, 29 Apr 2024 14:16:44 -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 x18-20020a056512131200b00514b61d60e5si8708276lfu.596.2024.04.29.14.16.43; Mon, 29 Apr 2024 14:16:44 -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=dINP430h; 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 33AEB68D554; Tue, 30 Apr 2024 00:15:52 +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-am6eur05olkn2060.outbound.protection.outlook.com [40.92.91.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B38968D554 for ; Tue, 30 Apr 2024 00:15:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M4Q/Nqe3Fkwio/aH3mCYHYb57xAgGre05XX832c/4sL+DN4PWKZA++WAVcFyCpwbE+i1k4rd71qVvGZwYSlyItdfHKN9wiMje8/3Tylg/g6pWNLu2ELooPN142K977O8TkOI6u/hcF0SxPrcPq623OTwbxxsqyIsCYI8g4Sb2rtSrTC9xotbS609p6CIgYeSk5Rjaw+wYzTKS+Gntve5EHb2x0OIf9oQ5/1Fxn+oazUpoV/ZCBSkc+rHZ/pvA8JmlGhO0letXtXfjOhxovEf42uA0St0HVmCE7axEZhrgbGdmB+jgTvYnK/Lb7GCJXoDzqrkju+IlQDGdoJRbSXvaA== 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=btqpa3c3umfgs2CGrc9XI0qf5OMsZ4dRuT/yO525Vvg=; b=SKBWVWisyQdVYSRcJmbY+FEp7tN2IMgfHlZ/l50url6+lmM73+gJ4RsEm7Cb57fseMdx2oiEfX+K5kOlnEmATX2X8jQGSbFporv9msFSrco7mRJzk+eBXOOXLlNIpvz4JI5l46GdC5s8F70rRs7yGtzsAjM7+g8BPdcVy1+zseRAXVZltb/FU6gXMa/R+wOKe+qepLHWuRnE8KDbnEs1BLNGoJItvHDS5bWY66O9e/VNHjOZkIevdo3CTUNrnD5grB+764pGf1VcFNxdgnKOubJiyo+xq+gkPhdwKXh9dOnZuWDqY2ekQtKs7o5VKZpotbgS1YOFc4xR8RjrwrKseg== 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=btqpa3c3umfgs2CGrc9XI0qf5OMsZ4dRuT/yO525Vvg=; b=dINP430hCiicjytSr3lOti1FtAm6ZKUQTkgxyeHGby3efth4tMf9kH8u8GAyHYtCQ525McpnsJ8IkYiuidgR+GzK7i5DODSgQJ2A67LS7dKGgKJhDo7uojFDuko52XU+dJNIi0WJHK1GUehpR5I16RbfQAmBIdx1A0XOsIupJ9VB9qLxPq19a9+tkS4fx1CgOEFPVlHWNTn3weGQ0jGMRd46WPndsd5QYSaCealc/LkS+ZkmIx/OIlv6LRimRdlHk7nBAFn1iaELThU6vZN6S4NejpGxfK+bv2HwGr0PNSRFzaorRSTp+3Sdhhk5Ran45u0+oSkr+G8+12Xy/EJLxg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0372.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 21:15:47 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 21:15:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 23:14:06 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [416MlcGwfF6KV0Gh3Dp+abY4SSJyD02Rx264AKdMw88=] X-ClientProxiedBy: ZR0P278CA0199.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240429211438.3274834-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0372:EE_ X-MS-Office365-Filtering-Correlation-Id: ad391e76-ec2a-4357-f1af-08dc6891899b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: eWD8jLdxNtMtu3cnmJ32XYVL5MyoA60t4q2iX0HGvZJ/RrUTHye1L4rpCxg/CmBnJI+h0zUUtkD+g0l+wrIBnZSf0F0CQlSJ8oJXpYezXxYV5XkmmalHrJPfgn3yqmEqf41PkcZWeHMGNU/hvEwHj9IxGFQjDplZjySO9+3eMn/WEn8zUNCq9B/Y0KfTPORa70JdhbSlFUFI2rFoXJP9jwoEF2Rj26AF1NrlSo6Uc/7yDWeIuNB4ShZvxyJv7OyBxC9Y3ACuzolS32/iunDB2QaiVpjbzRCqq9pny+RzyLXdIBtocWJcaicaQT5Lwgud1sA9NEZpTki/uqdn+0oQT/sfhEdl1hQr30KksSm71bqyvRiROb6MtUbuh2OejvK6YF10G3uGSSB37PDD5Ci85yU7tUsujhgwaqhEvgjUQx4KGxEi9Tr42a7x5AYcZ4OpjupQ7VnaZDEian0fleogS17N0cTFH8RsCjUrXSdMW6fGqtTY2c1Xw6z7wRym2tIixCUZX0oGXowbL/gAwOQceD0t4K1/mRL3S/EQKHy/umGtVnRKvUlvo86TxWCMImFUm0kiXzdVANtANBp+Xdhk1t510LU0XyxYsStluMpNEYk= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QDIDkN2bA4SaGR0KSaAiEz48mgqL9CREeV2EaYRLqenZpNXAUqtY/QzdYBloDSHxVyLmpyAKsSCCDku5K2k554Y/aiqCaItCAuFMTF6JiVGSQDjR0/P2LlhS9biV+Ip85fAQr00pwt3PGUj/ZVdO3eX/zcUfnHL/r7lMXZ3QHxLlR74woXkNeOHLUB0x4ISnrBt8H/jfIVkiX4HPjkEjH5qwDWT+g//JevWkD7/sGfgqWSnkzg3JuAL7Pz0ILiGSptLGYkwr3A4GIXwFdhRS+Dcd40Jn/FIfUulwddkdPiI1nhn8SUkf0RKfk7/1OIvnWhVFZNmIlX/U0NaNRaTSi6ks6ofEFfI5LpAtMFwpbTvW5TZpeuTCzNmCNxmHGIwku49zSMvwcrC8DpaX4rUJ4yUFjaW6nP3gz/14N4b78Eb9H+hOuA4KGKGi44nmH6m5Us9K0q7/hq021ruV0b4jG7vhIqINHH8uArK6jTo1LmiYHIL41PerfJ8ESf4jlCZgzovXbFct4bvqSpsT2iQDR30f/XQ5JwTNIzimEUuqUR2wrJfSXkzrtCK/BrzAaYhhh0QjKhsCo9O60MY/vWcF7ttuABkAz031EymphbZ6CNWYgbIEhX1q7Mbad4eqlvHe0F1zRncZieNhX23NnRy8MBvGVF0k60pRbf7PBf3BspC0OrbMgjveoPC1io6LYgJAIH/pMz9C+vAhaWYBy5RBpqVpUga3Qqd0T7F/yWDonWxQ70l48GVqU+DoCuclt6SlA4JX0TQGmGHXSuc8s+XgZx7AxCMeR2dcI3r2ZTQ8WTd6Uf/J62TrF8oPdw93q/e/T294OVNqxzFFF+eMdCF5MpncJHD9Nxlak+cXHwjKrGiLRaDwVwX72mRKVSbtPPy8r4BBgmHF1z7IqaqmZOMpy/N7bZyOoDqK4DE9CLx7moOlAA88njmOKsN1YI/1I7kBpuJHbwy8p9CV9ADKY33JKT+S1ZX6msIFrXc0RrzzPK5QO8ZnpuDezJnEHACfOWlutQfvMXTzIpmJG5ZuLZj7Bxl/WJdebuRrG+F/p4ReIbyC1SfKYs5zmxRru/nS/k2gHo18txDWwb+7OBvWpuW9RklLeEG0BUBO798pWMzXHOK3WxaxBbj+xfMjR/PbMHrK8MER8Xb4ET8+OAW9N2Z6G3zxDWQoZjWXYmP+FvJAyOuMIW1b2aOMtSrlxWvR+dgx9znF+rNZyT5C6EQOLz9S1N6CZfj7dHGss4izd0QWm9t0DXspAQHNtJgmFIXH5jFpfasi9TYgaaB7uIZHTsJ8xw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad391e76-ec2a-4357-f1af-08dc6891899b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 21:15:46.9750 (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: PR3P250MB0372 Subject: [FFmpeg-devel] [PATCH 25/57] avcodec/vc1_pred: Remove unused function parameter 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: omhAAEhSqBC6 Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1_pred.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c index f5e80fe0ef..9141290d26 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -66,7 +66,7 @@ static av_always_inline int scaleforsame_x(const VC1Context *v, int n /* MV */, return av_clip(scaledvalue, -v->range_x, v->range_x - 1); } -static av_always_inline int scaleforsame_y(const VC1Context *v, int i, int n /* MV */, int dir) +static av_always_inline int scaleforsame_y(const VC1Context *v, int n /* MV */, int dir) { int scaledvalue, refdist; int scalesame1, scalesame2; @@ -161,7 +161,7 @@ static av_always_inline int scaleforopp_y(const VC1Context *v, int n /* MV */, i } } -static av_always_inline int scaleforsame(const VC1Context *v, int i, int n /* MV */, +static av_always_inline int scaleforsame(const VC1Context *v, int n /* MV */, int dim, int dir) { int brfd, scalesame; @@ -170,7 +170,7 @@ static av_always_inline int scaleforsame(const VC1Context *v, int i, int n /* MV n >>= hpel; if (v->s.pict_type != AV_PICTURE_TYPE_B || v->second_field || !dir) { if (dim) - n = scaleforsame_y(v, i, n, dir) * (1 << hpel); + n = scaleforsame_y(v, n, dir) * (1 << hpel); else n = scaleforsame_x(v, n, dir) * (1 << hpel); return n; @@ -365,16 +365,16 @@ void ff_vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, v->mv_f[dir][xy + v->blocks_off] = 0; v->ref_field_type[dir] = v->cur_field_type; if (a_valid && a_f) { - field_predA[0] = scaleforsame(v, n, field_predA[0], 0, dir); - field_predA[1] = scaleforsame(v, n, field_predA[1], 1, dir); + field_predA[0] = scaleforsame(v, field_predA[0], 0, dir); + field_predA[1] = scaleforsame(v, field_predA[1], 1, dir); } if (b_valid && b_f) { - field_predB[0] = scaleforsame(v, n, field_predB[0], 0, dir); - field_predB[1] = scaleforsame(v, n, field_predB[1], 1, dir); + field_predB[0] = scaleforsame(v, field_predB[0], 0, dir); + field_predB[1] = scaleforsame(v, field_predB[1], 1, dir); } if (c_valid && c_f) { - field_predC[0] = scaleforsame(v, n, field_predC[0], 0, dir); - field_predC[1] = scaleforsame(v, n, field_predC[1], 1, dir); + field_predC[0] = scaleforsame(v, field_predC[0], 0, dir); + field_predC[1] = scaleforsame(v, field_predC[1], 1, dir); } }