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; From patchwork Sat Feb 17 20:05:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46311 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp458873pzb; Sat, 17 Feb 2024 12:03:25 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU0l9AEYUjcEs8BpLumCuNC2M4w6LQui4k57WxBseafvye2DGAD/1OZi2CoK7YUeXXi5wG9aXlqxiFqG6t/SROrcuqksKJCOwQGLA== X-Google-Smtp-Source: AGHT+IEoCDZkE4p4N+Rrdbsiq3UQI3OAzeCLUs3jDZFwerH6OEcGHZm3MwxcdWb3908q1lA2VKwM X-Received: by 2002:a17:906:3d41:b0:a3d:b7e1:2670 with SMTP id q1-20020a1709063d4100b00a3db7e12670mr4397975ejf.14.1708200204894; Sat, 17 Feb 2024 12:03:24 -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 l16-20020a1709060e1000b00a3d04467badsi1023029eji.492.2024.02.17.12.03.24; Sat, 17 Feb 2024 12:03:24 -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=JEONmTPn; 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 9F6B468D2E6; Sat, 17 Feb 2024 22:03:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2089.outbound.protection.outlook.com [40.92.59.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1902D68D221 for ; Sat, 17 Feb 2024 22:03:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aOAgJRW0LYkBQeHpWOQeBuY5FjPB4wKIIiwKGDaUPeuyx8ggDpS1K7O3I6qbzLfutL5miOS5K2lTKhwrizVLpP0Nv/wHFSA8vq3lP7XB+9SLXcfUYclys3lXrMokbWegiEq4NwcoIgGAepSVHDD1afRRIBjYRU+QiyQmbmUBOz7gZqa2135TFuZ8XvjSeYzapCsUnWpW8I3H5ECl22C/IWJMagdjkWAFTl/p2DFVLMucRFVFDCCZjOUjpW75OIzJbXRJwGNAa8W1sHwgzOYmQmy3IZOmCsz7hoO/TGGxJ3ItJhsm0zEbeAwfiW6AQST/m6b0WFv3gEkmfTuArDop+w== 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=RDKIGzKJqVZ/+9HFoFBIF/DwdQS96w+Vzc27iMN4n88=; b=RTzdvKGBNOkElbgfkmeL9MRqTsLV1Rv+RHZwh+Y3Xm8QQ2i9l8a0xrIAFP+9goa32oZ6StyJJCAwWB9hPCWlNyGd1T1GyDB98JHD6032oso2gAw1v4J7XXYnusey5viq2W8HkS+rlsxBS/MoymjSoLqCR++GPEgsSUX6XYfDQWRbe+KSBpTYV7Q9GyE6XFQJlUpPUrIQko6QEfiWMID/jy3kwueTFubyY+4xvl8/h34RBcadlyiQBYuibQwNPoKjnMh11IVe0jLsN4Abp+iCKpKxKxwEd/BrJ1dpX04i1omdlpwa80Gv6EV1nZuI3k+FeIBP5DBq08HEIhohFpC2bg== 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=RDKIGzKJqVZ/+9HFoFBIF/DwdQS96w+Vzc27iMN4n88=; b=JEONmTPnOTu+ipyvplUdtTgRg+y3LVgjF4SsxTE0bavkupeq4Hl6TP42K6is9lEE1OaVo9gx/iQ/EBMkYILCyAKbXmXQ2kjbvAmQvf4BV432UBPDaK8mlD1euJhGkmFujUka/IN3ct2//plPaBQhUGeBl5qZ6SyofvJ0J/UbNURWvFstwSL81C5UIwbYFPt7//uMWiBcJ/16wWpOvszSQyvLH0Jb7dme3b4NMBaTPDDpRcXRwjDEgqZKMTTtfK1aNzH4zWtjEe5PTxklFQktwrK4dHhvNc4KSY3ZwLNU5DUCuDx1UETdZen18VcOORpIuEYKE+ht+zpV4/VS3flinQ== Received: from GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) by DU2P250MB0397.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.31; Sat, 17 Feb 2024 20:03:13 +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 20:03:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Feb 2024 21:05:01 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [HOWUQKsdLUCt0waDe1U7keo4z16JYb5TVv/1Cf6sWrw=] X-ClientProxiedBy: FR0P281CA0233.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b2::6) To GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) X-Microsoft-Original-Message-ID: <20240217200503.2524467-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0063:EE_|DU2P250MB0397:EE_ X-MS-Office365-Filtering-Correlation-Id: cf03bff6-ae7d-463b-376c-08dc2ff3788d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n++00hQKNMZbG5jgZwelkJTb0HmU2HOx8nkTQF8rslmylYhUedgNAFbLhlyNECOjAhJ+JNs6n/bak50BQNd0Y2Y3gsxzVONMAlEyY+8yg331E7fHCnTKzipHWeB+AWypTZRb8cqUUblbEzikuTWGgCoHQlgw11RGjcpigu/3wmYY+ruu0ET8tJgqQQnDPg2H3rvcEUrZQQHP6+IqcOqu3ZabHhio6tSGewjfXEtjSA6ZDGm10iw8982V4ydQOdcdxJlXcatV8zsCJRMTOuqbv10nVG8o+nd9NZcWOhbSJ9mcLLWUWeyT9t8+3PNYpT/KMBIlSI6MMNNwNhmpJKuE9hXQhlX3SporjLqg0l9OTk+t2RP/gFc1Zqs1Ofe4j3tnc1zHT0hzhkR+npg3jf+jYAc651DA0yyhvtm0kOux4AXXFNvNKJJKe+taOzoJC/KBdJYJLoE5cO92JLysIu31xxB8X4OokByZZEeMGqKVAt/Pdnh2gbR1FIT4p3ATn8yb6v7WOwCApfNWeb6gSGr7uILjwWrZE1jgOiT0z0S6lS2hBFf3i1Bof6EWFou+eRUrmtyHZ0sOVkC98mFxXQnO3GOvu+RALo7c9q9wL+tBCzlDm3mFOjzUzz+WVh+OR7wI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gn5MviVUfzHcC081Id4STibbeccDercC7GP6dQHit0EB2wDpNmCaJcUWCg5B4EXbwCTSm3ncYqrznvV2JqTG/i5j6zTOnD8UZNp7sG82sPChQhbZ54c7LKiObl0rZWF1qE4dBvc3NqpeHTztXUlSygBYqITg0Vd0ltSym+Cckn6+YJF11W/1JUkwntlRe+j/Y4iDR3tv+1U6X4fAm17UdJcnbsaYEvpD2tzkQ3AVD1agFWMOAJK7BBVxXv+CvgVATim54jrWv0IoHOAIPYegGYBDScPzrQZYqjlkFbZreEf1yzmVUMah8Pyg55OrYeA2lL0dzutsjpAtgyDjB7jjuw2vLjraZ9nGYYV/oL/0nO0kFjG8PWlaN5YSyIFgsrRXnKnHnJDBH8cTucKC5t2SWR0Jtnt7Oc90AQ8dMxaS0cEWrz4GwBdFJCW3MTvc2VpNITLf7z5Bvu2uz5Nbu/WuqaXOmjv6N3f9qq4XlWJy1M+nH8ffIGamLyhx9lhnD6sjpYBV4o7ArrEmuPm9U2OgeFs2hbLUoPuJLG0DiMuVTzMvaIh2QMr5VUVybuLfRLdnmWcsHwt/eyAHoqojbLBTw4TR4XtBbiMWKejCmg4Xzs/p6BrsqfoaSfhIq/EPfE80MkCpkN03IAgbME7QIQZt+ypv1/x37RxBXxw0/LgbwUmp4CIuGAUWKosioPe1G/FcpFdMOm4BOrCCzMXnBq0WKwJSzsL/l+n4wU4SNmtt7sXGBHRE8lCGtZXsJk7mgdGpZwv8jX8/plySPymWQ94NyXYB051aAV6d2oSV7N1Uoxi/dyRYEOrAIYnjbAh+bdaO0BKXng4ulLcejY73+i0BwK3WZqydRw/cxBkiEehqKHsZ2rcYbXEg3ELbRrNuSfrHGY0H9gVl3zvudFIBIkEJak82ldKH2We9u4Kh1lHTLrjKhql92W3IQ/aCyaeYpkyOC8ER6mS8aR2RN9tWf9r2IaG8PUk/t+tqQux0pBCxfHVkoMwmGjFChqf5OUoexIPXoej4yRWNtMOTRuaiXueDJGjo88Vs9HdHuQ7KQGpOKepR1sa42WgwvnflngQLiw1nbrk/5Zq7F+74bjFtvwlvapg5FyhP1ri57iR94KiA9NcfliCUtf7a6RGsKWQ9QMt+3f20l22ux/WO4ySq4TkE/8eVs9VUDY1TYewFqG4VnBzk7gG/c/Av3FQz5isqhves9qtM4noe7gEJFQSrsBz6kqj0dcF+XbOVYWDgrdB3nZH8xSltoOKRQK30plr7XN+V+KIZvWqdb28Jr2Z78HNBsA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf03bff6-ae7d-463b-376c-08dc2ff3788d X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2024 20:03:12.7903 (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: DU2P250MB0397 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/jpeg2000dec: Avoid using GetByteContext.buffer directly 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: irR6aO29qLx/ Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeg2000dec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 3d18d48e7c..1afc6b1e2d 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -886,8 +886,8 @@ static int get_ppm(Jpeg2000DecoderContext *s, int n) return AVERROR(ENOMEM); s->has_ppm = 1; memset(&s->packed_headers_stream, 0, sizeof(s->packed_headers_stream)); - bytestream_get_buffer(&s->g.buffer, s->packed_headers + s->packed_headers_size, - n - 3); + bytestream2_get_bufferu(&s->g, s->packed_headers + s->packed_headers_size, + n - 3); s->packed_headers_size += n - 3; return 0; @@ -921,10 +921,8 @@ static int get_ppt(Jpeg2000DecoderContext *s, int n) } else return AVERROR(ENOMEM); memset(&tile->packed_headers_stream, 0, sizeof(tile->packed_headers_stream)); - memcpy(tile->packed_headers + tile->packed_headers_size, - s->g.buffer, n - 3); + bytestream2_get_bufferu(&s->g, tile->packed_headers + tile->packed_headers_size, n - 3); tile->packed_headers_size += n - 3; - bytestream2_skip(&s->g, n - 3); return 0; } From patchwork Sat Feb 17 20:05:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46312 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp458947pzb; Sat, 17 Feb 2024 12:03:33 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX5iVMpf7tyu7KVstsjHMeiw9UOIlFNVR3zRWCy2eZuHhXKc0CFE97wlbaALC9jESjmuxqZeipJG/oyssX9lMy/BYSmabh99bDw2Q== X-Google-Smtp-Source: AGHT+IEhdL/VQAmvqvytTO5OfQsAVlivl/iPtlMQeFkufsChVa3sRp+iZC6adiVAsLCVtm/lyCjt X-Received: by 2002:a17:906:3d2:b0:a3c:e8f6:a399 with SMTP id c18-20020a17090603d200b00a3ce8f6a399mr5411557eja.29.1708200213412; Sat, 17 Feb 2024 12:03: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 jg20-20020a170907971400b00a3e3964c05dsi488907ejc.829.2024.02.17.12.03.33; Sat, 17 Feb 2024 12:03: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=N3UzWLMA; 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 9C01E68D2ED; Sat, 17 Feb 2024 22:03:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2089.outbound.protection.outlook.com [40.92.59.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 477B268D2D2 for ; Sat, 17 Feb 2024 22:03:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PuCv4QC4Xoq2bPNBYMHOvu6hHZwqT+rVwTj9TJHSgeKAr1RPFpE5W62ir2bHVhjXpuTrxOQk7d4LZxUr4oaJy58Ym67gufrKEsBDqf+dOJxgXJhw+ZCz9ZShLh+LId+44T4vzBDlqu66Cvk8TaAxG0xbzLjKbVviV2gGY7L4iX+L73I2OPfVwHCDrFRCmRl8cZptMSr/TKgbICAvay6QWN2RscMoUr5zEnc+fVyocm1EuNChhzk/qjlcjfTGP8LkCFYq3wpRsA06d0NOgu98LUCqywieUDt8K7z4nfNRcLBhaHQ3syc1t53aXQ+1dr8Aew4uGW5Wcd0QOvoyoXidjw== 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=ydWh8V7CEHfkG+uTXlivYteHKVqMF34hzCxdXro3V9A=; b=Lf0jkvNQvThFKuqRfW8V0rfjSBbeoi27IVMr/3rMKyBOmHMRUFOtB3oz2ok0Etf7Uc5zR1tb8fSUTa2qezaKEfuyB4nkqX/qVgrGYi5r1Zv4wNCjBEtaTz1mf0VSJn3RiXZL9IIkvh/XN1lL0Gf1ij6tzVAX1zO65LFfJEV2xFcYgefg8KF+PeakmWy7lpvl147u1tAqowHvb1ihg+P2r2KruFJwe/tCXMEwh7RlB1D8U5wstQlRwsM7T2OAFwrXUGbdApDpwRDCGXAA/txTex0O9wCHTFQW8wpmCGhAOCDHNk/ujvjM5xGPIyvbr+zFjCPD1WZ4ygDmJ678DWWGJQ== 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=ydWh8V7CEHfkG+uTXlivYteHKVqMF34hzCxdXro3V9A=; b=N3UzWLMAdOesPZdJVxKC/Q4xf/DBW7gH4HZEmfpGiN4e9QZwLw60IdgJJ+8c5pJoyUcUWFlLxFdlHeMyFBMn2CE0OYxKIZqN7MjedIfbDBErZndIggE6lZw2jw4G46KUh1Q5ftIGrN/LJgbPwwDhBLtQDobiy5k06Qb7fXxGMZNCdpyp4y3QhZU2/HjCs5e0LRai4YAqc7NcwUdO3Tm6GisLHUcbd2Xb2H4NdPrj2dDnpOdQ0WIq3FFvfU3Zs7nEQ2jEpqRvA8EtuwmJohdrmv0aEbbLvL/+3th9OT1fILzFI+11pQZhKiz05Nc7sQ4uVWQU+3h3RUT2VI015tr8hQ== Received: from GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) by DU2P250MB0397.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.31; Sat, 17 Feb 2024 20:03:16 +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 20:03:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Feb 2024 21:05:02 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [XjPaXriTdm3A5VoDAj44gEn/JyZRWYBF9HGJnGKmAzY=] X-ClientProxiedBy: FR0P281CA0233.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b2::6) To GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) X-Microsoft-Original-Message-ID: <20240217200503.2524467-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0063:EE_|DU2P250MB0397:EE_ X-MS-Office365-Filtering-Correlation-Id: b0713865-4d1c-432e-bf73-08dc2ff37ae6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5a5NsaYQjLpAMdASR0oin0b0sisxDwB4lt4YbpWQRBNmAoOm+PA1czl9tooWg08CRg4TkitKyyAFRxtw5eF2p7EvwhN7+m5U6Jr82+yurwk8dVhCnLd0SHw5pprkmBsqst5FSJsnMj9k1bDVhk6Owv+F0IcEq3G2BceMfbpL1c3c6+A/7qdOgbV9U4/wHtmxmJStsKemh62AM4V80+jFDfn4deT5iAbH0SdoX9GgSYra+zTHmlM9/E+5iPhk+KT7JC6nBZgncO2Gat5WIrjyLsvaQ+vLXPA7iG/6WOYtLQCsW44dEc8r5VqUuzhssjDMaWR/4pAo/oeDum+MbkqJ+AZBCyl1F7EqnJ5hf3DJnQ2+204zzAMiIQN9/WSZI06QmRkRmZA5dKiW/FusKwrO7dAoJT0r98TbruEoY0Ht9ZpkNyrv4CwFuBSd3AmThBo4ksdV+wWQNfu3S/RXeLRoJAB2ZlN2rhXuZ/OFOUgWMNFzr3g6Qg7nyZAzFC7k7DRhBdASsc8nuRK0TCZf4FGqdRMDT6LhAkZJMG0B6EKmt/gg75nuc8MjIlxZm7ZJZ9u3NZHbkV9/5CLq9xlBy5uTstpZ0yqr9xga49l/E7ACvbY= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5BPHLoEuyiJUml13LmquxVupjMFVcdom681yy9oAaLdoeibU5KqONhLidcnGRCxEY64D9QTujY5FSRRMJdNu/RbcnNKk3TwGKuvmC57RBr6/EUCOaV/DtDrXzO9AgV6TZ/vkQnTNtSU82YKLhtCCKejj9StUPi5HFMgjLJnOzklZ6RdPwGKaV5AAX0v2Bti99cyZpuJ8zY4gFhqUSp4xs9zLbSN+4YUkzdihn/g824ERKFGzeCGrbrjFNOzP/yoZjlDC3HXAyaXu6Sa3hSax++cAHawxnrf5gmPXpatVyJHihiy16lDpyDem5Hfmf9hrEG6Tjs2EiRC6NaxWes+3U7KaitmEZRALcjD/4wc80ijRzbuDHpbOR74NHbh3Xu0QVw9nhb5AIIL3SaW8jjQddZreBMZ1wnjAqGAdJ4kQ9WnYR46IxUwJNJPcTOUllXDhOKYYeFp1mcdXxRvn1g0Par3toF+N2bhm5i8HfQlzoDg7hmm3KhbFBS/jbnoKBb/pCVdaYPClbnwIXgDAtSS5qkN4ZnXOJxcAmVozkPludjmeWFTjxF+LMFNP0u2cvUwLInJFK1Wdl0EWxokWA3L0YPp6nvP6DUAZuQXY4mKbzCL/Q6o8pviW1tPcV7cizynxPhZsJLPhSpDJ0+iv6K8/JW6chUPfi+Reo6p7fU3J/FdYvH7OSvqElbIhCAwGIY6YC0xfOxhyN0lf1rqJatbrdcQm0fc9jbaVUpnfVYQNHimX+1NvQ66Vi8Jz2tR+C7BxU7aAyc3f6KjJlqDkafPraF4spS7zNhcyqgYi4zkaDuka5nATSeTA5CFikP05sv9bgNB92jb0v+kg2k0bfacPJDGDfaRjyfqrAbst1F5Rc7/iKz85yCO04AsLf7uVoiqG5r2fFkTIMCEe94Zvj9/7gIQOyaTVFUYGlmEaDryFKKyIvgQ6fP/51lYjmkD6sja3Rtvtp6sACu7DZegjRKKD9aMBg+7DIlsg7IlqzTMI3qCCrgiQKbG/8ain81um4PhbcVooe86Y3ntkpjuxMxfIeGtJ1G07SPE87bKaUoAgIBxJFOaBV+Fdk7W6ee7hRm946XWBIJnuEE+Nvkg2xleZK8cW3d+0vzDcrUpSwfyPTSxLJ1CABa/rinhgVFcs6kgb8YLxdCemn/7ilcjCVI05GiaLQ4C8eBxZS4fHlvT0BSopR0JfezNazhYvVqn193FBVuTCq54seXe6o4yH/vgFs3AJMK51OFGORhoO4hdhId/hzNMiiXQOVZW8SGWFMttAzlCdT++zz3iMBjLpoaav+Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0713865-4d1c-432e-bf73-08dc2ff37ae6 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2024 20:03:16.6723 (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: DU2P250MB0397 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/jpeg2000: Simplify exp2fi for numbers used here 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: l8Z9lEeEJA3w The call to ff_exp2fi() here always uses arguments in the normal range, so that the branches in ff_exp2fi() are unnecessary. This is so because JPEG2000 itself only supports up to 128 bits per component per pixel (we only support far less); furthermore, expn is always 0..31 for the decoder and also sane for the encoder, so that the difference between these two values is always in the normal range of -126..128. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeg2000.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 0aa984bc53..d6ffb02319 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -32,7 +32,6 @@ #include "libavutil/mem.h" #include "libavutil/thread.h" #include "avcodec.h" -#include "internal.h" #include "jpeg2000.h" #define SHL(a, n) ((n) >= 0 ? (a) << (n) : (a) >> -(n)) @@ -201,6 +200,17 @@ void ff_jpeg2000_set_significance(Jpeg2000T1Context *t1, int x, int y, // static const uint8_t lut_gain[2][4] = { { 0, 0, 0, 0 }, { 0, 1, 1, 2 } }; (unused) +/** + * 2^(x) for integer x in the range -126..128. + * @return correctly rounded float + */ +static av_always_inline float exp2fi(int x) +{ + av_assert2(-126 <= x && x <= 128); + /* Normal range */ + return av_int2float((x+127) << 23); +} + static void init_band_stepsize(AVCodecContext *avctx, Jpeg2000Band *band, Jpeg2000CodingStyle *codsty, @@ -230,7 +240,7 @@ static void init_band_stepsize(AVCodecContext *avctx, * R_b = R_I + log2 (gain_b ) * see ISO/IEC 15444-1:2002 E.1.1 eqn. E-3 and E-4 */ gain = cbps; - band->f_stepsize = ff_exp2fi(gain - qntsty->expn[gbandno]); + band->f_stepsize = exp2fi(gain - qntsty->expn[gbandno]); band->f_stepsize *= qntsty->mant[gbandno] / 2048.0 + 1.0; break; default: @@ -391,7 +401,7 @@ static int init_band(AVCodecContext *avctx, Jpeg2000CodingStyle *codsty, Jpeg2000QuantStyle *qntsty, int bandno, int gbandno, int reslevelno, - int cbps, int dx, int dy) + const int cbps, int dx, int dy) { Jpeg2000Band *band = reslevel->band + bandno; uint8_t log2_band_prec_width, log2_band_prec_height; @@ -466,7 +476,7 @@ static int init_band(AVCodecContext *avctx, int ff_jpeg2000_init_component(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty, Jpeg2000QuantStyle *qntsty, - int cbps, int dx, int dy, + const int cbps, int dx, int dy, AVCodecContext *avctx) { int reslevelno, bandno, gbandno = 0, ret, i, j; From patchwork Sat Feb 17 20:05:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46313 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp458997pzb; Sat, 17 Feb 2024 12:03:41 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUtxnErvpvrEGxK1TZowJ+XUrwDUcWvd3NaY7degjLTBDvFmJqcUph+iPekhmLejNVTQhMI/f/4JrleDXz4MJs93kWTjixSWWns6w== X-Google-Smtp-Source: AGHT+IEaINuQAb60OHJUx12bcFh3dMtTkukvOaNRWe36FIGmNRcSgHRVs8R6PV6147icVOVLvDMy X-Received: by 2002:a17:906:578e:b0:a3e:3a7f:670c with SMTP id k14-20020a170906578e00b00a3e3a7f670cmr1021795ejq.14.1708200220867; Sat, 17 Feb 2024 12:03:40 -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 l20-20020a17090612d400b00a3d7973f695si1058380ejb.934.2024.02.17.12.03.40; Sat, 17 Feb 2024 12:03:40 -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=l3yq6atn; 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 B362A68D2FB; Sat, 17 Feb 2024 22:03:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2089.outbound.protection.outlook.com [40.92.59.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65BAA68D2F0 for ; Sat, 17 Feb 2024 22:03:25 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MRUNLeq2eIg5MhmtazDuZKrMTvHXr3ay/sNdGWxGP2dNCUJA3hPSxD8lUfH/BwoABN3GQf0LxaMY8cL7GV94EogG91QcsKzT693jbUgfMWLQ4N1EFF8CtR2EfEo9x092xRy8u4uB5qdMkQsN6c/8l0/bwf24XdbiCPperto1+OeQa3GjRl382q2s6BWo89sZ32VblOkX2Rpjvmor8hkyT6rGAQxBVzYmNuwtjUtmoR4Q+7HRiM69TxUZ9P8Pd8v9jatXGEt0lH/QIKKGneMOwSBsiobBu6IQiXXnJHYudCWcYjDhXL8NG2l/z8vtifK8AYSkHHSZ2PGjShwZjK9JDQ== 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=O0DcTaQl8BwkmvzXpUW0DgJi/kRjWUTHTTAuyeyxUno=; b=IxmTyoO8IiqyvaaVDT50Wp6+nsdniFUVLNADfbHSaguQQ4bIFzOo9IwE91mzriEAGyJYVPtmGZQdS5L09urwnxDdBoolCETrd/YQKzQYWuwnPZ5NI/ODw4SotCXIuTcFXUk7AEYczrY0pb60QwWpzowyQLsDiggOqKOOW5kuccSZ+1aVRLXCrdr54lwXIPYR19/YJgvk/9RIyj6iSbgtCa34r7w3llxp0wiTSQH37hTocYo2y8Mbiv446OMRa/E/5YmTPK11kdgatlJa+mUmlMBLCz2Z11ZGJq/jhFct+ZimxMCSeFmITC6WK7JsqUmXbUK0kSGqCxjheQCsKnOfpw== 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=O0DcTaQl8BwkmvzXpUW0DgJi/kRjWUTHTTAuyeyxUno=; b=l3yq6atn1+4AU1C3uW5il1Xs2aeQMeMe/2iCOVvgP7ukG1i8jPHlsW7+7sMCwDAZ2G0G+6L2i6WKJRjDfnoheHGkF51wkDFYxYpheV0dsL0Q2AgF3UBVcVlvMgzuD4zsmNIdQ25zRrgtmyjtuQmogC13FDtIr0FQuicANiYxAdQXaToBctLd3/gj+ymk10E7im8NJIQbawfBSZFP/CGwjKCXJTlGR0lM18YtWmmbwOnVbdTN+b78eii8BYsBsSyydOk1UAftV0Bj2hTxc9q3ZW0n0m9VhA7IgdXAz+ajpw/rIniBvfmsGgJX6EOdc96jqGxCXsSxwxU8DX8ziqSmMA== Received: from GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) by DU2P250MB0397.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.31; Sat, 17 Feb 2024 20:03:18 +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 20:03:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Feb 2024 21:05:03 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [F78kFqq3CDA53qx/NcLEbUQXR7+r7FN9vKbujyMtPds=] X-ClientProxiedBy: FR0P281CA0233.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b2::6) To GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) X-Microsoft-Original-Message-ID: <20240217200503.2524467-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0063:EE_|DU2P250MB0397:EE_ X-MS-Office365-Filtering-Correlation-Id: ef68d916-116d-4d8c-bb41-08dc2ff37bea X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WCh9GgfCtkAH+9Tb3DsTx/NxenUDas3yKDY7dShcxLRiNoS/hmSBPmVqfOZqUVYkDCKZfd1eDltrwDL/E7vXX6DxAqKsgS2xxI0ouSyyLYzzlfu21/O+wF4Ch+orGgMQVAUnU9MMEv0AQtkHSLsC5CCWHYD8qLSvhyOKz94LVzVrR/ZGTUj/YOXosw+oOLfDOtacVpIWb6bVFhfVx5H9UKesSSxop5uWYdmNEK/VafPOD4aRoQ8woVxNkQaHRnPWw2elFfd19DINSJcE3l59egktyo4FjziHk4pebOG7TA70Ldn5W9ukpf/+ve15HIk3RTYKyUzfuuRcc5/4/7APpAnVqayNZRK8amFoPo68bhbOAoNrQ4nXxpMuwsV3D8fQ/CiGN/IYqznwPGkQiTXBIEUGu5wXmfXxAYNyqk32n07V9fARsIiMYemAmCBhsOWDsu5AxG0Rgi+MBa2VdbXtvAhtEVisKs7SpbD7vk9bnnmDSXBEGYeiqI0sQVyixzQ6k0BBRl+4BmQZXCfMiJczwkwO2HbpYSDlHEoO5lorX61w/SmsMQWx5BrMZI2EJErJzmzg5zt2HzV6PScDzZxZng8nB7Ge8lLReYx4SciyH23wzWN5pOnYRfOU3/g1NuZO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Rf5Bf8uweNhtuNQz1a9DA3MpryFizOb8AqWq1eD5uvSCoQ5ByJvD1JGWYMs0CW/q4uvPipTZDvBtSb5BogHbhJ4/EZOrSsQh/SGUjwSks8VR7K2Wdt1gQrX1dhzqAa1uFLxL2AD7b8wfn9cueH65aohwzc0f3GwRlfOTl2aSJb08yuOvY2HnHBZT70dTKZTh6ReBp8dBvPzReh4gWkn70PjAMVzUpvvTJygsVNGtkFI3ynFbUA3J3y+81dgM7OpDG8gaUsdUxpkfumm95YxxsChQWHP0Hv4PCxBNpBi5VMeIart9fTMyFn7tDgvW5n2BxNeota0qQ8gNMNym7KMHAekzLCgNWMoOnD+eF7dyxyO5hVJQxUgG8oN+2dYdK2zOALbtJB4jvrb6hRUJ14+h7hF6UHL+GwyVxA9fe3MSodNto+T1Yry7UFZQLGJoa27gdCz+rfXSfYvm3V7r3iO+zJEUZiBKhzWEGtmHkw/nZtM1uiAbaJIKb6/JA/94uDyXlFudYIZpKOfpeU8hWkVmLyamEklAu3MGbl6QO+Gof0aIptzUGhzI62cHfD7oAA7x9EWQqBaEM429GaUXxA+xWT30NsZwyx7jIcsCzwu6kpiCZIVIgDfjYcen6bMnx8dhs2FMrFFzKtTZMptaua962jF7rqbN2TdrVg6+jZ9ceoX+pq1HXv2X+4zvrDMTa/QSAAzUlqjJOf3uVZBJ9i0bWa9PocN2AZTPz/jAuGneOpINcCArh3IyfQeQzMrL23yjh7W7PSy7SN92raITlaXX+kYFivfAk0wJ023TprdelfHHmTjUBvUZtMO4M0PJnjP8rIso7sQOotulWniAR7pUbo6TaaHgFCVz33XhXkPx9E3xsp5twe++bwBKsNmz7cAuGOBx/iJTAP7foiPS6uMN7Oh0uIZ/yXyjQRY71UZfhmcwLNdaN7c47rPbESxLN9fraiuMDgwxMDREH/j5J8JAF2cbYFszCXzapaRJtwRKKX6dQr69lekGa7IosCrVCs698Fdbb2kyitp+rrRfQjS51Ng/W9kIjwRMYjdRiTxdyeJVgr1C/HPrseS4EMpWU+hS7OrWxFoK09RnEP3COqNaTLUNG5yqEBVIh0vnTcqSdBdALvd0uIo98cGrQ+Tv7xxOZTzniaT6oHAN69lwkRJjNkByv4jAbxuXX5jf2zs8bfo2oEQC6a0x5/NgAGMvxRSEF/iQcj3BXrl2OFnDxZmCFYuXm+AB8ergyI76aXON9RwsbnXo2wMIQeWURrytobXW/LvItNtQgDjOnq72n6xvPA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef68d916-116d-4d8c-bb41-08dc2ff37bea X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2024 20:03:18.3608 (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: DU2P250MB0397 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/internal: Move ff_exp2fi() to aacsbr.c 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: CtQtyU81niKl Only used there. Signed-off-by: Andreas Rheinhardt --- libavcodec/aacsbr.c | 39 +++++++++++++++++++++++++++++---------- libavcodec/internal.h | 22 ---------------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index 683c079b91..da9e160a57 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -31,10 +31,10 @@ #include "sbr.h" #include "aacsbr.h" #include "aacsbrdata.h" -#include "internal.h" #include "aacps.h" #include "sbrdsp.h" #include "libavutil/internal.h" +#include "libavutil/intfloat.h" #include "libavutil/libm.h" #include "libavutil/avassert.h" #include "libavutil/mem_internal.h" @@ -47,6 +47,25 @@ #include "mips/aacsbr_mips.h" #endif /* ARCH_MIPS */ +/** + * 2^(x) for integer x + * @return correctly rounded float + */ +static av_always_inline float exp2fi(int x) { + /* Normal range */ + if (-126 <= x && x <= 128) + return av_int2float((x+127) << 23); + /* Too large */ + else if (x > 128) + return INFINITY; + /* Subnormal numbers */ + else if (x > -150) + return av_int2float(1 << (x+149)); + /* Negligibly small */ + else + return 0; +} + static void aacsbr_func_ptr_init(AACSBRContext *c); static void make_bands(int16_t* bands, int start, int stop, int num_bands) @@ -79,13 +98,13 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) for (k = 0; k < sbr->n[sbr->data[0].bs_freq_res[e]]; k++) { float temp1, temp2, fac; if (sbr->data[0].bs_amp_res) { - temp1 = ff_exp2fi(sbr->data[0].env_facs_q[e][k] + 7); - temp2 = ff_exp2fi(pan_offset - sbr->data[1].env_facs_q[e][k]); + temp1 = exp2fi(sbr->data[0].env_facs_q[e][k] + 7); + temp2 = exp2fi(pan_offset - sbr->data[1].env_facs_q[e][k]); } else { - temp1 = ff_exp2fi((sbr->data[0].env_facs_q[e][k]>>1) + 7) * + temp1 = exp2fi((sbr->data[0].env_facs_q[e][k]>>1) + 7) * exp2_tab[sbr->data[0].env_facs_q[e][k] & 1]; - temp2 = ff_exp2fi((pan_offset - sbr->data[1].env_facs_q[e][k])>>1) * + temp2 = exp2fi((pan_offset - sbr->data[1].env_facs_q[e][k])>>1) * exp2_tab[(pan_offset - sbr->data[1].env_facs_q[e][k]) & 1]; } if (temp1 > 1E20) { @@ -99,8 +118,8 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) } for (e = 1; e <= sbr->data[0].bs_num_noise; e++) { for (k = 0; k < sbr->n_q; k++) { - float temp1 = ff_exp2fi(NOISE_FLOOR_OFFSET - sbr->data[0].noise_facs_q[e][k] + 1); - float temp2 = ff_exp2fi(12 - sbr->data[1].noise_facs_q[e][k]); + float temp1 = exp2fi(NOISE_FLOOR_OFFSET - sbr->data[0].noise_facs_q[e][k] + 1); + float temp2 = exp2fi(12 - sbr->data[1].noise_facs_q[e][k]); float fac; av_assert0(temp1 <= 1E20); fac = temp1 / (1.0f + temp2); @@ -113,9 +132,9 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) for (e = 1; e <= sbr->data[ch].bs_num_env; e++) for (k = 0; k < sbr->n[sbr->data[ch].bs_freq_res[e]]; k++){ if (sbr->data[ch].bs_amp_res) - sbr->data[ch].env_facs[e][k] = ff_exp2fi(sbr->data[ch].env_facs_q[e][k] + 6); + sbr->data[ch].env_facs[e][k] = exp2fi(sbr->data[ch].env_facs_q[e][k] + 6); else - sbr->data[ch].env_facs[e][k] = ff_exp2fi((sbr->data[ch].env_facs_q[e][k]>>1) + 6) + sbr->data[ch].env_facs[e][k] = exp2fi((sbr->data[ch].env_facs_q[e][k]>>1) + 6) * exp2_tab[sbr->data[ch].env_facs_q[e][k] & 1]; if (sbr->data[ch].env_facs[e][k] > 1E20) { av_log(NULL, AV_LOG_ERROR, "envelope scalefactor overflow in dequant\n"); @@ -126,7 +145,7 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) for (e = 1; e <= sbr->data[ch].bs_num_noise; e++) for (k = 0; k < sbr->n_q; k++) sbr->data[ch].noise_facs[e][k] = - ff_exp2fi(NOISE_FLOOR_OFFSET - sbr->data[ch].noise_facs_q[e][k]); + exp2fi(NOISE_FLOOR_OFFSET - sbr->data[ch].noise_facs_q[e][k]); } } } diff --git a/libavcodec/internal.h b/libavcodec/internal.h index eb9e0d707c..04f7cebdcb 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -26,10 +26,7 @@ #include -#include "libavutil/buffer.h" #include "libavutil/channel_layout.h" -#include "libavutil/mathematics.h" -#include "libavutil/pixfmt.h" #include "avcodec.h" #include "config.h" @@ -157,25 +154,6 @@ int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b); unsigned int ff_toupper4(unsigned int x); -/** - * 2^(x) for integer x - * @return correctly rounded float - */ -static av_always_inline float ff_exp2fi(int x) { - /* Normal range */ - if (-126 <= x && x <= 128) - return av_int2float((x+127) << 23); - /* Too large */ - else if (x > 128) - return INFINITY; - /* Subnormal numbers */ - else if (x > -150) - return av_int2float(1 << (x+149)); - /* Negligibly small */ - else - return 0; -} - int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx); int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec);