From patchwork Mon Aug 1 13:09:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37078 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2495737pzb; Mon, 1 Aug 2022 06:09:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sX5R+lAT3bmHTL9ZMToyU++9fO/lwqnjdOPffGefrSkr4zTX2MZIR9Jh6gCBVEgLafuDWY X-Received: by 2002:a05:6402:4024:b0:43d:2067:f068 with SMTP id d36-20020a056402402400b0043d2067f068mr14875270eda.258.1659359386987; Mon, 01 Aug 2022 06:09:46 -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 g6-20020a1709065d0600b007306b6095absi4451227ejt.805.2022.08.01.06.09.40; Mon, 01 Aug 2022 06:09:46 -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=CM6HVo1q; 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 EE30568BA91; Mon, 1 Aug 2022 16:09:37 +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-vi1eur05olkn2031.outbound.protection.outlook.com [40.92.90.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1481368B7BF for ; Mon, 1 Aug 2022 16:09:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q1A4YI00+IWC42IWTf2+LkvPmTvvsbRyJPyb7r3mYoayzG1o/j8mHEWl2U38rT/w6QHl9CYz0mn4yDOmE6I32yfEjSXULXDUskYZJqz+VJIBj30FmVYwcK4DquYrc7UZo/7QU869kq1fuBl5X2qXRF0mvocmoKsvbRdEkxLwPVz7jLF2rIWbkpSR92Hfrveho39tibRQRsFPayI65aIBAUTvttFB53DMp7Oz2CzCxorslfLbqNk96rH1c1ToBtkUunOQYurCuWeiwjW+cedRz8OI62AAU7NPjnnA9XOR0C9A1nZ+AvxzzudP/mV+3RpgWFhbZc89Ik47tuYXCRfHYA== 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=5zDHFkiMZNzg2JjBy+hTBqP5ba2Ymwsjb2uTKjW1zOA=; b=bdnxM2kW/Fl5YPl49l7XnndoGqdVN1k+MBEbeHd0OBhv+ADDOPOd8GyZktjKG+NW2diV6GxxoHwbXTCoLl+VSgKKGBwM7VgIk79kNVXl77RYnGlmRjG6JPBVONwGphdQyYvtJfHvERRmm5I6KKcXD1OPUT1INO7FYgU7TL5bSIKNpWFc7xSTBit204CRo2mg7hP/tvrSXL6A9aqfXPedQjDqk71qQluH5lwtfwbOh2Ds3KVUPRDSxnIMacQ17oS0pEHqzH+NefU5t/o/xccJC+2HU8/obczhdaZgXot35/ZMKSvhicj53yJEMzVCmmzGTLex4yiLwu10IYWKAEyTgQ== 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=5zDHFkiMZNzg2JjBy+hTBqP5ba2Ymwsjb2uTKjW1zOA=; b=CM6HVo1qnzNcjNZHLoYyNxLUX6lc3Z55YSIgVIye06P6OGoWpvkhqIVAjpXDFxsVwRjKIo4cs4ag0N7QuRsG2F6hOOfmQ+GPcMoF74/Jn5mpv0gcDl6gFCURYj7PCuWIUK+B0O+6TNO3qxcT7CSp7dvQyxQWGrBj8/pl1mnyAaDvdMyWWWO+qdn+L6/FqGXsIXaJBVhvZ1Xvp39cOw50mXGK2R3v0jdzvP56kDxaDOqhLqeDwW4MzavvtFOrDPLrSA3z2vR6expVTcPLfP1kDqKPHNSmw3qlgjcZsNZ5HpEp9xQ2LiQacYX/VjmxQjAIGh2hKLoKPqevN05tUgaHDg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB3PR0102MB3626.eurprd01.prod.exchangelabs.com (2603:10a6:8:8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.12; Mon, 1 Aug 2022 13:09:29 +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.5482.016; Mon, 1 Aug 2022 13:09:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Aug 2022 15:09:20 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5HTy0C+LWAxn43aFMRl58g83+J0Fe9uB] X-ClientProxiedBy: ZR0P278CA0128.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::7) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220801130921.84525-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 308cea43-b730-41c4-7e7b-08da73bf1133 X-MS-Exchange-SLBlob-MailProps: /mB5ds43bCEjJMchkiNDVXERLj8KcCF18MeL6MI/Gf4AWjIivCryJ5HzqMzT05NWpZrM8Z3yH6E8hMd1LivdxKXANYAgdNm2DoRk5aMyP8rw2qoIS+CJNZWrWzQf8WbEgnxcmQE87PEn3qHKYBYFssqCmkEHXgkcQT+0LgAOoPek1FNn0KVFL7euMeY0xEdIMPAz6ZZl8KU5+o+WdKfP+ND5Gxi7XJTPUOImI7cy2K9GiMXY6vOp7JU8wdLUFk+JM+F0iJ7LIHkAwF7u5uGATFBRjeX9yVtkimOrPErlNUIf7cE3TMU9adUuSLhcQFJOXOfdAe3QE6lyEjp2p1G9lPCelJXf0ZeFx2N1iPB1Dur5cMAqLd44dfBbuuGNibRwoIEIPIXhoxvTSRsHjXFu+bEwL6EjnKjuVe0JupwKiIAMxcy60lWh5trEuiIgrxcuTgmPN/dfrx4cMwNapjKXi3mG/vNDj4iBfwDMP106SGKSk0zfMZJJb482+740n/H5206NvyerbxqFSyB5RhySSf1AhchAx5V24KzydD652xV2NHetPOgNjfAsqYd+K6DmkEs/rYfVY5rXxVLdcX48vF4Gi580GJ7SsbEg7wUaTE6HThheHYI+Ox0bu6cvubHnQRenSfiWzAQnm7Fu5Z4FonUisgD0q7yh1gyg3smK7qxzDggHDya57IuXsxU9TVOfmJW5GAxRGRkC5VtP9kwc2rCEpZgdKeeu0XQ5A9QCRUIA4eaBMhNbdA2yZJl4jdOrxyQGfDkk1sInEGVkwqKw50za8CJktZlOXfcd+XdC/tgioMLRqG1AkII7FRpscowxe77V8bcjD/h+Elnw/MK+EgwT0pv23UpJPdv8tbUfj+vlIhw+ZUJ5uM3DjpZFV/lGrSPyUu6dJW1wxuiuYZI7JI41SYUwjtpPXMsL8rxaB1I= X-MS-TrafficTypeDiagnostic: DB3PR0102MB3626:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YWw468mw3It7Zrd6FA2vL4HX1ob29ZB+T4kva1x5jBfp+P7D+4DPksy1ypnbfDclXFZusCCvS1989j0aieeMWTfeKxGz2JYCSIY248I8BETwqQlJrYBVzwrQG32CA4kurELTt3a7IGIpVlZvknkKfdRGpWCTw7YubwlNszYejSSDGzPdI8wOTtKWD+7se5AlNLndrJzR5fbFOp9becaWfPkD99X8tLjlZGOVwJ7S26r61B3S8qGASbwg7koneMsPg3A0G+HyvFQkjq0clzFJGinmm+uMKlJpijHNUAaeahM0LPyPdZqYa47HU0qCL38IH8D5wSuxC/ROPfY7Me0ethfBb38iloNE+9SK0yt71Ebi2s/acIWtmvgmrD4d7aspXKDEyPFelgZwuiR9bY9G4m8ihDEzjGLndUFoJ/iQwuS9G4ZkkSdlzdUc2PEzCxfbKQne9wSTdtAt4iRCRBL4D0zr9jeUmG/4R1zQCF165w1pFeocy4yfzKrcs1VFK2lL/IxT3VGY5cClEsw/yvwP551d2Za4tVfb+zoPsr3beifWj8W1ayK7F/3I/DKTZpFyZ6kNrTdCzEoN468aFLixIDqaPEU1e1JQm2YsKGXUVleFhuUEfT1xxsUC56arlNPayIuqiZoNkRKd1Ny1ZK73IQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IaZBkGmHmBhGBCroRZPN78CiZGxvzsPhp0n2oEH6PhPP8UBKDOPyzM2hPp3pADE3p4jhNeVa6woPHxNgi9gwH5kKSiHyw1WzaxaInA7YI53MKJvHbnOHZbqaZxMT4+cYRRNhYxQe7g/coLbIzYcAwwNd+nGD6x1p1RnLYQzHR/+dOYoF92aP6/vRzr6OCSYaNZcNbGTPXGb/h0pNEldisoZIALo02SgSFacNnogqwAM5kn8+FXHrEPFeeaGoBdVAJlC5gcjF0Rl4bwCq96AtmY+eTW3ynnQ5PmJLAPMBE2UX/H2TRSmJs6wyhnp9yX2o3wnjsPh+SzP9yTvtg+BXYHAnayqEJmgP5/DCpezi6O4GSvc/KIzr+OY9Vdb28aP9OgU1KIBmE5vk2/sMzSlRVisQmOBWGUeOKIYRwGus1V7qSECq8kQ/swVw+SRARCUmshaXVdOXsQRlaZ/IqtZE3YfpFgzeyhmxch3OoI3ewAwhZjtP9NUBgKmqhKQ1kI+wdn9xtNKqBTitSONNQbiWLmZmogOpF4JPOZo8YxutOm1d0chG5izIjc36Hj+JJZ3NNwb7/AZioMnGJWv5HKbbnITDN99OwGhGEiXS/QXEwR1iJULej3JzSL91qz5cbQX8NkXzgbQcof4JBhyCI2Gj3wImQR3xcM41Vllug1YergQm5QgstbvPuIqQDzWGqptC4eKAAh5gy4rN2n6esF5SEyQL2CJS+WqZ+bpEkqKPuf2QXrOoIkdsTQHCjvKlwvjK3igdKCO9No/EKnQMcZLV7ABPrRX2gjgpbUKhVmN6r/izHVaoiBjxBEGB8wy8V5LUH75ThBKziy0758d8N2j5GHRwUbbi1yo9zNEqlMVrMCWnGCUHWVQV+nRnYvpTrPtsjfoOtUZj/EhLl3Dz/y3FQBQCEm50lR4YndRSBZNfqNN+q6NPNz6k/B0HczeQF2pVkZhSHK2V+6rSoJF2RUOjlkYKTHlcnRXYTv6fiAe7d+ohkz2K3G43RpqtyqHQ52Y5OzbDucobjNATIzDMMFZ1Z+U1wjo+Ra8bdmwfXJxReCm92NjdRIExSQLElwIRrZy83MLx18gpiCEcWVrfLmrTAqL1wx5MY5wcR3Z5qO7cPznDGYZR2MbjCWppljbUipikslLe3YMke5ZLfBMoJPEoOkFYtYVpqCrEVLrN17HMsPbYnZHjEmR3o7igAxEdabfGuiVHGkNteVJP5Xy6tgbRLwHIDumy8OOu9naOaGmXCalzzB47rMl8jec3s0xlpTRDjp63nDeeZG2TDTFH/JNlckUoReR29Dn2hTsmixH19Ts= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 308cea43-b730-41c4-7e7b-08da73bf1133 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2022 13:09:29.3225 (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: DB3PR0102MB3626 Subject: [FFmpeg-devel] [PATCH 2/3] 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: DSq2NAIiCs6X 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 9b14fa50f9..2ca0f7efca 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -1198,7 +1198,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; @@ -1228,7 +1228,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; @@ -1492,11 +1492,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; @@ -1553,8 +1553,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]; @@ -1573,8 +1574,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 || @@ -1644,7 +1645,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) { @@ -1709,12 +1710,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) ||