From patchwork Tue Jul 26 22:08:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp234290pzb; Wed, 27 Jul 2022 02:36:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vDPfzm/ITxKSJgfntDbItROLS5+uA192Tu4J+MBm68/0NjzkRtzeuKxQ+qCLQbmVJt+zcT X-Received: by 2002:a17:907:7b9c:b0:72b:5652:a14a with SMTP id ne28-20020a1709077b9c00b0072b5652a14amr16868477ejc.86.1658914560079; Wed, 27 Jul 2022 02:36:00 -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 ne1-20020a1709077b8100b00715867834e2si20328515ejc.499.2022.07.27.02.35.59; Wed, 27 Jul 2022 02:36:00 -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=RSBDr4ep; 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 8DF2168B9E5; Wed, 27 Jul 2022 12:31:25 +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-vi1eur05olkn2020.outbound.protection.outlook.com [40.92.90.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49B2568B928 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=FWLnzhHeX4whPsF/g+8I1WbRemTY9BrJnYDBngy4hLcS+CON6QcphJRTII3F1SNTLTp0j9oAKENZKCFVwn1GMMWBd9hj+rhmHGPGwYg8kbG5JLzO2VKuGFp8YkyM5cV2CL4qf4zUDc3bzyUcol7k9Tv3QnYvKs4RX93W9MXXiKS7dpTxe5z0YfFdr5RXtZM7JOp6pNzxPTQosV0Z4UJEP2/oDzw3BN1IkUKOBPqP6i7qXdUVWzGgzIykUnwJ1qj/8dEOeftRbdfoHHgSxCJ4I6QrPRYz89AR6FpDjZGTGVShYtoAZchjvs/e1gG7uCGght5fMPoD82X4cJQ/vJEI4Q== 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=khh/4pVtPTzR4UweS+N14aVsLtkY/XWzZYHtRUCTfnE=; b=LyO4QuoKVwqHJWPiIvlnxMrZSfj/6TK6wlo8us8Io//xrJ3VFouAogYDfmfo5dnbWCh8T1UHNKvnHc0Zp2Cabdpod/nNJsvJtCU3UvteWCbrHadkhzyL755P5pJuIZIKnWrH5+YQHcyc0CgC1mbxK0ESCPlXVQj9S24+es7QXRtlLPB3PDlxrkiz+b9Ip7UFXaMXC5HN7/mAHP2RvC385kd2edrLLbgNUTSw4IyrHWDwaebjkeN6u8ukTPswCOh26i3SeeRUF+nMN4nhYgDq2mTFuskExllKoEMWtNWvorWXsqeR+hfdtv9WPx5cXuIJirYhu7q/4L4Z9AlGlP3ycw== 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=khh/4pVtPTzR4UweS+N14aVsLtkY/XWzZYHtRUCTfnE=; b=RSBDr4epMbOqyDPl7wjjpvtCupl2+CRzDftkJjhuzKxOwgLGXMgxTZ3UwN9iMRbx6HAMcmUb7FiIHdsY7VTgNM3v65OYw2vS21q0cfoIwINb9JT/wf5YvDKZCCXz6MLqnfmWguL7He1s2+O+ZRoiMKaAbK5W8/5dI1ni4y0xkhLfxFRN1Pbk/gpwD2z9gKjnLEwbqnQ9feXXWlJ5b9xsLap6amS6t/q/e3cuW/0SzItsM38wEsCvlhNTPubMeO1kRfBuRJqi052XgqVXf4a/CFiRSncjgWfEj4548F+xLUwcC7LrGZakZKL0x4UFj000prqlvRbcmHZGa4qFzm9WjA== 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:37 +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:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:08:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [bk5EqgKhjPnC908IyMMpz373so3SnWYP] 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-26-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c7b75e3-f351-4a20-91ba-08da6f538791 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuHAZUD9973euQIW/KMDlR3DgPHnFURaULYy6DlOg84FkapWH1jD0RjhJYv4YHHgyIPfJ4rWMtoAOvHA6IdS+4MZ8NDYJcRALvyF51zVQckvaxBwC9huX9dlvXAl+QoHP9FOjHzpKQRyHfWn6kOABTr/HfuU85jPV2flbIBLtI6ErgOEFEjB5XPjUZJQkb8RdnoQ76FHyWywoXPjDFb4xFny7Gy4s+JsaLd7xIIcgrdhscl1zFxCS4PHG+LzgWtEa1rv+Kbtl1vib1qylrM+4TBI1HH6Zy3Rt/2M0bwJJnr+5jJPfY417sRCoJPI3la0H5RmisdMp5GBdT2OTwY2B/Tc8Q2HQ6YTspqLt2CDNnxZV9rIxnaE66E00gxY+umWzT6qW3IIszATDcEnF9rLYL8zM4ihN8YHV25Pq0iiiXDvJADwiipVhMaZPZKzGCtMUlNgVs4aMShgdaJLRZWmGteVLPIpvqPr666uiYKyKFUU+syVIOxYN7Z1iIPzCtUVM5m3Cfyx+IBy9ciB4CjTBiUNOIj0I6SI55MDRQQQUv/ZeudhI8lb4xpLWqyf7x9fXTJAbpwasBcbjhgWqBxxtvXuzSk16qFmVM6RYB3vsVbKU+2pq3vK2ZEGQCS+NEr5gIkqrPgJ0h5rg9YGszuGjJbrYk2iD2TiP2RFTHP6N7P0INRoJJj71b0P23mNflQcBijCbgWOmxJE3+SWhytKmVCCrHXqRE8AtxvmfINB/dLRuAmy5Ur6oSO67Kxkc9vnTWVDhF3RwOjKBi2ALhorMBj X-MS-TrafficTypeDiagnostic: DB9PR01MB9174:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hVMjb/QbSIPppGOma84m28xUNK4V7PLuxepiwNeKZOESE8qxMoSvz5b6PWIMWol0kY1oG3pv7KqIdi5kpJe6cZlKr2rvwf/iRQW6CelSTtlo7Z0Mmt3T1KYdBEXTlkPCQ1IpBwS3wnZJBoe8StMqBRRaFvkXBk/HwDP0nphRNs7AgsgCyJ3vmwbgDRoABgsBbDtJ6CxPUpQRZikq5TBUrAInGy33k2/WFlE6ddlZcOubZyB+9p0cfRl89o0+QREX/u9EikkGP+5Yq8GdAqNqF52pP00gAyhFRzlarNgeKDBern0fub0vSt/c8y1jjOfhuVO/xpFM/gA0yxABx6TpayLLAATrwCCjdRuMBEWKd9TQfXHbRBUzcHyk1zfZAyLgC6giMMc4tk14ueWz4iTXJ7mOWoSb0UO1GxQV5j17OWUfr8HkYOGH+0BHSTZ3FNg2G5P0aA1zsi6fZOe+1wveweiCa1QI83JSkfRfeaOaOL0OA+KAC+48S8NlW/oqH+sZHvIlKo0M+Nt01JNbAETyEZ4EE2nTmWWV3TZPUYLgdFrAqm6wIxQzYeNpmraewwFR3OKz1tNHZ+KpVv8MvOmMTkGkp/dIst8en/awiOjsWlqD/g7rvf7Ugc/+Zs02t7zYVYhqOIEEnJaI1mSQk2r+Pg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8LXTqa2ZaouzEygCkqq0VJHIGgfI8Sqyh9OwLKrtB7/Z4OdmfWTq2Gd3yThpAdHose9sRZt5jA+HtlHfKqRAcv1597/3rctd00BSYrjGE2JIK8W/bvpzmVSA/o6YnyRec+BzMQP1KQJ3rdk/I/vjaXp1NNNvhvMPvVERcyVfH/bSo1RnaN95KTPLlI/zkRwwMQN2P0I96wYGfaB8SrSPdZi7M27qbhI0+fP3nMCYYD6F6kGpxs9oePukIdl0ngbeFY1rxUoXvKKHHHqegekv9pLpxDO6+xqhHzMXp769fnCmPQjh8YAr6BaU+w3Nhxh86w3rVkiYdTTXmOAUp9aC7wDz4JPZ0wxu3g48dgcyGLZ0LmdmR11Y/DCJvD51BM2nt6Ktd6j7HTM2c9od8tL0zH//1tr35u7/CMDfHWp4KV7Ef0NtwKqhTJ28clh30jqk6aZRFZcwFBJ+QvbVxYlYijWPMKb91t65FT70B/FzlFhSI9xFEGcE+f8xmAaJ9LojYoQr3KTqgODcL6ZDNoLzEX51o8+tE2+CSRmEgo7MgV0dsFO0i20qOSFHqsAlseJvgn0pFtYZ0gsk39dMPNq7LxlGPFt4av0BaegupvXCMm4dS5I16MQ+9MJ+z+x/EKpQwOpMJSqOVQzxBtkcpS9vc1jRIcnjq0ojJHfJpWoiaPrfuW23GqUQnoJbRS+MZGR0xphBc+OUspbf6Z3O+gNkS7C1uCcSGMq/05Wv8O80u5mTJW8zrTkz7hbH12CkfvdbLnJzPU3pfU+QcHRfxFNUlBI8RqsMiwsE7O/oxpAEVIvDL18wx3jKOv98uWgfmtjkjLmuKG5UdTZAATUekInzfnV5IeErh4T79YU6388rC6sZ9r4DzY+SbyhQRwIjpkAJIm9iC4wK6gBiV+P5YA7alNOnmhGfx3KaAaXbSJZxrKoIhU+BZfo2qUCgITTRnacPt2x76mPIZ1EZ5I3nKD0zHDxt1BgF8QG7vkk+MuAWJynYNQHBVHe3A/jd+7Z1a5OGdkMUICuTWNDoOJMrZSjsgOXpc+v7yDwJ3p29TXu8bQi5EUvw5AzNtLLILkbXBd4rDNnE+M95UaPFwuj4D3fEsxJU8DPIi0qmevleG1IL4+RqvZvUvxxDJkN+k0rDmo6Husk9oP0NJUEVE+PIHWxBYq9DfEGKk2W2mzv/iaWwz7yffnacor9YxJPfjrz/NvTKBR1f+dc0QAIfL6+IVyYn/MX1+yvmTajDcuXMPzhwrpctTZSu/DrcewDpl673t3mPPAZRiKNTjKYEZfUBVEGAPIu7X1/uUOp/5KaqvYINRVs= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c7b75e3-f351-4a20-91ba-08da6f538791 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:37.5966 (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 27/39] avcodec/videodsp: Constify buf in VideoDSPContext.prefetch 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: 4Fh2Cvsqqgn0 Signed-off-by: Andreas Rheinhardt --- libavcodec/aarch64/videodsp_init.c | 2 +- libavcodec/arm/videodsp_init_armv5te.c | 2 +- libavcodec/loongarch/videodsp_init.c | 2 +- libavcodec/mips/videodsp_init.c | 2 +- libavcodec/ppc/videodsp.c | 2 +- libavcodec/videodsp.c | 2 +- libavcodec/videodsp.h | 2 +- libavcodec/x86/videodsp_init.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/aarch64/videodsp_init.c b/libavcodec/aarch64/videodsp_init.c index 6f667a6d3e..1f77a918d7 100644 --- a/libavcodec/aarch64/videodsp_init.c +++ b/libavcodec/aarch64/videodsp_init.c @@ -21,7 +21,7 @@ #include "libavutil/aarch64/cpu.h" #include "libavcodec/videodsp.h" -void ff_prefetch_aarch64(uint8_t *mem, ptrdiff_t stride, int h); +void ff_prefetch_aarch64(const uint8_t *mem, ptrdiff_t stride, int h); av_cold void ff_videodsp_init_aarch64(VideoDSPContext *ctx, int bpc) { diff --git a/libavcodec/arm/videodsp_init_armv5te.c b/libavcodec/arm/videodsp_init_armv5te.c index 1ea1f3438d..eaa8c5bbf8 100644 --- a/libavcodec/arm/videodsp_init_armv5te.c +++ b/libavcodec/arm/videodsp_init_armv5te.c @@ -23,7 +23,7 @@ #include "libavcodec/videodsp.h" #include "videodsp_arm.h" -void ff_prefetch_arm(uint8_t *mem, ptrdiff_t stride, int h); +void ff_prefetch_arm(const uint8_t *mem, ptrdiff_t stride, int h); av_cold void ff_videodsp_init_armv5te(VideoDSPContext *ctx, int bpc) { diff --git a/libavcodec/loongarch/videodsp_init.c b/libavcodec/loongarch/videodsp_init.c index 6cbb7763ff..92ade4f846 100644 --- a/libavcodec/loongarch/videodsp_init.c +++ b/libavcodec/loongarch/videodsp_init.c @@ -22,7 +22,7 @@ #include "libavcodec/videodsp.h" #include "libavutil/attributes.h" -static void prefetch_loongarch(uint8_t *mem, ptrdiff_t stride, int h) +static void prefetch_loongarch(const uint8_t *mem, ptrdiff_t stride, int h) { register const uint8_t *p = mem; diff --git a/libavcodec/mips/videodsp_init.c b/libavcodec/mips/videodsp_init.c index 07c23bcf7e..89409fc8fd 100644 --- a/libavcodec/mips/videodsp_init.c +++ b/libavcodec/mips/videodsp_init.c @@ -24,7 +24,7 @@ #include "libavutil/mips/asmdefs.h" #include "libavcodec/videodsp.h" -static void prefetch_mips(uint8_t *mem, ptrdiff_t stride, int h) +static void prefetch_mips(const uint8_t *mem, ptrdiff_t stride, int h) { register const uint8_t *p = mem; diff --git a/libavcodec/ppc/videodsp.c b/libavcodec/ppc/videodsp.c index 915702252e..a7ab5a6a42 100644 --- a/libavcodec/ppc/videodsp.c +++ b/libavcodec/ppc/videodsp.c @@ -21,7 +21,7 @@ #include "libavutil/attributes.h" #include "libavcodec/videodsp.h" -static void prefetch_ppc(uint8_t *mem, ptrdiff_t stride, int h) +static void prefetch_ppc(const uint8_t *mem, ptrdiff_t stride, int h) { register const uint8_t *p = mem; do { diff --git a/libavcodec/videodsp.c b/libavcodec/videodsp.c index 90dc1aacbd..bdff2e76f5 100644 --- a/libavcodec/videodsp.c +++ b/libavcodec/videodsp.c @@ -32,7 +32,7 @@ #include "videodsp_template.c" #undef BIT_DEPTH -static void just_return(uint8_t *buf, ptrdiff_t stride, int h) +static void just_return(const uint8_t *buf, ptrdiff_t stride, int h) { } diff --git a/libavcodec/videodsp.h b/libavcodec/videodsp.h index b5219d236c..e8960b609d 100644 --- a/libavcodec/videodsp.h +++ b/libavcodec/videodsp.h @@ -72,7 +72,7 @@ typedef struct VideoDSPContext { * @param stride distance between two lines of buf (in bytes) * @param h number of lines to prefetch */ - void (*prefetch)(uint8_t *buf, ptrdiff_t stride, int h); + void (*prefetch)(const uint8_t *buf, ptrdiff_t stride, int h); } VideoDSPContext; void ff_videodsp_init(VideoDSPContext *ctx, int bpc); diff --git a/libavcodec/x86/videodsp_init.c b/libavcodec/x86/videodsp_init.c index a14c9635fb..ae9db95624 100644 --- a/libavcodec/x86/videodsp_init.c +++ b/libavcodec/x86/videodsp_init.c @@ -215,7 +215,7 @@ static av_noinline void emulated_edge_mc_avx2(uint8_t *buf, const uint8_t *src, #endif /* HAVE_AVX2_EXTERNAL */ #endif /* HAVE_X86ASM */ -void ff_prefetch_mmxext(uint8_t *buf, ptrdiff_t stride, int h); +void ff_prefetch_mmxext(const uint8_t *buf, ptrdiff_t stride, int h); av_cold void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc) {