From patchwork Tue Jul 26 22:08:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36999 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp234358pzb; Wed, 27 Jul 2022 02:36:10 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uvXvVo1Do8L1JvQd1o3k02rtcF3wTaBoxcjOINOorXf2uGKUCj/rJU6DBrNE5Hp0Z8xgCi X-Received: by 2002:a05:6402:27ca:b0:43c:2a52:a90f with SMTP id c10-20020a05640227ca00b0043c2a52a90fmr10903877ede.328.1658914569856; Wed, 27 Jul 2022 02:36:09 -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 b20-20020a056402351400b0043ccb3f244dsi43792edd.426.2022.07.27.02.36.09; Wed, 27 Jul 2022 02:36:09 -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=qg8zxLQ9; 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 44D9868B9EB; Wed, 27 Jul 2022 12:31:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2102.outbound.protection.outlook.com [40.92.90.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A76068B92B for ; Wed, 27 Jul 2022 12:31:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lp000CPLIQPzi/QqbxYrnqTD/9nWi/CwaOkOL++oqTtIxSzbW3Xlirl+yc5SqUzFglTZzpahRvioJbB4xWipJOaWA6BgW+obj+oS7RWqN3p2xQp0E7a/J7tpvQ2sZixRaU0FRVDFgn0ma6jVh1+A4obXMfK0wf4xoVlnRWk8GlQ1rcxORUkQsucHuZ2SeaJ+w9U+ZhjFAGslt+0Yc4h8r2MfWGhbaBottcW+P1H08/Xx7ese7+L7bQIgl8cTIeRJLV+V+ud+PPzy7z+6WRVJKXnY/8IBaPjaxZE49IPJnzKpWoq3p5FarpuyNfV3UNgi/6UNbCy+iw3IF+89xXaL/g== 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=kUqzT0NK3/dKFYA6fy4tXBmxS9mvGMFPs18DJpuuZnk=; b=mDeJtsrcm8ogvAkQYhhHXRquS+XH048+DTM/Oetdtr6CxOxkDG4gu0cwxCyNwbkmQhiEh/briVvINK/uszAXg7XwKfvoUqKs6BEyKsh0yW341BgcEFldtgGAnnhGv09K3zzy9sR56oBJ5lrSZZl7x3lhaupg2/m6qKQqdrxCXM15yUV7NGOpuUMbTVTxC+Pdau7VAOF5Vjhffu6pQXo4c9cqb8pKpNU72CXH2mUuAW+K5y0Uf6TQFSaG8QmHfJG7gngBL5rBIRIytxwFoeI9b3Yv1wGdBaM077m27wzTCaynSNN+VIeb5EqVHIHrSusjQEBU1YLf4JvtWagTqVUT3g== 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=kUqzT0NK3/dKFYA6fy4tXBmxS9mvGMFPs18DJpuuZnk=; b=qg8zxLQ9Iv3UE1ZTsM2JO//eE5C6K8L0CvVrFLAzulsfFDkdA/az82b/AXW5p3LzTSjHrZlcOt+CQ9CfPI+Lvmsb4xa1qcq4lT9M1T0+gXjYkLJ+cRzUfDbdvPzd4mE/h9nASYDHdkA82VTN/bud1MdlNhvwuUta6MlLrS6n5+WYcshwCTDi4v8bBFKvAXj0iAYOlLRoRPqypRxB1pgy7AY3i3GtQiBTunuFnfpujxct958mCRPmvow/V+FfiCKx7y1jE6BLK7I63GEiYDfmz5e3MdGNX/aLw3XYdEo7YKcOcVIZ3NVwwxnkj+g6Mg5j+252dtDnIuBdkxwvEnfnIw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB9174.eurprd01.prod.exchangelabs.com (2603:10a6:10:366::8) 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:49 +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:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:08:09 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [lhXScL3qf1c3QdU5p2Jdy2h1bsuMd+pW] 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-33-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 96164af3-c662-4396-2ee4-08da6f538ec9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQG9fQ4e5wexDZEKzsZPbgB6HaEavewrvX1O7j9YoV4pTF9Rx7ikBiduwlQuD/a7rlUqC5oxo+//CNhFNet+tHIqXNpfBi5l9gO951cz/gfz2ilwFdPRTil3cVl5dLsev2ouTiVT8U8FfR1PLtFefnjmIt3KYZx+/wNwexLtCmtgwdPvfk6D1ytRVf6bppe+cb+5tL+O8lHnhHdFhC74/cs4JCFKSJIM1/a281sm43WPgVNrrYDKLqwG0PLMrNv4NoZ9xYgxoiNq+EjsxdWc1ZexJW977OztC6cNgB5Z86K1m69aH8hehNgMpwzgkHy8yf6Mxv94VLd+jnj9VMNnxkkpYixXBuzJxpq+bZ8MOjhQvZa4i3zRTPh2acCn/3MiyECJUaQ7jMqfXMrQ1ZXVDQ6bk0LuLR64xL9U130ZHgYsAPdRShVFAAMXWFwnSvjawE2Q1fN5Ouo0SMEbr+gnEGl8Dx71ALkF8TAavi4JX0+6WJjnGbi2a1Tol+EW9cNz7mPIk02V8qgwWUX4GqysAID36i2ni19sMNHQ27WQ2o0HlRX+ssgrt5YpTpefY4XBuCfN9rmyBzexWP25vuYX/C2TWmF9lUT2gF+Ev9nxkR3S5NPlJVns6bDy0r7hTMF+hsY2HJk3QXJL0H+LwRiN3Eawz4OMoPJzo6iQlD9RljtG1TraVfbhobtlTC6iSvqpNG47SBF2jt5z3xAsbf1PW4gx6NRyJpwcUM+Zl4A0NkQeN1iFW7yktMsG5S54mhaoWA= X-MS-TrafficTypeDiagnostic: DB9PR01MB9174:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0x/3AzYr7SXOBK15CmDRDOk+ZF9d6Sfh8ELbwKMzCmTo3/nxdqv+um9OzC3q3E+wi5UYFirubN9zsrXMRtLiiwlijCztx7CJ/29NMpN0djtZC8QRtTjcKqx1SvH2bFYHqNmN1Co3ENnVkwIQbhTLuqypwWUanNcD/Wf6JAiZqdbRFNIIC5wuHfJdMvZn89isnk3tYLjeAB4ZXKL6KU/TpAsb7inD1bpMxqD1uJxjHpo+UeDUi+Dvg4XZLAov6Jw+SFyQHcr4A9WY9scCM662EjhDa7EXbpseKmQfDZtvTKTbUkyb4vrz5c5F3mMMLVUe3gciEDWD++KeE2ko2qC35SaPrmT7CiQf5T0p0Iv808aReyxNR6uWpkmI60H1pcdfzfGiLNYYk9+BkNFh4llJP1Lj9NiiEezBvi7NEMqikw8wBWcDfSp5p0n+UFBy9GgJPxaVXG0pyiguq7u7ozkdtU11yj/cHqPDhnD+1Jo4gc3YOAtakN7S2LqNQ1yvGYYRAh3bhzNg5mXWBHVVHjlIFnwTk73UP6KER3MFIJMywwwaJRplbX2dWcqdYKH/TPlLWmDoxGjq9w7IwqxCc6h9LNvrIVlNagJv6bYB00mcCydqYd2bBI4Z44Ai7590CiIf8/A6yW7osqooQsvXEEJCaw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5zo5Kk3BU9Q/Y0fjbSUFzwFYDjjcITubJfPk/EUF/OQ3HD1LPFypAYa4/j2YbazEBHsP1rc6j8Nbv2ilMYVTfmn0C3XkuUWudfFtgrM/N2eQ+Qftapk1ArvGxznONeFtSXLJ0/xEfOuCk2U1ZhxtwCAI6xr5pAVq2csiVG0M/uKIL+mIFPmGoVlbDaoWe4KbctZqtCVCcEhCrg1weMcm3Y7pRiyKGfUVCsbOSFSRCCqaAM1QyKgzMQQ8K0DD6vqTJBeMydm9vhTgQ3qn5OOGhcCpoEEl4ocNl93Cw4URua/EHnh3OJuU0kfcuZBETxFx+om6DU0pqD/tNQZaOf7mL2qwxqLoY2VplJtsBLnljRD2IE9hxwCRhBmE1fjrlOb+ViANuE0Za3K+Kob/+gXxtenEJgRBGsgW1dGVCCZ5zaMS0dwTry3iJ5dZTBF91w1QsrtcLegey2GqNE/PELAmjOfBzJsFZh07db41jkUVgi2VARduxaPE/bOrsrDULM00cVU1HE3AoeB+DBpw6HYvCv2JZ61v4YXsURFg3gS0uOKdJq+FgIslP1YPBnhNTEKOuQIBMbC37BJNQfa3wAaoZG3CBJqAHroxCAGTTZ82Ce4iqkI6BGz8udavNbeh22d5cK3eEKrGBhsJWZkAxqlD4NYbBfqSZgFEKvy6ua3q6H7/NGgyyQaxT2+DQcChtXd9KMX2CUe/t5Mx/YPr1n8eUkV88yO7C/+MWapZsBV45Yv8WjZZKUMllqzRiIvDvdzcr5EzbWMGaZLjNlekWYwl3/VlcdqNdg6EdLqfM8vuA1wvmc8FOG6kILe2AVd+wLu/d+kBLI70do/WHc533EaRIWbQlWPQwDVT2eNnf7wmgz0h+w6MM/ocze1akW7JkDBePQzIPRY+TaV2vIvi9aam82zmYNNNERMeAxWQeIgO7HG4yVsWuKSu4MlL4Q+GY9kyKVngZBtgJ5IuzGfTzZ8AzvG18J2kSWHCoYy7qbQqsgY720oRjJbTEOIax3lkDhU2PPuEIWu5/E+meEB08JZwB0cbTO8UdmcNkmBL6XiMlLrdhE9cuJaVwMGZjrULDQBxiCHbn7vZ8PCXnI08yoT3FKVHfxbnyn64xkM1BtkRnQIAKreLQnFIOx3AXQrhcqS6yhXD9eikSENQfJPevPtcY4rWvNCM2cmCNzLlrAovQbX4CVVY+RKRngjpLNhqK/z7h06y3FJUltWed6TEVRoMpW5jRfwcq42B5jrNckswHe0hh9X5u2aUSBrDjKh/KZYoxc/kTCsP+Ls0Z0b+zR2WGBpHFuUx7GrISxHbXc5MEtA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96164af3-c662-4396-2ee4-08da6f538ec9 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:49.7208 (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: DB9PR01MB9174 Subject: [FFmpeg-devel] [PATCH 34/39] avcodec/mpegvideoencdsp: Allow pointers to const where possible 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: SF0EyEdUu9vo Signed-off-by: Andreas Rheinhardt --- libavcodec/arm/mpegvideoencdsp_init_arm.c | 4 ++-- libavcodec/mips/h263dsp_mips.h | 2 +- libavcodec/mips/mpegvideoencdsp_msa.c | 4 ++-- libavcodec/mpegvideoencdsp.c | 10 +++++----- libavcodec/mpegvideoencdsp.h | 10 +++++----- libavcodec/ppc/mpegvideoencdsp.c | 8 ++++---- libavcodec/x86/mpegvideoenc_qns_template.c | 4 ++-- libavcodec/x86/mpegvideoencdsp.asm | 4 ++-- libavcodec/x86/mpegvideoencdsp_init.c | 6 +++--- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/libavcodec/arm/mpegvideoencdsp_init_arm.c b/libavcodec/arm/mpegvideoencdsp_init_arm.c index 31d1474416..a95b5bebe9 100644 --- a/libavcodec/arm/mpegvideoencdsp_init_arm.c +++ b/libavcodec/arm/mpegvideoencdsp_init_arm.c @@ -24,8 +24,8 @@ #include "libavcodec/avcodec.h" #include "libavcodec/mpegvideoencdsp.h" -int ff_pix_norm1_armv6(uint8_t *pix, int line_size); -int ff_pix_sum_armv6(uint8_t *pix, int line_size); +int ff_pix_norm1_armv6(const uint8_t *pix, int line_size); +int ff_pix_sum_armv6(const uint8_t *pix, int line_size); av_cold void ff_mpegvideoencdsp_init_arm(MpegvideoEncDSPContext *c, AVCodecContext *avctx) diff --git a/libavcodec/mips/h263dsp_mips.h b/libavcodec/mips/h263dsp_mips.h index 99a43cd44a..f225ee563e 100644 --- a/libavcodec/mips/h263dsp_mips.h +++ b/libavcodec/mips/h263dsp_mips.h @@ -31,6 +31,6 @@ void ff_dct_unquantize_h263_inter_msa(MpegEncContext *s, int16_t *block, int32_t index, int32_t q_scale); void ff_dct_unquantize_h263_intra_msa(MpegEncContext *s, int16_t *block, int32_t index, int32_t q_scale); -int ff_pix_sum_msa(uint8_t *pix, int line_size); +int ff_pix_sum_msa(const uint8_t *pix, int line_size); #endif // #ifndef AVCODEC_MIPS_H263DSP_MIPS_H diff --git a/libavcodec/mips/mpegvideoencdsp_msa.c b/libavcodec/mips/mpegvideoencdsp_msa.c index 46473dafe5..9043730cd7 100644 --- a/libavcodec/mips/mpegvideoencdsp_msa.c +++ b/libavcodec/mips/mpegvideoencdsp_msa.c @@ -21,7 +21,7 @@ #include "h263dsp_mips.h" #include "libavutil/mips/generic_macros_msa.h" -static int32_t sum_u8src_16width_msa(uint8_t *src, int32_t stride) +static int32_t sum_u8src_16width_msa(const uint8_t *src, int32_t stride) { uint32_t sum = 0; v16u8 in0, in1, in2, in3, in4, in5, in6, in7; @@ -56,7 +56,7 @@ static int32_t sum_u8src_16width_msa(uint8_t *src, int32_t stride) return sum; } -int ff_pix_sum_msa(uint8_t *pix, int line_size) +int ff_pix_sum_msa(const uint8_t *pix, int line_size) { return sum_u8src_16width_msa(pix, line_size); } diff --git a/libavcodec/mpegvideoencdsp.c b/libavcodec/mpegvideoencdsp.c index adf19e69f4..997d048663 100644 --- a/libavcodec/mpegvideoencdsp.c +++ b/libavcodec/mpegvideoencdsp.c @@ -28,8 +28,8 @@ #include "me_cmp.h" #include "mpegvideoencdsp.h" -static int try_8x8basis_c(int16_t rem[64], int16_t weight[64], - int16_t basis[64], int scale) +static int try_8x8basis_c(const int16_t rem[64], const int16_t weight[64], + const int16_t basis[64], int scale) { int i; unsigned int sum = 0; @@ -47,7 +47,7 @@ static int try_8x8basis_c(int16_t rem[64], int16_t weight[64], return sum >> 2; } -static void add_8x8basis_c(int16_t rem[64], int16_t basis[64], int scale) +static void add_8x8basis_c(int16_t rem[64], const int16_t basis[64], int scale) { int i; @@ -57,7 +57,7 @@ static void add_8x8basis_c(int16_t rem[64], int16_t basis[64], int scale) (BASIS_SHIFT - RECON_SHIFT); } -static int pix_sum_c(uint8_t *pix, int line_size) +static int pix_sum_c(const uint8_t *pix, int line_size) { int s = 0, i, j; @@ -78,7 +78,7 @@ static int pix_sum_c(uint8_t *pix, int line_size) return s; } -static int pix_norm1_c(uint8_t *pix, int line_size) +static int pix_norm1_c(const uint8_t *pix, int line_size) { int s = 0, i, j; const uint32_t *sq = ff_square_tab + 256; diff --git a/libavcodec/mpegvideoencdsp.h b/libavcodec/mpegvideoencdsp.h index 33f0282fcc..95084679d9 100644 --- a/libavcodec/mpegvideoencdsp.h +++ b/libavcodec/mpegvideoencdsp.h @@ -30,12 +30,12 @@ #define EDGE_BOTTOM 2 typedef struct MpegvideoEncDSPContext { - int (*try_8x8basis)(int16_t rem[64], int16_t weight[64], - int16_t basis[64], int scale); - void (*add_8x8basis)(int16_t rem[64], int16_t basis[64], int scale); + int (*try_8x8basis)(const int16_t rem[64], const int16_t weight[64], + const int16_t basis[64], int scale); + void (*add_8x8basis)(int16_t rem[64], const int16_t basis[64], int scale); - int (*pix_sum)(uint8_t *pix, int line_size); - int (*pix_norm1)(uint8_t *pix, int line_size); + int (*pix_sum)(const uint8_t *pix, int line_size); + int (*pix_norm1)(const uint8_t *pix, int line_size); void (*shrink[4])(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); diff --git a/libavcodec/ppc/mpegvideoencdsp.c b/libavcodec/ppc/mpegvideoencdsp.c index b96487bf81..07d3e76ee0 100644 --- a/libavcodec/ppc/mpegvideoencdsp.c +++ b/libavcodec/ppc/mpegvideoencdsp.c @@ -30,7 +30,7 @@ #if HAVE_ALTIVEC #if HAVE_VSX -static int pix_norm1_altivec(uint8_t *pix, int line_size) +static int pix_norm1_altivec(const uint8_t *pix, int line_size) { int i, s = 0; const vector unsigned int zero = @@ -57,7 +57,7 @@ static int pix_norm1_altivec(uint8_t *pix, int line_size) return s; } #else -static int pix_norm1_altivec(uint8_t *pix, int line_size) +static int pix_norm1_altivec(const uint8_t *pix, int line_size) { int i, s = 0; const vector unsigned int zero = @@ -87,7 +87,7 @@ static int pix_norm1_altivec(uint8_t *pix, int line_size) #endif /* HAVE_VSX */ #if HAVE_VSX -static int pix_sum_altivec(uint8_t *pix, int line_size) +static int pix_sum_altivec(const uint8_t *pix, int line_size) { int i, s; const vector unsigned int zero = @@ -115,7 +115,7 @@ static int pix_sum_altivec(uint8_t *pix, int line_size) return s; } #else -static int pix_sum_altivec(uint8_t *pix, int line_size) +static int pix_sum_altivec(const uint8_t *pix, int line_size) { int i, s; const vector unsigned int zero = diff --git a/libavcodec/x86/mpegvideoenc_qns_template.c b/libavcodec/x86/mpegvideoenc_qns_template.c index 882d486205..0d6454f45f 100644 --- a/libavcodec/x86/mpegvideoenc_qns_template.c +++ b/libavcodec/x86/mpegvideoenc_qns_template.c @@ -32,7 +32,7 @@ #define MAX_ABS (512 >> (SCALE_OFFSET>0 ? SCALE_OFFSET : 0)) -static int DEF(try_8x8basis)(int16_t rem[64], int16_t weight[64], int16_t basis[64], int scale) +static int DEF(try_8x8basis)(const int16_t rem[64], const int16_t weight[64], const int16_t basis[64], int scale) { x86_reg i=0; @@ -74,7 +74,7 @@ static int DEF(try_8x8basis)(int16_t rem[64], int16_t weight[64], int16_t basis[ return i; } -static void DEF(add_8x8basis)(int16_t rem[64], int16_t basis[64], int scale) +static void DEF(add_8x8basis)(int16_t rem[64], const int16_t basis[64], int scale) { x86_reg i=0; diff --git a/libavcodec/x86/mpegvideoencdsp.asm b/libavcodec/x86/mpegvideoencdsp.asm index e3d88f01c4..3cbe7b4d4b 100644 --- a/libavcodec/x86/mpegvideoencdsp.asm +++ b/libavcodec/x86/mpegvideoencdsp.asm @@ -24,7 +24,7 @@ %include "libavutil/x86/x86util.asm" SECTION .text -; int ff_pix_sum16(uint8_t *pix, int line_size) +; int ff_pix_sum16(const uint8_t *pix, int line_size) ; %1 = number of loops ; %2 = number of GPRs used %macro PIX_SUM16 3 @@ -72,7 +72,7 @@ INIT_XMM xop PIX_SUM16 4, 4, 4 %endif -; int ff_pix_norm1(uint8_t *pix, int line_size) +; int ff_pix_norm1(const uint8_t *pix, int line_size) ; %1 = number of xmm registers used ; %2 = number of loops %macro PIX_NORM1 2 diff --git a/libavcodec/x86/mpegvideoencdsp_init.c b/libavcodec/x86/mpegvideoencdsp_init.c index b9c80b5382..ec174b15aa 100644 --- a/libavcodec/x86/mpegvideoencdsp_init.c +++ b/libavcodec/x86/mpegvideoencdsp_init.c @@ -23,9 +23,9 @@ #include "libavcodec/avcodec.h" #include "libavcodec/mpegvideoencdsp.h" -int ff_pix_sum16_sse2(uint8_t *pix, int line_size); -int ff_pix_sum16_xop(uint8_t *pix, int line_size); -int ff_pix_norm1_sse2(uint8_t *pix, int line_size); +int ff_pix_sum16_sse2(const uint8_t *pix, int line_size); +int ff_pix_sum16_xop(const uint8_t *pix, int line_size); +int ff_pix_norm1_sse2(const uint8_t *pix, int line_size); #if HAVE_INLINE_ASM