From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 01A05462B2 for ; Wed, 13 Sep 2023 14:24:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 725C568C9E3; Wed, 13 Sep 2023 17:24:54 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2027.outbound.protection.outlook.com [40.92.89.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADFE968C4D4 for ; Wed, 13 Sep 2023 17:24:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UoJc90S05sosmLwN0JibY8s4BUeF66t3hyatkXH8oZqSLnjwbqciZ995aPbX6EVCedp5dEW1ZTPHfqR1Hyv3vGyrSK1wQtdjvTLDFy+gzCI+qSZmEX5pxs4tYMN75c71ZkZFVhvZoOvdZuGggl9Xuqme0wabNxVWfEa+dhKa7K16Or6V3pAvEnpyro1VEcB1T+QhOFGQkeNIP10uYULtHtWfxbUJhX84dmP+RVq6PWjMzPWzSbA4eOGHwBAKucg01QSRJ/I6mLf7R+1wHMIGr3oqGt+BVX65jbRN7UStkIiyha3qqTRDPSVnJ9ygBe7WCYvqzHmZvRh5QbEwePPDLA== 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=L7p+ZFSFSG5q/B+RluDQvpGxF9VhtwS5pxpLGASSrcY=; b=SDIjk5ikgVSAEmSlRoOcDUb0C6m6rMNp0Qcbdqz+TRHMbA1Nb+75oUW+23Y4qtVtnxmmlM/mcoI47KC3MEd4ilaJBh0BrAxFyeqaWZdIG18teZgAYIQvkHraIg9gCp12ry+wPcJJVgf420wlNRIpiv4YEVL4sV/MS4lOC9uDA0rKIYbZZoQ7HFmRP6zBEY6ui4cbTy3/MKAJeiOHPwwOJyZcHU8sPuP5oAo7BpEnVBaeWVW/7HUkjWwsCv2Yyec1htOBS/1kVTfmUyl8aDDXvLGj15UP6rWgjrcKqDmTTxuhHjH6AzQwQgx1dx47KeZdo33gkg1fDpmzZ9erGckICQ== 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=L7p+ZFSFSG5q/B+RluDQvpGxF9VhtwS5pxpLGASSrcY=; b=W6WsJT9/+fyeVJN7UwVyundJpZZ+w6nmEdqknDuMpw9NMy/53Hr6S024E0VSmiveA9bi2P21vP/Li50+xl19UdbG1uIYzWitgX6/z4Y7lVVJ76coD6d8KY0QdhkXwuvnwVwaH6waBBBK6xCGjvH0CtLSikuLGr/KB37Iz2KGeY8aFAL3YO8d69NIA744cjxkMf1I930rAFsygFglCzxpoHRDAUrNbLi2D0J4RVPH69csIJ6LdObencHWwxFJeD9P2GJOrvxmHsNeWMyhfCTFIFVGEF0XQIRdp/eYnbz39rJWtHs8xmhY0CfbzxSL1HYB3Tq5+yPTLxgpmnwP+ahA+A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0318.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Wed, 13 Sep 2023 14:24:45 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Wed, 13 Sep 2023 14:24:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Sep 2023 16:25:56 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [RkWnwvESAGzrtK0A2tK4Ra66a8+wk05m] X-ClientProxiedBy: ZR2P278CA0083.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230913142557.3636671-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0318:EE_ X-MS-Office365-Filtering-Correlation-Id: 5211c8df-5e26-49ad-c553-08dbb4652dc8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /DMGzO8HcuL8LTIQyKrSeTQXiby4efwS0gdDijpM48POyuq/7fnrPx7Tfqn2B3W/as//saMWJzoZekC5RUhfFr5JCdexopyAzbp+TVQElLyR4ndqjyp9hMpIaUJPg676KpIZSBDUC2yVMiS6zK5QInJhkfpGvAPkSmk+QirW4vxFQ4RtBcs91hGWRLHDai3zDTxiQ8KHWe4vDmtBQLFmS+9WvbjOSbIgidWAN/8RNm7Dk2FLB5g3rJBjA7hmO8m3r/TWPX5d0C25iUvtlBFUGeO6rgAXONNJs4IOe1cJQnWQWPX/itoVGcnaEe6sIDfwwtBkCCHLZij9fkuGZygHm34rpzfGAigOsVeahqdbSdmaeNKlSZ9rIMf9tHB0JFsrrNS2gBrm7HC+TXyuFs6fxDfR0roRj7oAILZbkEuIucvkk0zlYJTvBfzNwZ+Kh7/TbIZxy2cTO5wHVhkF3YF+TU5TTwhcTt8biFMe0FTySpHeUdEPN5OiT69e6KvWsVguxbuQfucaENusuV364i9PkKKxFpFUyCG6ai1oqs6vl29fK1DfFTTlF9IRSPsaYxWjUGv92z09trztc+KH85gcuGOMyINtj5DRy4U7v0UZtccQu1+5P5VTQ/+gQDOeBPgU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HT0FLKoRJ9RUf49kF1MKyav9XHHGGJyp7NJl3cErb7vv5/3lJR7cPqRdZ/wr?= =?us-ascii?Q?P4zk5VD5VPvmcemUoWX0Ob5WBgUXdEoZ5LisDvC3XvBVG0SF3brvOfyeRMRV?= =?us-ascii?Q?aXbXKtBZ7feGiMz4GYMTeytej6ykBE8whAI2K9mOPzUSbTU80CKlhr+UhwSP?= =?us-ascii?Q?5i0kaj1jtxNfJ/VeNE7o+9v22LMl5k07tUf4SVkkWsg8EOJ5b/odpOuGCw0S?= =?us-ascii?Q?X/XB6/PB36lb7ygcXe/3HzombXx+An8WRzv+IQxjtGoq4Q6Y2oZtobBnfxql?= =?us-ascii?Q?RHqrp9Km3l0Ts7yUc3MWrnazP9a5ucJ5IlgcMD271BF6gsmy+AVBEDVHlVZC?= =?us-ascii?Q?wGywvXuSl9Q2DB26VJQa4Y2S29+P73l2rW1dFrAhHcplH92NIlTzyDQqA9Sh?= =?us-ascii?Q?aER0w9sr4B2VlWX66wYzhHzUA+MDFW49Qlt2FDQ3UqZv+2T0LQFs4+9jz1DB?= =?us-ascii?Q?1BQjihnk8kXn8/nvKuihO0QfT9TabrlB1lTbp9YGU0F0p08VkOzS3+64nkEA?= =?us-ascii?Q?wg6lEHMhyIM3b0MPdRBfpIOi4H0w4UEi49d7QtTMWfa0EVPZHFtUd9sObb7K?= =?us-ascii?Q?OCFQ7V1i/AyHqtUKVkg6OeyK6sOJfCssnmPKVst8GfYL2BlMGv3HqFGM3DRk?= =?us-ascii?Q?p2f/zg4f3WlH4Q9TN/yYqu306/3v7s6F3QwFberWKQaJO6dJ8NsGBZc8wa70?= =?us-ascii?Q?bWv/KTOH72Rvn+IAWVclqxIsBUANnWSZefZDJHBshoeqc4cmMYW9lAKo4q4h?= =?us-ascii?Q?Jl6ip+EWR0uCVOylNzSMNIUUPeYcwWiQAus0qv5clDoZJahW7NYcFdrK2IaJ?= =?us-ascii?Q?idLSwu2ARM009N9/A7/NfyFUfldfTGjH8obzo304zS+JFlsFoaYl3A+TcU4n?= =?us-ascii?Q?9A8bJGbHjdVjHT+xJvtkGrlPFeYm5F4AgZAtd2RPhDLM1AHsx5S6biigxtW/?= =?us-ascii?Q?B5MSFQCFqwAcbj+nPO8HRBraCrC1sFgFver7XeTlkHVH+7T/fOE6/H2uqHZI?= =?us-ascii?Q?IDMrJ4kXPKX3JJXP6mnvMjR4/6jsg7hY4bif6BNYebAI0cBUGlTJNQSg9ouU?= =?us-ascii?Q?CFsqUuOEGK7mwMw+hI60uVOh6tIiGaLaea6YgTNQPsYu1Os7Y3Z048+nkc0/?= =?us-ascii?Q?0EHmVp1GTDd5pueiqMJyJ3aOgpuoGReCF3DY0RQbn5FNOVWp18gVps/AirXt?= =?us-ascii?Q?wcWuMOLbu/X6X4c45Wx6AMAvp6v7X7NwB0rrMALkwmDokmkUcgX5ad0sPxNP?= =?us-ascii?Q?NkB0naM55PS2j/w3dX85?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5211c8df-5e26-49ad-c553-08dbb4652dc8 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 14:24:45.8202 (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: DU2P250MB0318 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/vp3: Add const where appropriate 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 272dd89117..f27e9cd1cd 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -472,7 +472,7 @@ static void init_loop_filter(Vp3DecodeContext *s) */ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) { - int superblock_starts[3] = { + const int superblock_starts[3] = { 0, s->u_superblock_start, s->v_superblock_start }; int bit = 0; @@ -1182,7 +1182,7 @@ static inline int get_coeff(GetBitContext *gb, int token, int16_t *coeff) * be passed into the next call to this same function. */ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb, - VLC *table, int coeff_index, + const VLC *table, int coeff_index, int plane, int eob_run) { @@ -1196,7 +1196,7 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb, int16_t *dct_tokens = s->dct_tokens[plane][coeff_index]; /* local references to structure members to avoid repeated dereferences */ - int *coded_fragment_list = s->coded_fragment_list[plane]; + const int *coded_fragment_list = s->coded_fragment_list[plane]; Vp3Fragment *all_fragments = s->all_fragments; const VLCElem *vlc_table = table->table; @@ -1407,7 +1407,7 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) * @return < 0 on error */ static int vp4_unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb, - VLC *vlc_tables[64], + const VLC *vlc_tables[64], int plane, int eob_tracker[64], int fragment) { int token; @@ -1537,7 +1537,7 @@ static int vp4_unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) int dc_c_table; int ac_y_table; int ac_c_table; - VLC *tables[2][64]; + const VLC *tables[2][64]; int plane, sb_y, sb_x; int eob_tracker[64]; VP4Predictor dc_pred[6][6]; @@ -1861,11 +1861,11 @@ static void apply_loop_filter(Vp3DecodeContext *s, int plane, * Pull DCT tokens from the 64 levels to decode and dequant the coefficients * for the next block in coding order */ -static inline int vp3_dequant(Vp3DecodeContext *s, Vp3Fragment *frag, +static inline int vp3_dequant(Vp3DecodeContext *s, const Vp3Fragment *frag, int plane, int inter, int16_t block[64]) { - int16_t *dequantizer = s->qmat[frag->qpi][inter][plane]; - uint8_t *perm = s->idct_scantable; + const int16_t *dequantizer = s->qmat[frag->qpi][inter][plane]; + const uint8_t *perm = s->idct_scantable; int i = 0; do { @@ -1948,7 +1948,7 @@ static void vp3_draw_horiz_band(Vp3DecodeContext *s, int y) * Wait for the reference frame of the current fragment. * The progress value is in luma pixel rows. */ -static void await_reference_row(Vp3DecodeContext *s, Vp3Fragment *fragment, +static void await_reference_row(Vp3DecodeContext *s, const Vp3Fragment *fragment, int motion_y, int y) { const ThreadFrame *ref_frame; @@ -1972,7 +1972,8 @@ static void await_reference_row(Vp3DecodeContext *s, Vp3Fragment *fragment, * @return non-zero if temp (edge_emu_buffer) was populated */ static int vp4_mc_loop_filter(Vp3DecodeContext *s, int plane, int motion_x, int motion_y, int bx, int by, - uint8_t * motion_source, int stride, int src_x, int src_y, uint8_t *temp) + const uint8_t *motion_source, int stride, + int src_x, int src_y, uint8_t *temp) { int motion_shift = plane ? 4 : 2; int subpel_mask = plane ? 3 : 1; @@ -2076,7 +2077,6 @@ static void render_slice(Vp3DecodeContext *s, int slice) int16_t *block = s->block; int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef; int motion_halfpel_index; - uint8_t *motion_source; int plane, first_pixel; if (slice >= s->c_superblock_height) @@ -2085,14 +2085,14 @@ static void render_slice(Vp3DecodeContext *s, int slice) for (plane = 0; plane < 3; plane++) { uint8_t *output_plane = s->current_frame.f->data[plane] + s->data_offset[plane]; - uint8_t *last_plane = s->last_frame.f->data[plane] + + const uint8_t *last_plane = s->last_frame.f->data[plane] + s->data_offset[plane]; - uint8_t *golden_plane = s->golden_frame.f->data[plane] + + const uint8_t *golden_plane = s->golden_frame.f->data[plane] + s->data_offset[plane]; ptrdiff_t stride = s->current_frame.f->linesize[plane]; int plane_width = s->width >> (plane && s->chroma_x_shift); int plane_height = s->height >> (plane && s->chroma_y_shift); - int8_t(*motion_val)[2] = s->motion_val[!!plane]; + const int8_t (*motion_val)[2] = s->motion_val[!!plane]; int sb_x, sb_y = slice << (!plane && s->chroma_y_shift); int slice_height = sb_y + 1 + (!plane && s->chroma_y_shift); @@ -2137,6 +2137,7 @@ static void render_slice(Vp3DecodeContext *s, int slice) /* transform if this block was coded */ if (s->all_fragments[i].coding_method != MODE_COPY) { + const uint8_t *motion_source; if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) || (s->all_fragments[i].coding_method == MODE_GOLDEN_MV)) motion_source = golden_plane; @@ -2529,7 +2530,7 @@ fail: } #if HAVE_THREADS -static int ref_frame(Vp3DecodeContext *s, ThreadFrame *dst, ThreadFrame *src) +static int ref_frame(Vp3DecodeContext *s, ThreadFrame *dst, const ThreadFrame *src) { ff_thread_release_ext_buffer(s->avctx, dst); if (src->f->data[0]) @@ -2537,7 +2538,7 @@ static int ref_frame(Vp3DecodeContext *s, ThreadFrame *dst, ThreadFrame *src) return 0; } -static int ref_frames(Vp3DecodeContext *dst, Vp3DecodeContext *src) +static int ref_frames(Vp3DecodeContext *dst, const Vp3DecodeContext *src) { int ret; if ((ret = ref_frame(dst, &dst->current_frame, &src->current_frame)) < 0 || @@ -2549,7 +2550,8 @@ static int ref_frames(Vp3DecodeContext *dst, Vp3DecodeContext *src) static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext *src) { - Vp3DecodeContext *s = dst->priv_data, *s1 = src->priv_data; + Vp3DecodeContext *s = dst->priv_data; + const Vp3DecodeContext *s1 = src->priv_data; int qps_changed = 0, i, err; if (!s1->current_frame.f->data[0] || -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".