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 14CE349ED1 for ; Sat, 15 Jun 2024 03:15:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7407768D60F; Sat, 15 Jun 2024 06:15:41 +0300 (EEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2090.outbound.protection.outlook.com [40.107.113.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A33068D607 for ; Sat, 15 Jun 2024 06:15:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NChrE41sHPavTKRYK1TIULacVzjWHx9WWOqVkJjRtSqeEoAuZwUDzc5fXuNxffd7/PZkCFJnOovjERUYKmFdek5dffxXNXIccBztRIgGCol61XxODe5rALOyTprCZzzdC7meli1QcnGCoyIRDKoAmvIyEE4Ry7tnw6FDeoIPRw+nFojJT/smk1Y92Qh2XAQv1UIcZ3vt3m+byp7BJjPB/rqjtYmwQY9Swsjf0ocoQbuVmrMHh/h2SI8z7hQbflBGeFrRXPRfkS0FzR2qFeMJKhQNTTax3POVcCEw3FRekNFUOZcArRLLDT9RMEn9lGSOcGrrX8K91hR9D3a21P2efg== 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=7Bp846cP6MvRokjZlwyDvVSJc5H9DsPUgW7M2xe7v4o=; b=QUNhCMrTvezrV8hq6UQDKw8WGnHPX31yZHSRH+nmlbJcMkdrdthsWHio2iwB/tuHZ9kRsQI0NxrqBYxG7CG8trCH1nIDfLHLKP++blRolE4jJJyRjMvbJQwp/fg/aH4yI4A7QQWey7Z6pS7zqwPnD6Ab6r07GtBAOhSDGO/aG3PXr2uhbLm4IrhRhu+VUP9ImywJQHpKAy7xfOgp7Gkcf2xIE0domDAbZhoSQQNRQNnhoBW/EGIUXEUTXV74+sw4Pk3zmAP09Bafy5cK8QxWGq3/KifYr0Sc65hcLRp7Jq7htqTo2r2P0kgjshpsOfH6k6HWOiJOWs/QMKK9LbbnQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=es.takushoku-u.ac.jp; dmarc=pass action=none header.from=es.takushoku-u.ac.jp; dkim=pass header.d=es.takushoku-u.ac.jp; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=takushoku.onmicrosoft.com; s=selector2-takushoku-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7Bp846cP6MvRokjZlwyDvVSJc5H9DsPUgW7M2xe7v4o=; b=ROps3eNLxXgrW2fW2ArcXpYmJt89qXbd+6dkQAjmO0pCqIwbzyie0nOUe/IS2rWpSmmVjWr86V9R2TnTFO3LZEl6mkl/a60HvRpRGIUyJqysrugaE+pW1tk9tV/jzdZG4DowW0Pgyk2gSlxyHin3WR12h9BDa0+WT4uwsNzSSgc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=es.takushoku-u.ac.jp; Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) by OS7PR01MB11518.jpnprd01.prod.outlook.com (2603:1096:604:243::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.27; Sat, 15 Jun 2024 03:15:25 +0000 Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc]) by OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc%6]) with mapi id 15.20.7677.027; Sat, 15 Jun 2024 03:15:25 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jun 2024 12:15:17 +0900 Message-Id: <20240615031517.148911-2-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240615031517.148911-1-owatanab@es.takushoku-u.ac.jp> References: <20240615031517.148911-1-owatanab@es.takushoku-u.ac.jp> X-ClientProxiedBy: TYCP286CA0083.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::11) To OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS0PR01MB6001:EE_|OS7PR01MB11518:EE_ X-MS-Office365-Filtering-Correlation-Id: 266c579f-1a1d-4bc4-585a-08dc8ce96611 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230037|376011|41320700010|366013|1800799021|52116011|38350700011; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jOSh1QLcFbG6UcNINk5R0QKznfubD+ytNO792dEt1NVV+gr7giZePmBAyTgj?= =?us-ascii?Q?viv97enP66Zzrk8WJInAtpIQbzW/2H6KbKivV/SDh80/hqO4nfWY1WsEcExZ?= =?us-ascii?Q?M1xfd7YfY7kAcnS1a/H1PHQgCaKOu7pC6Q2W5VjXsPGlO04TR2ViuxxzxxY+?= =?us-ascii?Q?6WknNOO7sBS9EtDxkwrwOiosz0qb/MaCS1HV6sNHnJOLMQ/1n4o8A3gfgVk7?= =?us-ascii?Q?9GjytFW6CrLqEsW9Epxn3/P1pmFnicjsHa2JoN5q4KfhHGfSmOJfktIWs12U?= =?us-ascii?Q?otywBpKMDmyYO3skzR59iBbYF6DrCz1MXm97tzkJo2Y/zdEPD/j/GwUS56rW?= =?us-ascii?Q?BlT6TTinfh9wcR3n3gPSW5IshsWjOVMTh3fVyGROoof5ItcP4Q4BbPIzVumy?= =?us-ascii?Q?QXi7TnbUTivNI+w2tqooGoiYdjt/hqLifsr0+Df7ocMz7E+96+Bi98fH7uqy?= =?us-ascii?Q?hbVR+/1q+h5KMj4GFXy0rlyDhMoFYnEp1q8efFOsiMh1etWY7KGH53hrRd2o?= =?us-ascii?Q?Xdlai9J2Nr+HW1XMOP0mMB+q9w3kCx6i9IjFlAi4rFS5+4YG+g+LM2LgotiM?= =?us-ascii?Q?LxOK4tX9pygvZ4+ayMTZMCZbOJZYXOkOnARFRdGbrBAieLVKObSkdSoP+RRs?= =?us-ascii?Q?WHez3yW160jbiMmXTxDJr3baN5T32iRgEW7GKq/lCm/iprt8h+JsN6e2MfPz?= =?us-ascii?Q?V+hb4rQbKM2fWFAQ/hE5oFh9s4RBr617EluseDRpgeRIrCyWjr2/E7lEKqUD?= =?us-ascii?Q?i4vk2944V+o+5ZLBuTBwvJws0ZPj/sYUUHOYn2py1y12tn6tG9t9nyZxA26Z?= =?us-ascii?Q?mVJFsrtBioe72iVb3zkmWLD1evZ31gKRYFiG0c/xCbdk4pGO9loRQf3o35tn?= =?us-ascii?Q?+BMpN27z8HXqCZmioqXCmazBmpqups5I+uaS2ZOI/N5d6hJPt0Unybg68xxz?= =?us-ascii?Q?rHfex8/t/05/4rmmZT3Boi8M2N9AppULAzPOW9HCMeJqEtdpYhArwQ9Fv2gk?= =?us-ascii?Q?gQsJHFDh+C3ZQU2jY+kNkVmTKBXti7z+ccBnEgn+83Ug/LRPreAOpQppFo2k?= =?us-ascii?Q?lTK6Sih+gLtGreBCdyipqJivDaF9pvP0ZKsN8H2UmjE5d1k0R7OIKuXckGoh?= =?us-ascii?Q?1vRzRohXjJkYBUZD7gUeY1CuGw4hZRBOWZtskMlpgymdAGAxKCBWwc2/KkZv?= =?us-ascii?Q?zIjP5dothKL6y9ZjVkP9oa/qcREbOx9S8zql1k7Ve7UxphyifnWIYxGmSsMA?= =?us-ascii?Q?os2qgItS2erk5oDpgCGwKZ6ZIhVjn4E/WphhTpVC85gXlFazbdCBj6CwRpxl?= =?us-ascii?Q?zP/8tF73CR4fdrgBQFVE6CP6?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS0PR01MB6001.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230037)(376011)(41320700010)(366013)(1800799021)(52116011)(38350700011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?N4M1mDlZKsy7ScmN399o/i3zIuX8g7YAV3ALDdmQYxwzbDDJoimaYvh1/a66?= =?us-ascii?Q?Xx9I2weXgA2E7HoqL1Ll08kbOx49r7fXRswG71hV40b3Z8DGsniwHMeuaB0x?= =?us-ascii?Q?WC8PiREUeKzhVYxlTm8icGu3OKl/VGK0J7xl2JF7Eh67OSDUa4nQouWnqwUL?= =?us-ascii?Q?JWHyAUgEd2VVIrwT6NC7jYh8Eq+3fMCeYO1/XJf0P5ic3pX5ba+w7TKHAaOI?= =?us-ascii?Q?jQCpqeYLIl2ofAQ0YLETQBQEspt4cfv6Axzy+xglAfIh7eMkMMHaR7jr5pKT?= =?us-ascii?Q?gWG9fZsWPd3zwMdC5R9aPOIp2nme9coKT1N6ohCoHuoF5zv/fl89A/J4uWVW?= =?us-ascii?Q?SvAYqadLG8alNEUkQKjZUeTYwOCoW0QGi0HqsPA/u0a1j+M/R9+qI+DafMbD?= =?us-ascii?Q?NpDhlixjgTm3RW/J44Ane9NL22IkbWAEGH0IOO3b7IgjRE3PcpHWX4Pv0caY?= =?us-ascii?Q?WMdhh5Lzm/0zh+g89ZHZU4Trf6o7BT1p2cstJ4P/LBuJoa96jZQVmUbe7jN8?= =?us-ascii?Q?wlH1VLU6IFXBKDHZTqfttAqXnMBInyeb6lUwyZ3F+TZfhi79oonZz+RtSJdA?= =?us-ascii?Q?KFQMvZguWtbVDJYA1l6FCZd7X3TydSbH4k2SqmliPMOJ7XUx3WNA2J4pgN9y?= =?us-ascii?Q?0YkAXg4u5M61h67CsxYww0FlTr3rgNUuzvt6fIO1+Vb1ZbNJIuKSogd9Ycks?= =?us-ascii?Q?1KVzw1Xy/P9Xek/Ner0Bg4eTsrksjQbLv52qpEymVzQtlF3TOaNfJM6VzFnu?= =?us-ascii?Q?RGnYAwvVWuu1rh0hp6D44U6x1EOjYqvvnJFbHINjNm0Ztd6TQCVaJe0fRcTh?= =?us-ascii?Q?caH4qNukd0935jYfstliMjJB4d7YiUTP5tNmqpjwYbwAWCxDVTqkoL551D/E?= =?us-ascii?Q?Ynr6e6lt5FVM+2jvfXs0hksztDjvJGdMHoSw7Hhe1WZmlYoIX0WeRHLWJEWr?= =?us-ascii?Q?p0FpNdRLpfJwMaCHHNsAioNkfcVI6NsyGwttlt8rG1RnZ966Ozey/CUobtlS?= =?us-ascii?Q?pWhdyTa7S2n9MwVEx7aQAukar92+vfQC/HGUWBC4VSBkkyAx5Kp6sLR0xCg0?= =?us-ascii?Q?G9y4h6eL3XATl7rFYaXOcaJ7PfP7e+U3zkhgjg0rDEmFvNClT1UxjuNcfouI?= =?us-ascii?Q?vOHPQl19004LlAc5TwkGsf6fsRmEZLw028ibBz9BqiGvuqKtF7n0a0dfvaQb?= =?us-ascii?Q?mgQsB8yvtnjJM6IYlRJQ8oli/JougaWxgBml7TNk/SJ6RrQvWzuyflgMwchN?= =?us-ascii?Q?SL/CoPlnQsBZe8e3EJ1OedMs6gYxt0tDsVUPr1spVJcJJ9INupwVkKvyj0kx?= =?us-ascii?Q?J+Tr8D9reLaL6dk52Oy+QUXVF5bwmg9FedLG8YzhaEP9jSsSTSw8aLvg8MJF?= =?us-ascii?Q?hpqzD0WUgnjVabzDoaBZrilYIHyH4WxrMzmCBhpGLgD+BGqHu6QsJtHcru70?= =?us-ascii?Q?qx2y39chKA3QxqKdpqbBD/c00TEMFbQK73mk3XOHbgsdYjOw8vO1mW0n3Wxo?= =?us-ascii?Q?N5nzimlsUHionOYq1XHYYVH44SMlgOJ9ptK9Llw2F8Lpvh5OzMqTagsUacbq?= =?us-ascii?Q?kU2skASL/vCJrkFc2uz2ad8l4HvMth0Cw7ZYuQDEx6U/KPJNaUkPfE46VMIF?= =?us-ascii?Q?nw=3D=3D?= X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 266c579f-1a1d-4bc4-585a-08dc8ce96611 X-MS-Exchange-CrossTenant-AuthSource: OS0PR01MB6001.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2024 03:15:25.8084 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 853333e5-13b1-4738-ae04-bfb589cf2665 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4PX+vny/nv+E0qOBH0tDmQ2iZxFGTxs3QLrmRMQ4fQLonWQz+MNkRp0xiCYzhNiDEUnpGK+Z+kOD2I8zbaXPmQxvf7MvRbMao9IK8jXJEJ4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB11518 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/jpeg2000dec: fix tilepart processing 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: Osamu Watanabe , pal@sandflow.com 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: This is the same as https://patchwork.ffmpeg.org/project/ffmpeg/patch/20240607002549.2259139-1-owatanab@es.takushoku-u.ac.jp/ Signed-off-by: Osamu Watanabe --- libavcodec/jpeg2000dec.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index d299c67cc7..395cf34bcd 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1097,6 +1097,7 @@ static inline void select_header(Jpeg2000DecoderContext *s, const Jpeg2000Tile * { s->g = tile->tile_part[*tp_index].header_tpg; if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) { + av_log(s->avctx, AV_LOG_WARNING, "Packet header bytes in PPM marker segment is too short.\n"); if (*tp_index < FF_ARRAY_ELEMS(tile->tile_part) - 1) { s->g = tile->tile_part[++(*tp_index)].tpg; } @@ -1106,10 +1107,18 @@ static inline void select_header(Jpeg2000DecoderContext *s, const Jpeg2000Tile * static inline void select_stream(Jpeg2000DecoderContext *s, const Jpeg2000Tile *tile, int *tp_index, const Jpeg2000CodingStyle *codsty) { + int32_t is_endof_tp; + s->g = tile->tile_part[*tp_index].tpg; - if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) { + is_endof_tp = bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8; + // Following while loop is necessary because a tilepart may include only SOD marker. + // Such a tilepart has neither packet header nor compressed data. + while (is_endof_tp) { if (*tp_index < FF_ARRAY_ELEMS(tile->tile_part) - 1) { s->g = tile->tile_part[++(*tp_index)].tpg; + is_endof_tp = bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8; + } else { + is_endof_tp = 0; } } if (codsty->csty & JPEG2000_CSTY_SOP) { -- 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".