From patchwork Sat May 11 20:51:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp299049pzb; Sat, 11 May 2024 13:57:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUF2B8uqk+4ymXBrTzvgstYMremXT0BFLa8CR/PqfKkC2Bako51Z827w+i+VVOzOWPdwu1/JSe9M2eODOsOFv+0M4rpzS8WtsOl8A== X-Google-Smtp-Source: AGHT+IHzojZDuY2mQdgll8ZYDMNvfflDC/yaYYkMJO0fZ5gqtj46kdrzdtO9SI23y1BQehsKZHgt X-Received: by 2002:a50:99d1:0:b0:572:a17d:a302 with SMTP id 4fb4d7f45d1cf-5734d705b6amr3549858a12.42.1715461024498; Sat, 11 May 2024 13:57:04 -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 4fb4d7f45d1cf-5733c2d547csi3586738a12.230.2024.05.11.13.57.03; Sat, 11 May 2024 13:57:04 -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=R40Wef+9; 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 630BA68D725; Sat, 11 May 2024 23:54:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2024.outbound.protection.outlook.com [40.92.74.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD5AB68D6EE for ; Sat, 11 May 2024 23:54:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eg9aYr1xYvApJFV/LOUiAgptP4TnzyxuAD7bXHDO7wIc9OTvRyygTn/fmb5EeZjvirSKLw+nFJj4l6+qhMy6t7c7ONgWmPeTMW5qkdMyEeObwH5gERE7Hc+5/1vOlPdZdPX1mnsIqU6fbxBmt4MuHNjdlaifz9tS4Dy9yFmr/CbZbGi9NWOTWSm7h3ffEDD0uwxBvmH3SAKDwbjKwb6S50P1kwhH8iD7F4j/KnSAA6tbDPkt36ucDnL63h4Te0KNPzfHgd1aloKKW+xJvdI+gyO/OLqtDh5BixuJVRNr5gtkdZxzclK9C0+CQ2vllCMzD68iiqMxReSuMz/PwBEdFg== 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=G9wnEToBaWiEGtI2DwesR0z65ykCIX2Jz/nG9SwueVkypYAEcvDqefSrHMQmEnzM0fGg0+BzuG6jCoAcaQppISbVkg3Z6c/tFpDJXv7TEZeBS1b4uR14U39XRlqpkh5VDsiYBdNBUMTodooIaeRD0m/x8kyYMLAiYv+ZSNiZnXqHOu157eZSwIxqhHkC6T0rjFwcgBFsfVWPKRpMAwqkogFEW1DXQHkm/b54r20ibgmbjGmI9fwbsNOmaQaWctUcOU8R6LIpr2Fk/m0HAgbR21r4ZwhMt+zgCejWxEpcW+jC8DymxNOth4A7vylRJ8QthVKvdefVrOLV3SQAx8Fk5A== 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=R40Wef+9xxuIRTw5hS/JvQ8gkWbLORoiIm30ETyQyeGle8LCu8t1cw2LQw1p14KQW1JNt3VabhAca/FRmMzN4PEa5CtZ+TDBsmAag4QM9SK3bdJLD852s7nVyGmxMzh216Bi5dGSMD4HzMNNqgFWbxFQW5u6H26xhN8q6gEbKLqVqhC1rdsdQJwTl7ul38o8oFFniTniR36oMNgqBF2jrdc8Orz934davQX8TSiqgxt3RPFjI3aV3RuD0nIDxaxorfGF3HikjIeagy0aoUpUsjg1F78KhnAu8vrvYj+pSsrzIE3xQURqDHFmK91YwrzhFYXejYdFDxJpckftFjZXnw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0403.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:327::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.54; Sat, 11 May 2024 20:54:14 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:54:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:00 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [9il5U/4pY001m+3AWioNM2Y3RT/smHtadJGL9g3B/Y4=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-35-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0403:EE_ X-MS-Office365-Filtering-Correlation-Id: 26216668-6ae8-46d5-22b1-08dc71fc8407 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: eE2QpJO9BA3IRu3dhjTN5+r2CSx0I+xfVNfyw4bqWWrGL5gbxSulVT0XlQlgmRaMIVxkExPP8+WKg4CljOiDa0SbmIKkvsH2tZZ3JZVSU9cxKwSZ+Rw3WOxIqA9R+jrKsINwI4tThsTOxLoUAqyvfsXxlul9gWRyTxCPXylHH0PCFrqDD1FtDdGiQJskddAdJVLxj/ho5SI34pGc4rf3qX6OASXAqytNG0UGuHx/FsTDFhKOHXl1CbXXTo5QQ7o6CSNvfFbLmadGrNlIyUSO8fSbJSJ4k3bSBzycN1209x2J9RVK0gCOCWFPAA+tg5KqG65HbZ8ophKiI3nEVCuvbXe7NzKs+wp2XdSLkKeFqTyBf2FavAdzdFFkrQcamp67FXvFIjHl1SC4GnBhw4RR9d9fk7mpOsTjUc/dEvQ0VOoyB912RoZ+vFALTpaPcIcWU+x8qXvrDd3HiujyWBgrv6tRi+IHcmvBgaYlZhEKMzGzMttHXRnbKVVonbjQBtDDfjYEjxcaEu6ucy9ix4SmKBXdFsXoFvdhMjuDwoY7+cXl63Zv5vtfhte02+I7uBnkUFB7EgxAEm3aWhpupBCJt3/WsEHjjVUxjT2ZYoIStPo= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: V1QSrfnCup54vgn8mWyphuuWG2Ao1jH/LYjB1hYAM5NLBZ+kVKChyzLfPdcrYOBOZ+Q9evTICfmfasepWXzemZsM532daM+OtrSPhZN7aiZdb+F11DvxHU7vFiY9SrpKBc/oIvIbc1+rP5YwYJcoSv0xG8PXw7wkFIiNuBB4LFkHgF9EPueZbnvmTCPJUCnZs1+D++9teQpek1Z2q9rBMDqOMATS38YEPx4lYBimNmMjMNSnmChRLES7PGz6dbvS1EQJCqprtM1sSmz03CC9jUAdGI26X0AYRmxVlbU6EgKxNZ/BJpYpywIh77nMwTDbfAhM9vZy+96ET8H22QQWG54N9hvG+D9rAOhz2swkPpzhevBxI7XCNxTWmDkWmd0yrElc1mIutNBatim34aOMDh4CbZHz/tb6oDFli63YYvltI+Fd1zTmUCkWT9clY744xBNngTvfVXd1CBu0XCR69SJB63O6AoXf6h+Osf75o6uZI3U5d4K6JoUECVPbFjq2rXXoEyd88CupBVj+chfeiNhRJE4BOScDQ1IYUapytV4P+jgaCf+xnoAMq7MHYu6GW93EHaQH6okFFQmZHC6H1UlSSMnA/7aTjP4GBlO/LaAD/p5nsyYZR6q8M5QAIV5T/f3O7hXsvl1RV+VjelaiXWVh+7865aEV8WaGG5U3wH1YyfSATmmfpKlDozJ1ls+ksRokBRPlg+6AMUMu6NWYA3f5e8IgQ3FwDal5R7SkNL0Vvuk1DL4Eiw/Lm5GVl/26M2DeEfo/k1UF5me/TZPFOneYl4D8wM6okLeRTrz/zNod2BtS2gzgR81GHeqRose5SzPDbkdK2jIJW4kNleAGer6kFVryPIDsW6k25zCHSnNlxQeNCo8iLNFs6pCRLbSWOSni8To89TpUCwNtVf3UmJmQPUOerIjGM8yyZx5C54G311Fku8pVJPJLkG4ldYQe/79a9xF0EpA1sdD+ztmP9/vyPrQuJpCxzWgM/yDuBASe4Cz7cfawvzJp0dasGu0mzY362ASj0tEPouVVtWhn6fv8QAizm6lGhpII0kFOVyKLtaNZ0iuC5aEkcAXCms6cQTy8kFCwpG64N/FGZ0FAyxiNHaCG64VFn/Y1E1fxN64UaDWUtrnj399JZKEelT47j0bKMbQ/5zkf7pMe4ULprjIBM2dhSgXCANTze0oH/I1OBrooYMPFBtIhzyuldBl6n01LvuFL/NJYx12F31i7jeMTk3FUVQmaDPXs5RRiwUkwXCA29PZlB248GIwoMnUuHvW750BLZUneNTY0eMRYWg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26216668-6ae8-46d5-22b1-08dc71fc8407 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:54:14.3116 (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: DB9P250MB0403 Subject: [FFmpeg-devel] [PATCH v2 36/71] 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: qIroBjBXUekd 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); } }