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; }