From patchwork Tue Jul 26 22:07:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp232242pzb; Wed, 27 Jul 2022 02:31:11 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t+v39PR8rxnsqC/5dRSi1yaDN2/68ApL7Fy8fytpggytnUImFdBmk8vx5lOVcYHbW1NT1l X-Received: by 2002:a05:6402:388b:b0:42b:5f20:c616 with SMTP id fd11-20020a056402388b00b0042b5f20c616mr21667272edb.50.1658914271744; Wed, 27 Jul 2022 02:31:11 -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 d12-20020a50f68c000000b0043ade0b9a7fsi18125715edn.195.2022.07.27.02.31.11; Wed, 27 Jul 2022 02:31:11 -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=oJ1Hi91a; 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 2357C68B88E; Wed, 27 Jul 2022 12:30:43 +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 9D7A868B616 for ; Wed, 27 Jul 2022 12:30:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RFZEeo7luHsP08U+SP6OtUVE9DGfAm8q5W+QYk3LYzZSPuxgpG3FghT6gtZFPMRAurnxiLbL1lx3dEqHn4fJSxfbc3jdtXDu+vN4qtqGJe0hmEsXZRsAmvILIxcUzJu/+0YS8h71s0NXl7pS0nPurpEPnN04xgcmolS7JimbiLqEAzIY1ax9CLlRoJ7UO7RyfAAd9GY74CYqqjiFgG1sAYe3b++SkGu1HZ1NwBXdY9rHQ+7PEnt7MG/JosimlXHEH4Vxbv5oJFSRE+bTIE5mByk9k4eG17KEcJ0SGpiS1rB4R40PtRnZ3wuwa0uJI8yefuCgBIU7TJFpv+XF+i+9eQ== 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=NhhiPG2Rr+fdEvRP6EYk23UVgYYQgKBhtGQEKSPSkng=; b=ZzSZN0EBdzYE8E2x02W7J8h4ucemcui2dE9C9e99gJmptxrWaL5xFX2kEYnQVaIetc1Z3U74YtS6or/3q/qL5BuD6QHPzSzgooBwWsBbaiKrLThM6ir8hUUhQ82Ctql8jwGTD7QIV9DzACQAT9HulY8wlM/3rivkabOOxF+dd+L0lUQcf4yz7InlJth/unXSWU30LG/YVxF0E59Rm0yDhXn/Ab7hqBwbodxNPXwlvCkwIlM7TOfZUiZrla5uJdj/af0UKM+BUf4bXFOhYiNshwUtMo6jCoUNBTIdaenCPDutH9himAeVTyATg3Szm9VXwqs+8FIXBd2K0NP2GapJ/w== 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=NhhiPG2Rr+fdEvRP6EYk23UVgYYQgKBhtGQEKSPSkng=; b=oJ1Hi91aisxuMEbSrBgr3W0eWWFgtEgp0rIA98SNMHm7DqlGd4FGGQxULag0r0iqBFT6HRoIOsFVlxzIjXwSPCWgktVaQbm8xPM4BkkiOxg6GdKwxJ0XH+bmHgLDCTNhg1O7Q8PNvze01JR7GwU9NVsHtRtiC7R2wzGrwBOCu6L6fKKMx02UeZ8VJqZwWfA22qzVXjCn7c8ThhKNaan54V7gVbmGvxXaRMP8bGtSiggA8tpqSVUfQCkPu4aVJv0A+Y4NZMdCfyRhpLvmsIBfl1KvqoSZFSWmDMlLVKmLJdHCaX/dxZu5E69InAptJTHt371Jh07ngzWPohzDiLeUag== 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:08:23 +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:08:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:07:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [LlYnafsg30Y6Ip4P5FW2kSWOwumQPie2] 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-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 993901c5-609d-4137-54d4-08da6f535b4e X-MS-Exchange-SLBlob-MailProps: /mB5ds43bCF1yj8Qt4poal2mNTdkd4U3re0dgIXIAC5Lf7fsSVxNGUiAiFP5UdgdLo6bfZ4n/6hqjIzPHHV7jXh3J/nt//N0OvfMRqaxbPKd4Qsy1iZ7YyeoyWYgd+UqBGp9y3kEQvkjr6gOr0tBdAASdEuj++SMS+A6dmtLkJEzyEbDncApnAf4Ku4vPgiY/U7AIf2XJmCbpYCrRT0tn8gOWMfdQ5HMKptWNdcJ3i2cb87v0Obpy7eWgcKnpOmpXI1BEkhWdC83Wbz4GtTIxEjqcLFZkxMS0mOgWm7X7Fb3dDkAMOeFMMuzH9mhkQcUj13OB2eqP5ARFdOvWz90hhRjYKC/RzbQeoGUcb/62nKrw86u0iY1eeD2oL2fjNYUvMNCfxWGm4d1O4/Wek6trI1Pn5KMMz7C2/h2ksWTVe9P/9q2hTdETbKlXE31SUH5PxAOyi15LfyXu38GXVKbCBBM2o9h5MOTxcNzmAAZhICTvwldRFhkQO5gfrrMBjCqeR6+BR10XqiwDt5UpyK7bL743b5CLdIhtGa7Lk647twi4K4OPidWIBdZZ/9nuk5sLdoMl/alCWqKTQHxcuGwkfiS1wFfkiXhHZaGP18hw2UGQYfk1ftIgnACnci39kwt6CLsQU7hSHhuWl1i2FcQ1d9zYa5BFos81qf5RQCpq/h1ltrdFJaN5a218zAWPZWajvw+qDLUbVU5PF/mHu55m97lPNSBAH+KjGux348bPbsYMmWDPmG/jqSn36h9ZYbCnFPBNrT92XvHowkXp1BsPc0hv3VJYq+q+gyF6xUmu7RHJGq3HZJoWAK1k4Vx87bGiSXT+7iJlktHRA7bHxTQEhopxW7GTin9CZkHaYmoQt3385sL2wcxx3/GhBDw0Efo/bBpeRHz97qbasX99A1BX+qUdrPLtxVHEUyiF71q17g= X-MS-TrafficTypeDiagnostic: AM0PR01MB4626:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fo1ovDFImDfD2MwBcwTQ/rYcoRdzYAGUI5QDyw2tpwAd4GMSyOapF7m2+C8ZyWWJO7eDQUJ//+n2TJ9ivJZJZD1zxXC0kh7k0Nr+PmjhAjeAIRCfxW9MxtaFfUiLCrZnom75fMSTXKkAibxIegmqQb7wXXun9L0d+MiYgNXwsSGhp6jxW3CQdG/FY8u1xc4Zm2ryKzSvbZ6p+pIvbzGl+xWk+x82zia6daqzINOr+gL2Gq624blNOKY/Yw0S3UDIfLRYxvT4oC8sl20BJOAfYQMSr3AoHj17J4cut4ZAakV3gyHaGKWd2ppx6eTPUvgjo0yhJromlUK7puWNQZKigdzfNxeZ60XhVxLdxFABv1EyUr/zQczGtu7q+wAVXTmQ20ucGmLR8719bbiqvhLgkhoYTWwmSVqqOMvacaEDe80Fkq1OshYvb0FvFsVxRWe6v4mc+YZSEGv1t0OpgRkZRSHBLOZ9IXHLyBpsiKT3aqP+PvDns0qFNeTda/o9+XEsfnAdQNSYtRBeRFT/WuMsPGQgL3+CFCk9vo3tkQ5sv/hfaIYXPmRPqVWX1LmSX686UgmEpqlPhdBuV/CvtXs4ATy+37Pn6p7QxrnI35hblJTBEwSohS8Ua+ywAMEmosecjlapZsbWnDLy6MEYQ9Xa2A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cF6iiQ3WSlr86LZb4MptgPV/LZqwHpwPonwiWuP4uYxj9RS9uR1wBoClBM69WKMM8VdEcYSJnlXWoad98S8xjRbE5WfiWOoa6Smx2GdZp8IjcOAvxbay6qwAyO6ptWbncw6sqGIrV3frCdM0yGPFFpGnEykqNId+CdF03CXUILjxkjCLuOKYoT9wACNed3kFZdquVc3zHxq2lm8Fa9CIN8Hjv/zcpZaO66yfXkayUG4bBxtmz9bTgNMB37wlbJFMV3AZin6oF3HOhX6hwe37rCyUJ26xuBI70vC0U8GlLJ0pyDz6XPXa6L6KpNZ1QBUIFn46EOQUenCeYH8lAPzm3V/Bo9vqJ6TASIFa0dXDcUgVJ3D5nL9O2EsoIPSmSe0gnQnSHXBteFkSjd9/xmUOfZQs3YVVbcKSd9XLeei5IWy1k6gwZpkuSSPgZSd/HXAo0WxL+3tkxgNQGqECy6bvM/gubiK1axN2Op8P6YcEfaZj6xvfkTgxTDGQ70nyj+hc+viFGlAd6wPhoT8oAatVGb+SkkZtQyh0c0HgNCpKDwZ0jRXeUFRI0iyubeoQcCGyy8hAKraSEtZ8IEwmRS3CZCqdHak4fI5DB75oMDQHq/w3mhTg3dFzSixqZWI2vtMsyGe5CPa2iaTv6poIjYKI2gs0KncMxh3sXlg0h3X0+3dSDshQSHvTI4n38Qjmy74gUv1ctYovQKvPL/I2TrG+fFyAWaiL+CcQ9sLAEyciw7Jq2WPYTYDaTgrY7iWPOJixD+fn3u3HHDqIuaZ40H4WXHcteE6NMuA9DmnKkGiAwqaTY8QpB0y7DVeRWqQCjy3abs5n7GkJpxgIJ5LfwI+YpqdMfXeWfEViPbo3lMv7ZVOg9RHTz52xtJcAeZbEY60DTToneM+0P8tfUNx5JQbgwTEnUeOl7kWdpIEXhVWu4Dlw/mGBFvojrvSeXBUq+TFmz1NS3F45GBFKqJ/7Wqjd5rx/DolGzX++hBJp5NmPatgJb/zcS6GxUtV0Y5HDnp8lSiXwWA4fNgPVt3bRa7jU8oBDaHKTD7jJTZPGmDsLTNqk8qwL3ehcj8923Cs25JsO+GoIezQbIhpEsjMS79Z5C187roI/P/2fLcB5laKkkrLmaS+VS4h2wQH7JFFUiBnF8RDQtiVJT85n0UTv4Ov4K7n7BeNmFeR+eTKFkO063KbSEu2M/jAIV/cLPat6S0dHrhdKF7wCtIuxyAxhuGbO8IhrNAakPDUjbB7AdxGnyLgK1OdeiVMtveya9SaW6VKP+1TCwM7+Ki0NFgpIDEpGtUp19YPV6+0Py/8L3WPKfbY= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 993901c5-609d-4137-54d4-08da6f535b4e 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:08:23.3831 (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 02/39] avcodec/hevcdec: Constify src pointers of HEVC DSP functions 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: /9oXpTXzs8md This is possible now that the HEVC DSP API treats them as const. Also constify the AVFrames whose data is used as source in such cases. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevcdec.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 0421db201e..ea196b39a9 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -1205,7 +1205,7 @@ static int hls_transform_unit(HEVCLocalContext *lc, int x0, int y0, ptrdiff_t stride = s->frame->linesize[1]; int hshift = s->ps.sps->hshift[1]; int vshift = s->ps.sps->vshift[1]; - int16_t *coeffs_y = (int16_t*)lc->edge_emu_buffer; + const int16_t *coeffs_y = (int16_t*)lc->edge_emu_buffer; int16_t *coeffs = (int16_t*)lc->edge_emu_buffer2; int size = 1 << log2_trafo_size_c; @@ -1235,7 +1235,7 @@ static int hls_transform_unit(HEVCLocalContext *lc, int x0, int y0, ptrdiff_t stride = s->frame->linesize[2]; int hshift = s->ps.sps->hshift[2]; int vshift = s->ps.sps->vshift[2]; - int16_t *coeffs_y = (int16_t*)lc->edge_emu_buffer; + const int16_t *coeffs_y = (int16_t*)lc->edge_emu_buffer; int16_t *coeffs = (int16_t*)lc->edge_emu_buffer2; int size = 1 << log2_trafo_size_c; @@ -1499,11 +1499,11 @@ static int hls_pcm_sample(HEVCLocalContext *lc, int x0, int y0, int log2_cb_size */ static void luma_mc_uni(HEVCLocalContext *lc, uint8_t *dst, ptrdiff_t dststride, - AVFrame *ref, const Mv *mv, int x_off, int y_off, + const AVFrame *ref, const Mv *mv, int x_off, int y_off, int block_w, int block_h, int luma_weight, int luma_offset) { const HEVCContext *const s = lc->parent; - uint8_t *src = ref->data[0]; + const uint8_t *src = ref->data[0]; ptrdiff_t srcstride = ref->linesize[0]; int pic_width = s->ps.sps->width; int pic_height = s->ps.sps->height; @@ -1560,8 +1560,9 @@ static void luma_mc_uni(HEVCLocalContext *lc, uint8_t *dst, ptrdiff_t dststride, * @param current_mv current motion vector structure */ static void luma_mc_bi(HEVCLocalContext *lc, uint8_t *dst, ptrdiff_t dststride, - AVFrame *ref0, const Mv *mv0, int x_off, int y_off, - int block_w, int block_h, AVFrame *ref1, const Mv *mv1, struct MvField *current_mv) + const AVFrame *ref0, const Mv *mv0, int x_off, int y_off, + int block_w, int block_h, const AVFrame *ref1, + const Mv *mv1, struct MvField *current_mv) { const HEVCContext *const s = lc->parent; ptrdiff_t src0stride = ref0->linesize[0]; @@ -1580,8 +1581,8 @@ static void luma_mc_uni(HEVCLocalContext *lc, uint8_t *dst, ptrdiff_t dststride, int y_off1 = y_off + (mv1->y >> 2); int idx = hevc_pel_weight[block_w]; - uint8_t *src0 = ref0->data[0] + y_off0 * src0stride + (int)((unsigned)x_off0 << s->ps.sps->pixel_shift); - uint8_t *src1 = ref1->data[0] + y_off1 * src1stride + (int)((unsigned)x_off1 << s->ps.sps->pixel_shift); + const uint8_t *src0 = ref0->data[0] + y_off0 * src0stride + (int)((unsigned)x_off0 << s->ps.sps->pixel_shift); + const uint8_t *src1 = ref1->data[0] + y_off1 * src1stride + (int)((unsigned)x_off1 << s->ps.sps->pixel_shift); if (x_off0 < QPEL_EXTRA_BEFORE || y_off0 < QPEL_EXTRA_AFTER || x_off0 >= pic_width - block_w - QPEL_EXTRA_AFTER || @@ -1651,7 +1652,7 @@ static void luma_mc_uni(HEVCLocalContext *lc, uint8_t *dst, ptrdiff_t dststride, */ static void chroma_mc_uni(HEVCLocalContext *lc, uint8_t *dst0, - ptrdiff_t dststride, uint8_t *src0, ptrdiff_t srcstride, int reflist, + ptrdiff_t dststride, const uint8_t *src0, ptrdiff_t srcstride, int reflist, int x_off, int y_off, int block_w, int block_h, const struct MvField *current_mv, int chroma_weight, int chroma_offset) { @@ -1716,12 +1717,13 @@ static void chroma_mc_uni(HEVCLocalContext *lc, uint8_t *dst0, * @param current_mv current motion vector structure * @param cidx chroma component(cb, cr) */ -static void chroma_mc_bi(HEVCLocalContext *lc, uint8_t *dst0, ptrdiff_t dststride, AVFrame *ref0, AVFrame *ref1, +static void chroma_mc_bi(HEVCLocalContext *lc, uint8_t *dst0, ptrdiff_t dststride, + const AVFrame *ref0, const AVFrame *ref1, int x_off, int y_off, int block_w, int block_h, const MvField *current_mv, int cidx) { const HEVCContext *const s = lc->parent; - uint8_t *src1 = ref0->data[cidx+1]; - uint8_t *src2 = ref1->data[cidx+1]; + const uint8_t *src1 = ref0->data[cidx+1]; + const uint8_t *src2 = ref1->data[cidx+1]; ptrdiff_t src1stride = ref0->linesize[cidx+1]; ptrdiff_t src2stride = ref1->linesize[cidx+1]; int weight_flag = (s->sh.slice_type == HEVC_SLICE_P && s->ps.pps->weighted_pred_flag) ||