From patchwork Sat Feb 17 19:54:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46309 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp455418pzb; Sat, 17 Feb 2024 11:52:33 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU0dA2N9Opi5nJvEkAeQXB1jtQ0sjJnqSosBwxHk0Wz/KA7gVwuWNqUmFsUUB/CorgpEcfHiyVxvBe9cmFRsMRkZPgjzJyd6Z0aOQ== X-Google-Smtp-Source: AGHT+IHzwRYsIHgmwlMC+kiLgJneN6+oYjwAnWvXysdmnCILbT3pWE5LdLp8HmkGDBeVVK/dgSuv X-Received: by 2002:a17:906:b0d1:b0:a3d:4ed8:f5bf with SMTP id bk17-20020a170906b0d100b00a3d4ed8f5bfmr6258884ejb.2.1708199553074; Sat, 17 Feb 2024 11:52:33 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b6-20020a1709062b4600b00a3da5fa3d7csi1129891ejg.434.2024.02.17.11.52.32; Sat, 17 Feb 2024 11:52:33 -0800 (PST) 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=nbPbe+cS; 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 C4AFC68D2E0; Sat, 17 Feb 2024 21:52:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2105.outbound.protection.outlook.com [40.92.73.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4986168D23E for ; Sat, 17 Feb 2024 21:52:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RbDj4wEw+gF3PL5raN5hhFefS0H+vB9HHZ4hf6lpCqeisaBcwScqBvXplc8NMOQoSqkl5CVQ52R0NRNOPEB9hDz72ASN0uuXyAIYtlGxY2e75PQnznntcFS+TnfiUBnQoe48eUjNocf4p64FGr8oSb1JKy3/eKcG+MK+JcrEN3HncBvjSa0CizVRIa4TBuexHFDWwtEzN/fgEHfRGuL+lIuAzV47rN8IVjJa8qVp8OVb5UF5bjRfil7eig7qwsaNrEUQKePnAwZuTG78sg++jBoU8VyfvMWG6PWm/0OoIBLMBx01brcudSlrc2z0k6H5YCw7I0fZ4/J5cgnMe8aM9w== 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=W5/ytYTgfmGFiBhuhIJezGpedC3Bow6uOK6iVoiCEpo=; b=fwoYEngqbBXnh/hVn2BeOWxLIfBUThfY3V6sUoW9mhKDtsnxurEOU5YWzzM0OAUjLdytFtkEP+g+q35aFPllwyyJV9/1ei5G/6POoExBLi7SqLKXMNEmkmq3zDOA5/2R5yan7yS31gdKjxzKXoKCh3ob759AHwObkm3hWJWuY8LtIoxwxfs9pQIC9DPPxito91wW9XEqMp1EyNFe0q7+b6umV4ZXAq9bt11P/SMhgGAhWzYe+UqM+EyRP/dtCJMeIwrYXznDG90pVXpvcX5Hh7299KU+K9KHH5FxdjlkNPIaj99Y9hFHG6L17qrpbyNxgINpRXubsd7Fbid5SaeZnw== 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=W5/ytYTgfmGFiBhuhIJezGpedC3Bow6uOK6iVoiCEpo=; b=nbPbe+cSm0fsOipCTcmQ9AMu+p7Qvq0FMb7lx5qsqxlhfOAipCTJ5enHnrNW6HNPLXJ9QvL6UaWU80x/P3/wQFClumRZbKlhd72Ph2swwGmdjl6RmGlKYpSYr7W9xAniAvG31dgSKKYVALknBVL2o6eOIeg3YhdwipBYMQHpRUUXdFHPQcyVB2JU3kAGI2PiYKheH0W26L9wxmzcWy+GefTu4lUPx1w+vHGz3/j1h64JmpZa9FomVuYmiv6kvJlnXA9pNlJNSkbBSqH7yZwjtV1263uo/ychHUumNuIInRAi5JHMxecQlJj8aCRUDblQpi3xUoaxC3+rltMzF5BvFA== Received: from GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) by DU2P250MB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:238::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.32; Sat, 17 Feb 2024 19:52:20 +0000 Received: from GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM ([fe80::ffe3:46c:6214:2504]) by GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM ([fe80::ffe3:46c:6214:2504%6]) with mapi id 15.20.7292.026; Sat, 17 Feb 2024 19:52:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Feb 2024 20:54:07 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [8niVzFgZUmmCzUWbK6gefuVpNHYo/CG8aNTN20yh0o8=] X-ClientProxiedBy: ZR0P278CA0073.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::6) To GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) X-Microsoft-Original-Message-ID: <20240217195410.2524431-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0063:EE_|DU2P250MB0063:EE_ X-MS-Office365-Filtering-Correlation-Id: 377f871d-caea-46b4-ce21-08dc2ff1f367 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqQtoEVQR+3m2Xg4Wl85hPvaNdfOBpphwfjHWqbvv+B99fMTjhE4HMjEPwMWe0IBoGdFyFylvgAivPKnupSdSvLR5zIdVDyn5ahVS5etJD+Y4NArD4XTPLvAL1ANgM6/rqMhsnlyn54oFvrl+u5Arhq/U/6VgSfB5wxpYsAPP4213ocahLN+aWDSHUvzZLujMa5aGYZLrN4mKz+8C4R/kpz0mMfCF0tvg8ZjVdWlRQrqWawtt38gd3CutcgS++iBuOOJcvpBCmXLCvuq00jcGqOyVZ2BlrR+61r6wTA9CL5MnAEZVT6FpQE1tMC5U5gu7o7bBWIhagSE9yPR3xV9sxyE4lgwJeW9MnV9kHjV1WVumHsLjsd/gbIoZIYSeV3vodv4qn2f7rdV7w0zcjZXXf/vH0DkPEMVHIMEUqGBVI1SVQ5vrx6VTuUPYJcjECrJEw0tRHqvwuIIXBrg69XDPH+U5PuralDLiFFK7APr7ipaWJNUJ1dr3qtN5R5zHa7TNoX+UusJsbwhjG3TI/DKxrSXYhfAKRT9UYhLVzCbEVGh5Ks2821j9kH5522pIQTRPcPdeUFVlEVXNOsIktU7t5CQz6cTwZh72yshn6gQLBpWRsrwjfkHLlzsi70B1+IRmW6urEoo5/uYWthyCjtVrDoa/wzAbfx7hGccxdbyklh409+HYO6ttBpl26XUS2dXNwMMmw6YAJLwGnpG8FekJ0kDZx8aEAhdNrxLH+0eZEEhtRKJWD8x5UJLERZjAIeu5Y= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fltHv07r8QqmSC+KtJUjERGF7bk9zQvbuimnMSQJydfFAM6NNQbVZJ2u3kUF8zz/Fc4AbOOo5EyKG/bd/egG7JHuEJOmKc4HSbj1NgfgFK7ggiC4eoSL747+Di1bdwdb8fK297L6Jlvz71VoAfO6YnI6SERESIM9q3PhwDWuNvl27PE2fPsQ6T57qDsuZQvZAWnaP93eYLhafJ46o0lVYk/47gpWt1e87sDLSPe528XTkC25I9g/J2Z6rlU0NebVTDMoVa1FbzkS4YMMDJT7qZCJsfJ6lyNX2Uo3+r0A1H0hBOEMgB/gB2JifhuazFKm4hmcZn8u9lqXlljjs+CsSYPHyvdANOmjOABj7ybNumJZRhTTK6ArlUgeIseyg5zIFl4Xf/TzjFrZN9sogfqyPNkrwZ7dyabAJfTb/E9kcKeJrJ2t81maYhZzBM7hUkZCJoSy5uFBAX0pyuyyI960qwOzqFHNB65KXif/64r48ZE5w/PIYyWC5d/8Koa+IAwpyNcdqqUCi0yq8z1vowBhFV/hWEo2I+6YygmmZ3JnouYAIuCjjJjo9W6B4pdhVp7NVLxlakzBC7IrOR0T7J1g/DmcX9bIbDgs9UbxdWTFohlKgYVOoIhhcFxz62k3X5iK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bQK5KoXjywrMlc0NUO07Hge9gXeg7diJ/rPCLYTVioSX1KQn6rAseNZRjgRbY58IwShki5m9BV84woKWp/o70z8KJXec20PopUjtGCRuzOZBtgk0QdVrZ6e6dFBFIwsGgsIlG+0f3SA2WiMSSpG9spN+Snxs0It6hSksVVgdey/KMhTx9lhYLINTyxhuEa2Th6GFV+RH9o+7LtHkleC3BtkEwKBOD9yIdHN/+Ykb5KyG5EAZcMs0EKcDMOkctuVF6IOPnA9jel/L2eiHOq3f23vzLH7aXwP/FpzjFyq556pljcCpwnB3fvNvs8EszGQ8dpI7Qz0DvEqvAcuErmt3YHDiLjquBfsiS3U+gf+iecTuvcs6LyFRRH2M947fAi5hhr6gtKWz1uLojGybE6s+MLYqxGB7Seu4GAeV9FOqGOxZUBip7kgQuPAcFTIOcKy2pf5mKaavdLIRmexnheQ1vJrgjB+vmCRBH2HnFjXwUrAc7aC5x7JjRhbfEKjCzxWKrwypn7gB66j2p3mEopVxtGkc+YoPHUnURyXR6eJ11qA7FoDEWkb5xXomJuBERm2p26QAnTRoQQnhki5na7sepOqn2zWlH/Xm9q7ZIZSltBRtNM3svOCyW/afeMBmF+isb1kZfLvzRHv3i0oRpaGuCg+YZmK3zE/hIHvrqDfVKAWC+bf5ghpuO8LNsy2RfxNo1NuCRKWClvUY//VJGhhI873Mfc1inrviSj3uHquvxwE4R2UxBTrXJI8aYCo9Njj6f9ka6AhXf6lu3AcnMNv1AVvD+t1YK8Yx5htNZBAuR7Sk0rOWQSioMcONs+GS610z9DpXM0HpOHUzBbWOaznE5Y00PvDdpH9lob/kEA0UF4cWOO/RMEGM/iCEonVRrw6BTcz5xpMWAl789bZBX5KU7sM7Mx1Lii5Bnp1vtYMZ/mx62gC06FDaR6N5ZJOsEB2QdsbFrrtYuNDXLur1PYgMLPI8zzASb04VDkGSwtLZbdZNVZki8mRnt1qarpVIFSYLboBzkEOlStn1OVWIZDAxrLetGn4ykNbaWPSnmEoGW2KZ6UwIYCsZfnObyFM1HSByUa+1eT+02jdqOTeo0vIAHATHrN99Lg4i7B3mTKXXrLvFmLteHK4wolM9y6N3oZyqNwPinPHg0UFXfrdK3hJy6jGBX8Jk8Zsu/PTz5SQrm75uYo2yn8O5Bn4YHs8VJeJTl2n4zq3v2MfKzj6rPpIbNa/rk0a2Df9Jh9hl11r54y6MWJoj2Lxhx1/Ru4Wqg2Aa2QP0plCKD4TrCD2oEQ97vA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 377f871d-caea-46b4-ce21-08dc2ff1f367 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2024 19:52:19.8495 (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: DU2P250MB0063 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/jpeg2000dec, j2kenc: Constify 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aDOa1yzQa0EO Signed-off-by: Andreas Rheinhardt --- libavcodec/j2kenc.c | 2 +- libavcodec/jpeg2000dec.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 789791f529..ebf21f6e7a 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -781,7 +781,7 @@ static void putnumpasses(Jpeg2000EncoderContext *s, int n) static int encode_packet(Jpeg2000EncoderContext *s, Jpeg2000ResLevel *rlevel, int layno, - int precno, uint8_t *expn, int numgbits, int packetno, + int precno, const uint8_t *expn, int numgbits, int packetno, int nlayers) { int bandno, empty = 1; diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 691cfbd891..3d18d48e7c 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -489,7 +489,7 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) /* get coding parameters for a particular tile or whole image*/ static int get_cod(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c, - uint8_t *properties) + const uint8_t *properties) { Jpeg2000CodingStyle tmp; int compno, ret; @@ -639,7 +639,7 @@ static int get_qcx(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q) /* Get quantization parameters for a particular tile or a whole image. */ static int get_qcd(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q, - uint8_t *properties) + const uint8_t *properties) { Jpeg2000QuantStyle tmp; int compno, ret; @@ -1004,7 +1004,7 @@ static int getlblockinc(Jpeg2000DecoderContext *s) return res; } -static inline void select_header(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, +static inline void select_header(Jpeg2000DecoderContext *s, const Jpeg2000Tile *tile, int *tp_index) { s->g = tile->tile_part[*tp_index].header_tpg; @@ -1015,8 +1015,8 @@ static inline void select_header(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, } } -static inline void select_stream(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, - int *tp_index, Jpeg2000CodingStyle *codsty) +static inline void select_stream(Jpeg2000DecoderContext *s, const Jpeg2000Tile *tile, + int *tp_index, const Jpeg2000CodingStyle *codsty) { s->g = tile->tile_part[*tp_index].tpg; if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) { @@ -1033,9 +1033,9 @@ static inline void select_stream(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, } static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, int *tp_index, - Jpeg2000CodingStyle *codsty, + const Jpeg2000CodingStyle *codsty, Jpeg2000ResLevel *rlevel, int precno, - int layno, uint8_t *expn, int numgbits) + int layno, const uint8_t *expn, int numgbits) { int bandno, cblkno, ret, nb_code_blocks; int cwsno;