From patchwork Tue Jul 26 22:08:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36980 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp233033pzb; Wed, 27 Jul 2022 02:32:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u62LlYs1DQDxHTh+MeFuk8gS7i0N3vJM/YsTaBmnfzgOdeDpnqcTI/TMVkTLmI1QFUfCCH X-Received: by 2002:a17:907:948e:b0:72d:3fd2:5da0 with SMTP id dm14-20020a170907948e00b0072d3fd25da0mr17093769ejc.225.1658914370760; Wed, 27 Jul 2022 02:32:50 -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 u4-20020a1709064ac400b007046fc0f0ccsi10478596ejt.320.2022.07.27.02.32.50; Wed, 27 Jul 2022 02:32:50 -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=QkPdq1cp; 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 110F868B8EC; Wed, 27 Jul 2022 12:30:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073060.outbound.protection.outlook.com [40.92.73.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD1C768B88B for ; Wed, 27 Jul 2022 12:30:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TJrkh5FjUcOuGBGPEdWVD1Pq3bTkAr5AHGQeoXQVAd/Ouj6i6Mr28YRdBsMuU1GQx7T1EnmFQsZHSODZwJQ642iIbVaVi3QirXieMRHK1Fz/rZd8ni3Ln3BgQ7hdKyCAvXtBb9zF0BiGNABkjGhNEVzZM9vh0s7b8hhiCmSOqIsIsnfptzniUXkWTeRlRCY9vDqP5TpfrrUQfdDFRO3LZuD+u6PYEs7JePi/tHuBCwKKVfIZmkEIkEp826xZK8fyNxm3OA7VqH5JsrefEoYclBsvNLas+HwRXEpxfhqihV5uTKWbhWpOPIq1v2Zfr/J0qjycrxNXk8XNLHRFgsixcw== 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=F/dIwytSG+y+tzgiDKIrRzm5V/apv+iM3ktxgBJwcQI=; b=mlXQFrEvLhLyOZo3hhW4E8dv7cpVAZB+LVnRnymV/hT301LD2ybrC4JZuQDmJlFfyx9nTUpdLyZcA0m0jLcnmDN9vDBGviGaEkO3CIsqg3Ry251M7tSyOzCOlHftQ4FCa/f9CAOLgltHRi+EXunddGI1RgcuvfAotStHM0geV1buJnScklQ9mR5PqlnBQO9QUDGPnrlgLkz/EN8fLu9odCqR3fzfrRwjknWicYZdtU4wQ+PWpS2dL0y1WIKe2mNMGxPpy+fYMJ0NMbB0vOYq4L1Mpo6uiooXN0REULFoQqRaheYzKy7qHFwLBMuAQdlndxu66XL8nJ7pR0Dj26Cj9w== 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=F/dIwytSG+y+tzgiDKIrRzm5V/apv+iM3ktxgBJwcQI=; b=QkPdq1cpeLSaEyskjIPrU36F+iIsQAArq+lymShf9boFBeHsJSfNxofn4zWfW/INbpP8qIGy3e9CtQ56IIbTdCDp5KcaO8AA/z+mPMDOJHM4GgdW3iA71vA5DbisQo3+QBJBx4cJTItdNWX1PEqEWeM4pg0nlhrdpEOfsw6tgj/2WCZbAHoQnlOCeIq1L9xiVqlZdkvTtV9ADKNxaayBnsZSC3stPf/IH9ZCewop8Fqe/OAZOqP2Fab6dFdD+tX91kDB8tI/7KI7uf++XTQX7ft8v71VkUOwT5w2hpGEkswuwWh35pPfYtACcAi9j6ajPkvogkFeS5zPKjg5OUnmbg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB4626.eurprd01.prod.exchangelabs.com (2603:10a6:208:eb::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 22:09:53 +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.5458.025; Tue, 26 Jul 2022 22:09:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:08:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [lL2djwCtXFXSyhMiyFFB4QDpBBBch0RG] X-ClientProxiedBy: FR3P281CA0157.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220726220814.695563-34-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21e7bc4e-067b-4254-4a7b-08da6f5390b4 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVFHiteK4sjkXoIVF2tzJUYZCowG7PjIQxg2Nh/FtJcYpxeojSqM16F/FngKSqGLGJNEH6BtLDotTbujYXR1vK0mmMRTVrHHto3upMDkrfB735CBqLkj92wOSyCfIbpaXa6XK+XWTZ7QToH8hBx+qwPwbGyJOKTfycXdvYi3SXxu4p3SGCXg5y90ddYHx4WLk1NzrNOdhpYNUJ4axFopHsM9rLSsOTOtaS+kmTPVIBtQzmwVyIJF/Uxv4VZskhoy34w9IzqLx0JctFCFSW8aonfD2KEdem5TKIkLQ1oPZTdrvRpjmOV4fWoNFWhlkd2dZhYbZBhtklM9qwGy8qOvv0rnj1HCqBbhrVndFVjdqwjYMGCOFq5g2gwnt/OGHU5cr6HZLNAMjoEImrEQf4voot+DwoLr1iRYbtQ2PhPrbvCPuMdExXLZ39K88z43O/p26XEor0XtqHNVv3COqfPbiTGwMYdAd+u8o1JxaLqpNaThs65n4s9v2DdY+omxvAhvRrgoBDu8gh6BWflDi7iPxOq4jK4Db0H+5NNBZF/33mMAb4B8bYKFnk9M+35Qz+mCyVvlzQhK55D2QBh/yXNWRV4cx4cq6K08l+tSj7ig7nOocUPv9xT2rWajI9vKc7qqdeeJjsqlsujBq1GuEaF2Pqk08Ze68yWijRABIvzoMCNhpDZvC+xuPvyEADXFKu1XHNqXrq/9bNk0/Lmt2hOFVoDV3omwjEzWvc= X-MS-TrafficTypeDiagnostic: AM0PR01MB4626:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xCZS9OFYQVlHp2BoiW49EuhBhyd7A9Itgdt5/KjijdEC9M5Dfjy1aBbAHYal8Fr2QgSbx02xU8X0hiEo/fO71Q9DYwv5kxicenGzlGu3bIzDpKQmvGp3NnKiYgh2KbZA0KpPI/X7YTwaSp7YoSkzX5GwBvZFNi4PikPsgjGRU4YAstY9PZR1Y58Bh03ZJFVdomgDm5tOI/I7bLuHk0DIyDui/I41MKTN5i4vuDIN9BV10RnZMP8xvcKhNmK+xYcW7V848prwY0xZQZ8am76MRGK6X0KvRqU76sYBCPVeC7A++wKh0jXAHg5k00jGmxGTwo4MMK3DWv9kfNLuRfzL1PLfUL8tldPPGLxL41tr3c4RA4fclk90uAwEEt3kGCEsr+vzeAbg3WWpwzRKEJZ551yDGK7GdLC20ypI7dkh7GjRoFx4utCBSj/JbJ77bXLMCxmlCYgE8atJ7BerUZtg5mTaAb3AAWLs2EJ4a/InBVM5w4zTw7DuzEpYUnBbWOrZYBXoky2Je2ZxbRCnI+xHZUqts2HWiODyOOBK/ydJuzpMhoMdrVxPS6u8yWjiIqvpASvoxKmUTK/G7DVIJL1K+4mI6k1zVhwT+swzz1vP2DXasNMyruM/9p9LNG7+go2T3e6s0PmSkS4U02mD1t7afg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h/q0BG/1WgcNiytcrN2J4BE9MRrSPxiZVmQ4zZpG+7N1nG2qUxhMD7rUOjPXPAev3Tf/87UqdNYrtHVMVMQAXIkG29oY+v67yzT5mh74mW46iUJSNsNo8RIU9cPP2V1+3OjH69/UCBhHPKIKHTWOSAOTm1Q6LCgbdEtrWAsjs2MSTvTVe12z0qxf1oKZYkvl1im68mKUY8BqOxZkX+FwyT28jQl5j6x6Fs4mHgIhiZLwPlt8y+pyYBST4ceKYYJAj8h68boDFcr0pVgmDcHm7Xel1sMAIN+G3m8Ra+GlPXmX3tbItZVOdCxd+dPhQg7XgOYRnXBe6IKeQrzDsjkU9cSrMvRWki1UZFT/Orb0IcXt0QyAVeKI1lzSZKDWVUQR96zdsNbCirlwKQUyKYdcmEKgjJe/TBD8shSn8tWN2yAF8UwsiAEiXo0cvgiRwXIuJ5KPYQEQsA26q7+Qf85Q4X1CgGpdte7/BKo79neTGKbleSmlVZ+uZEVsgY44z0KaPjvRkibopDq9mQaB8pZVvPLF1sgiEM7T0hmor9pufcfguzhuLNQmao7RNyllodQj+s1RJ2as50eree6G90Nr/cOVAb6kz5RxK5qJAC4kS7Lq1OH+axLNnWKf4kigRj5KddxaG7QYjly+r+TAz7MtyLx3GoFaRpL6e8Ko82GLrcVHirjDMN1soeZebj3Fe9xL9eLj28/GucWZL/hO3QnRa6bDtnbDT2iVtQT7eXXRR4cWMQqZeo+R6Ji+xj0PV+cYZbgq9C/zWtR5tex9ITGnFb8YYbviXiI7g4pLSIFBtvdGxq9FuW219/wv6iqJwHTulXwhMJHuI81pLR0nsRop8X0qWgSipIsu6JTqpGmgwXFH/wiLs4LnCj87ud1uec73GVIWibILLmirSlnM4lDAlRLpgoYBKaxhA8iQx+2RklNBkbkpyaVZZC5Jlp+DJa+9s+Cq+MkHJw+hO5IN2iU0j/pBLsxfaUKzg/XI204bI31FLglPDR5BowZxgA/0hmnW0xcandPGFe7ihk1MuV5RNkCzApTUl5lunlsAiGP8mC2toH+4beyl3qd0YZe9sw44rLsYJDY+wwTpWdoDNifrxZYrSOkDeIrbYJfinjUMAk9B5Bksf5OqNZUvGdVlkcBVBUNXh/eCqE/x8G4ews0uItUj1TqGjHELh8V3A+cO9FroaImwFrcdrTM3KYGbJYMwFE2eticA8LNFm4xY+oftpUYEzW8TAF9N5h4AlpjysHcDQmpoohJLX7s3tM4AQ+XEzcmmfQnWQPxcUYR8QZC4A+OSlhOgdHcy+vYpVbfMP7Q= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21e7bc4e-067b-4254-4a7b-08da6f5390b4 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 22:09:52.9549 (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: AM0PR01MB4626 Subject: [FFmpeg-devel] [PATCH 35/39] avcodec/mpegvideodsp: Constify src pointers 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: irYF5eSt/pXr Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideodsp.c | 4 ++-- libavcodec/mpegvideodsp.h | 6 +++--- libavcodec/ppc/mpegvideodsp.c | 2 +- libavcodec/x86/mpegvideodsp.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegvideodsp.c b/libavcodec/mpegvideodsp.c index a8cf7fbe35..05893d0e01 100644 --- a/libavcodec/mpegvideodsp.c +++ b/libavcodec/mpegvideodsp.c @@ -21,7 +21,7 @@ #include "libavutil/common.h" #include "mpegvideodsp.h" -static void gmc1_c(uint8_t *dst, uint8_t *src, int stride, int h, +static void gmc1_c(uint8_t *dst, const uint8_t *src, int stride, int h, int x16, int y16, int rounder) { const int A = (16 - x16) * (16 - y16); @@ -44,7 +44,7 @@ static void gmc1_c(uint8_t *dst, uint8_t *src, int stride, int h, } } -void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, +void ff_gmc_c(uint8_t *dst, const uint8_t *src, int stride, int h, int ox, int oy, int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height) { diff --git a/libavcodec/mpegvideodsp.h b/libavcodec/mpegvideodsp.h index 293e2548d3..69e6053c68 100644 --- a/libavcodec/mpegvideodsp.h +++ b/libavcodec/mpegvideodsp.h @@ -21,7 +21,7 @@ #include -void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, +void ff_gmc_c(uint8_t *dst, const uint8_t *src, int stride, int h, int ox, int oy, int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height); @@ -29,12 +29,12 @@ typedef struct MpegVideoDSPContext { /** * translational global motion compensation. */ - void (*gmc1)(uint8_t *dst /* align 8 */, uint8_t *src /* align 1 */, + void (*gmc1)(uint8_t *dst /* align 8 */, const uint8_t *src /* align 1 */, int srcStride, int h, int x16, int y16, int rounder); /** * global motion compensation. */ - void (*gmc)(uint8_t *dst /* align 8 */, uint8_t *src /* align 1 */, + void (*gmc)(uint8_t *dst /* align 8 */, const uint8_t *src /* align 1 */, int stride, int h, int ox, int oy, int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height); diff --git a/libavcodec/ppc/mpegvideodsp.c b/libavcodec/ppc/mpegvideodsp.c index 42d65dbe3d..3e99e089ea 100644 --- a/libavcodec/ppc/mpegvideodsp.c +++ b/libavcodec/ppc/mpegvideodsp.c @@ -31,7 +31,7 @@ #if HAVE_ALTIVEC /* AltiVec-enhanced gmc1. ATM this code assumes stride is a multiple of 8 * to preserve proper dst alignment. */ -static void gmc1_altivec(uint8_t *dst /* align 8 */, uint8_t *src /* align1 */, +static void gmc1_altivec(uint8_t *dst /* align 8 */, const uint8_t *src /* align1 */, int stride, int h, int x16, int y16, int rounder) { int i; diff --git a/libavcodec/x86/mpegvideodsp.c b/libavcodec/x86/mpegvideodsp.c index 6009b64e07..ea1d941fba 100644 --- a/libavcodec/x86/mpegvideodsp.c +++ b/libavcodec/x86/mpegvideodsp.c @@ -25,7 +25,7 @@ #if HAVE_INLINE_ASM -static void gmc_mmx(uint8_t *dst, uint8_t *src, +static void gmc_mmx(uint8_t *dst, const uint8_t *src, int stride, int h, int ox, int oy, int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height)