From patchwork Sat May 11 20:50:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48743 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp298353pzb; Sat, 11 May 2024 13:53:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXX/L6+ZddbdaGkU+muJ0Fr2HXztDGxokM3BrrXnJ3AZ7BCZh7SOMFAjU83jMEqNcIryVOFwq9xeVNL84izQM0TJd7ztusTv2iPGQ== X-Google-Smtp-Source: AGHT+IHgu7cYdfIDLdKXAQFS74vkDzMSqsH2rHUeC415ZSsA/Z5rOu13oHzScBPwhY9HQattVMTN X-Received: by 2002:a17:907:25c5:b0:a5a:3e00:6317 with SMTP id a640c23a62f3a-a5a3e00636bmr338841566b.31.1715460839331; Sat, 11 May 2024 13:53:59 -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 a640c23a62f3a-a5a17946017si350869866b.97.2024.05.11.13.53.58; Sat, 11 May 2024 13:53:59 -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=K6GN2SpD; 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 D6B2268D353; Sat, 11 May 2024 23:52:46 +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-db3eur04olkn2108.outbound.protection.outlook.com [40.92.74.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B87A868D620 for ; Sat, 11 May 2024 23:52:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VSB9WbDhN70LlDmv65POaK1kDho7Eh81cy5U5TtsHopUQFeABAZq86pra7OTt/0ocN0ofSoCpMDv9+m5fJRbTLhVjD8wifks7BX3LQmSZAQb4uTzGlXLLYnkSQKK0MBgMI9vmO4HIUa5SNPkl06JlgODqKXIAPmHHLsZ1oXBamXqJy7Zy0hb1dRzjHjYUc0fmo0nhkofUUPa+PU8AHh2o8lDQLXSMuxD1OA8fRWHKYOxDO0NBbmzzi+9k5L0Ch06TNjxHLWungzzSIbPHmMozgFk/OcXpY+ltifJ5IWl7W0c5KCo4VuVbjn1/sWprMsmDjZtBx143UW81P7QkM0Ekg== 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=Lb9UE3JNbn81YMpLNwHjO7AqShG8gtMKPM0yAdya3R4=; b=cY9P5K7Sa1seFr6x0NXUxSKbCUIwWp6/qqQEcSfUvOB7i0qIdjaDgkhhrIbgtR3bta5SmJfVsP/9fzxix1EnFnGQMwDd8PdQXqmkbI/XWR2D0Cy8iVpvvokdHg/AgmVNsJb4+j7TkLnal4pSWfOZC0hq5Avyx5hz3YcwI1KS7t/AYltaiAsj3RfojI3ONStl8jpY067zNa+/LP8Lom6ApnaSjwk86xsxKUGRG5qGS83gA1uVj+4174qjmEUjhldkm3h+ZtvwADo7edsrWlSQmYLxmnrxgnl0sBDChUg5mjH4Y2dlWfcReldb9zvpQbqIYgRtSPEYq5OvxDuFesBWpg== 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=Lb9UE3JNbn81YMpLNwHjO7AqShG8gtMKPM0yAdya3R4=; b=K6GN2SpDbKdkDWLYxeC6AgV7aPwIQVB8jSMBc+zqTlArshSs6PG1K1yppvtv5d0AR3QuLAid8s66IWgMB5ETn7bhi//AwOer4YP/o/1IzzSpyO8I7rmpWq/Vjg9ziXLLFpvX4aOcp00SFoo7KiGn6cMkjoPPk/sGTAAt0x1dgPdBylU7S+u/4m33qA6sN/221PGmMEWqvbRmtmd4Jv1fXnuo1xY/VMgzrV+Gk7/lheIHABgueJszfoE31rELMgvwDaPMjVSx6Jw8xlD+HJXGR3vMs9/9Y5AVyKkmJ+ZbY02DUqnAY7sBjDSkSxl6otU7TgIKccCLaNhPLnTCXtGAaw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0449.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:325::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.51; Sat, 11 May 2024 20:52:42 +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:52:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:39 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [L3J5FYQ5HRtWJKA3dQjZH5SjXCdR5Q1jWw5WMckgWTY=] 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-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0449:EE_ X-MS-Office365-Filtering-Correlation-Id: 389e4b90-d4c1-484b-68f2-08dc71fc4d42 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: pludT8K+Q3NrpHdPiWGKtLy+DOpirNd9EYKGahJKPzXiB6P3vogBr46PanByfXz6vFqqSG8/SmWsxTZKwVxLE2BP/denwplppRkt61IlhsaNVN+KHHxHfViB8V9tEsB03tD/zpC2k94eycXQgXcoDOO+j674zel5cR4nauXEwya5fV6ArV4rAGGno0Y5FrrLKVJFrCn7+4UnY1OrOVl6JCr72b3ZTS+N5WjXbk4YpO4UJmSVBPYXXaF3EpRSAQlh0CL3H6huHZDgfOnQwlLGeu22jblPcsnk7Yc8Qf3Dbw054cqE0/xqEEHEbKPln3v/LJIGaRR/uoqRPrCKv4CVQmslod3nxloFa84BIYObh+Z7UikzhbiZAW8KP2S9Cqn2K3UZR5wxFjOGadvDKDgFrIRfvNaJ4PrQvLaM6R2G9lDy2a1CsIaF145dWDnrrSbhukZO0AU6r/Q/WZ2rZ+7EuGldYgblKX4XC9Bi7/fu7QfgIq1iyx2F+LdgnOW21GLFQoIGhSsAo81MVv9JlpUAd5w7qYMxZMQ8GaXaL0p0GI9m2+sReG0GC5Vj1V1KwLNGgfud0Vx5ZCk/v0ryb3off8b7o9A+//IkRFWTQDgESWhBZPGEfKZ6f3UnC9W9+mjt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SGUBWIiM8TD/Dg+I/EX6eB4JTdZXpSJ9eKhiE8MsrpwgW0x2nm5Msjjm7koSfnkVAP2fXAxY+KzjKa5u37OBoWBODF2f860mZJINJCaDhBVYqVID+XxMmCIx+cI1qkaxScPZ+m0ZO56XNlq221H26/RUmDdGtu/a+w822DftRFe0CSMcnrpj8xS9KfL2vWLN9PjXls0RE/hlS+a1MYTqJt5YFugJ8PTx7mVQvDCNfDEyr1o2O8jfINyozNoGf+WNRS0Bio5DDwV7Oo5SuYMb/YE5hz+TOrCt3iJa5cgBjY9+NAC05kNHOGMhPDlQCPDM5YlmEbxkBB+B6QMYmjyQ7eYg0oVrNYTIdH/0Id7U8V8ax/CPDM4SZiY6G78ols+VW/T62nJoK9Hm/hv9i1pzIzKIlSmJcfuqryDxUbz7Zg4eZG9gX9geIXJKdcoButfdm1xG6AgYVgKIh9roNbac3fEh6+q5Pl8Uq8WUjAvid9QZeuXst1C4DM0WaLtsu+fft7ti1cG2P6WgOHRvssmK5ONM+9Qa94mSlYX/ncYElRXG0y1sJgj40Rjnx0CFMxEyN+z/Tn941/oIaS2yrNncpHGdIS/+ViIjaFjzzEknknqKwalDvAne+CuQIG61OYNeNwwzhr/rsC3yz8YO7VEuG0B+/Xmf5bhQ3UlwQfahhF6WOuQuRZ8lzYWibvXY88JO9s4KzL6nTiiU4Vdc0kEI1XETuxbeRaHTbPxz6Q6KcKXSc4q7Q1jMitrXllwPoY1Syu0rBzNDYUTpycy6ISryz/equmNwY+MOJCEi6c5j/0AEv3Sjx3eMMlE0Np0wvoLM/5ZGVGE4YxULlhxyoPn5lXtL+ww8ZUITyJH8p/iIf440ipwgAvjoAvO/IXwu9rFoCuE8htdl15MdhgvKlxdGLAGVdzAF3frTPkaVylYhjHHDjmqQixfoIpbPgSrr6b/QtYgkmY6Ly6nts3yut4XaJcQVcYMsxSCfzpQr3DUdTq3ncixzt/kZ8aeHzMXEPikKNVpL4OUtGkkkSwMbip+b920RgWO1OmAD46gNCwx3btnO60Dk9R99HNOVSB83C3ApCxuLBv5BFuoTguCwXnhvI1Ctm2EECWsXGDbYjlmYEcSFrYgsKPMRoygc8OsviIb1lHI3FxV2i20xVGB8PbU6bB+YqaA2vdc7CjmWKItip2HusWBL9CrfF72KMueG+ufoP+WbvOyeAtasrz7zvmh336ZLLRNgpoS68lG+vlbjwq6dAyJYj7JKTX5qwjO+4V10IbdwRxyPs7K7gtYhkZj9DQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 389e4b90-d4c1-484b-68f2-08dc71fc4d42 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:52:42.4330 (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: DB9P250MB0449 Subject: [FFmpeg-devel] [PATCH v2 15/71] avcodec/mpegvideo_motion: Avoid constant function argument 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: 1NlA4UcMDDcj Always 8. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_motion.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index ccda20c0f1..56bdce59c0 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -239,18 +239,18 @@ static void mpeg_motion_field(MpegEncContext *s, uint8_t *dest_y, int bottom_field, int field_select, uint8_t *const *ref_picture, op_pixels_func (*pix_op)[4], - int motion_x, int motion_y, int h, int mb_y) + int motion_x, int motion_y, int mb_y) { #if !CONFIG_SMALL if (s->out_format == FMT_MPEG1) mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, 1, bottom_field, field_select, ref_picture, pix_op, - motion_x, motion_y, h, 1, 0, mb_y); + motion_x, motion_y, 8, 1, 0, mb_y); else #endif mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, 1, bottom_field, field_select, ref_picture, pix_op, - motion_x, motion_y, h, 0, 0, mb_y); + motion_x, motion_y, 8, 0, 0, mb_y); } // FIXME: SIMDify, avg variant, 16x16 version @@ -738,12 +738,12 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s, mpeg_motion_field(s, dest_y, dest_cb, dest_cr, 0, s->field_select[dir][0], ref_picture, pix_op, - s->mv[dir][0][0], s->mv[dir][0][1], 8, mb_y); + s->mv[dir][0][0], s->mv[dir][0][1], mb_y); /* bottom field */ mpeg_motion_field(s, dest_y, dest_cb, dest_cr, 1, s->field_select[dir][1], ref_picture, pix_op, - s->mv[dir][1][0], s->mv[dir][1][1], 8, mb_y); + s->mv[dir][1][0], s->mv[dir][1][1], mb_y); } } else { av_assert2(s->out_format == FMT_MPEG1); @@ -790,7 +790,7 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s, mpeg_motion_field(s, dest_y, dest_cb, dest_cr, j, j ^ i, ref_picture, pix_op, s->mv[dir][2 * i + j][0], - s->mv[dir][2 * i + j][1], 8, mb_y); + s->mv[dir][2 * i + j][1], mb_y); pix_op = s->hdsp.avg_pixels_tab; } } else {