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 A1CE34105E for ; Sun, 4 Aug 2024 05:27:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADFB968D6C3; Sun, 4 Aug 2024 08:27:24 +0300 (EEST) Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11020088.outbound.protection.outlook.com [52.101.228.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C5D268D5E6 for ; Sun, 4 Aug 2024 08:27:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u24P+GN2+CV9qhRc6DFCK7KRsDzpZBULUc7wis5zVxEBJRFFIQYP8LgkhiVqKjpUzPlrk9JfZr1pkRC/HaK3oV5u2vzXmsztOXQASnMZgJrl9n3qItiNoElMR8NF0+VxOq3X+mk0QWi8qFmF/KdRA6JkcapHYvf343KhVFYsLrkW3zrSEgkFAGUEDkFOIS+lsGsWT7b3mnLiuGMpJQqXxx2DQGzf8JhG1X0LhsmHPp9sZNEuFAvVUQVOFQMvG3V8YUMjVsl3+6FtBFZ6ozbwpXpi+oE9qZg3URJCQ13VnJiab0FOtkKykjVBoUsEqVKJGCrCvo78vbEFb0h8G2GAdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=yJKzhgvWxgwEhFw8eOwcDEt/H4RR+nZ46merwOuxWAc=; b=HenlkSos69auWz5nSLlR33FGAeNPNSDYSqS/Zzr6JLlAoSdkz5QNoWNBuBiXR2KLShUUKFjpVqU65dDtkCLnAPLN+qwvupeODQOXiQhCK7MEFvz8cMMfzZnDZZROATDLAlfTBjuuFpese9jbC1pKg8kfMXR8cxtT7IYgmBteeS4Fb3RWD9g8CbWcA3DWHS3YoIPk7wqJyBtS7cwMepmrjjbmJC84ciUzWec01yjUvDShATlt355oxzMhTuRxBCR2sYupxH8qL26GwdpqcqM2fhtFt2nn/HZvC0CzN2JndjgdvG+Gb2e2x/RUjwGP86ohpktteTwdaMUKJNi+M3ax7g== 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=yJKzhgvWxgwEhFw8eOwcDEt/H4RR+nZ46merwOuxWAc=; b=ZlgdpG5ErY9SYF5iRUO762e7AjcjnN06G53MluYri368dAWmNiSJz/pQOAddMuAEr9uHLP5JD0KoYmGuNEg5W3qsqcSJD9mWjNywlTaOAWbPNwJEt1urJxRruiLpbEny/sgAsKiNWu1iPdPb0YIxpQmKegQWBE/j4ayE627xZQA= 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 TY3PR01MB11348.jpnprd01.prod.outlook.com (2603:1096:400:3d0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.22; Sun, 4 Aug 2024 05:27:10 +0000 Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc]) by OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc%3]) with mapi id 15.20.7828.023; Sun, 4 Aug 2024 05:27:10 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Aug 2024 14:27:04 +0900 Message-Id: <20240804052706.292107-1-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TYCP286CA0266.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:455::19) To OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS0PR01MB6001:EE_|TY3PR01MB11348:EE_ X-MS-Office365-Filtering-Correlation-Id: 76a93cc6-a589-4aca-886f-08dcb4461648 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|41320700013|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?5PC7AFJbU6uDMhlWwyHSSp3DbXRJUhilXCdXEexcT+9FmFrNksE9SRDC51Zv?= =?us-ascii?Q?vnEUxeQBkkHEGzNbk4QBAfbdoiO9fhKtphFn7XAKRR3ZZ05NSnWFD1rl6PKE?= =?us-ascii?Q?+GDNsVXWDfLuUNu5e6/vZeA5AfynHJbXMOYaqpGwFyg48qyzLAWKoO6mOPlb?= =?us-ascii?Q?LIBXChYxKI+FmeSxRglTgVHekrO0DQ9MmNVG1o7Mx6T7z1sgP3oaUhdwp77Y?= =?us-ascii?Q?vZb9Pn1k3O6RbyyUKWE9YZAszsN3nJfiLjpVT+bhi5W3zf3MR35+/t4fyJWy?= =?us-ascii?Q?MxDO9vx0+WbdO61ZXTEZ/C1yO67y0WbtVBDGTGzsScv2ieZx/aP9IP3NLCAT?= =?us-ascii?Q?K92DGjFlDHstIzkloikh16Fw/GCF06TNL36+SDDkAH5OOKCPZUXPOKxXj7BA?= =?us-ascii?Q?hmrnmQr19GVQKN/lggs1EaOcMJmfCTm8wHgj+v0mfH43ttxlwSnq173KpKoN?= =?us-ascii?Q?BWZPiTxEBo2eiUjPGnHo2OX5LymcfYrxMbXphk9u+991JAJcRdRQoQx49DmO?= =?us-ascii?Q?cCyGby59DSHOI9WxsC7z2PSnpTqyta854i+KmC5lSwG1f7tcac/HufkutbGe?= =?us-ascii?Q?lFny1Lp9098ODLi1BYnaQj15qc/Ez56a+izwDHnfxQLtp9+mpwXRhFpBnTnd?= =?us-ascii?Q?CI+nNWSqDNWGN6yj3IdONMjIsie/t0NbbLt+UYgJ/v6zQRL9phKElU8IyKQO?= =?us-ascii?Q?Dv6hNlQuXcMGheTF3j4ysz/R0sfvqh6F2oqe73j29nACvpo1ZHbgtg9YIOMk?= =?us-ascii?Q?TqqJSJzIlQ7A+/XRiBgjh85tkVgpMALfiml3uVEPYeVlS4wOfWbSFvmLR5hf?= =?us-ascii?Q?d43YsDpKZ8SbMnPHO1RFGfeHtrgaxJhHGDQDRieBfYhGOspBdo+cDvPZayo+?= =?us-ascii?Q?CRi635sriBUotKJwpREzUAxjhYlg2pNEdTtWMZjaOEnchLC8fppnC9Mh2mbl?= =?us-ascii?Q?QN4pO8kjEMAhplIpt4ko3+nj5GexnIVRvbGiknfzaSwLETS6S8RYh9ggj7Qm?= =?us-ascii?Q?lt1DclzHI/8Eap114ohFk5bCi5PRTVT/as0kuaHiy8XfyQ05wKyay1sewvur?= =?us-ascii?Q?bV9OmiNO5t1Z+jcyNu5BSA16461L1NVO3hZW/YbvfWWd+qjSpZT64mnrC9fX?= =?us-ascii?Q?QcLU0XC/R6nbsh6PdVEpVE5T0gBX3wtVkpG4vWiC/vB8m4wZiIgj1jbC7a6c?= =?us-ascii?Q?8na92i7SYYCvRv9boF2Q9beRbg1qaVi1E1E4twPUmO+0j08Eu5SSAp95zE22?= =?us-ascii?Q?1i7VItIJqFNipo5/ro46zTKZNeY+HURniO5BqNq0IHxX0FZ3MhG+DWCoJGcl?= =?us-ascii?Q?i490riDqJ+WRdNpJQhYxuBsDX+NapSVA1GXJxXl3XT6hXQz387xUQPtp+RYN?= =?us-ascii?Q?rttV2lr8VE2dg5EhSkrr0h9viHqyV8ORwGekSFi1N9atHMGJFg=3D=3D?= 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:(13230040)(41320700013)(366016)(1800799024)(376014)(52116014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7rhO5gHrw1NYMCU1CjixzxzBH0kL6w9EPPVmvac+Qv6XyXnPacKLchnA6b5G?= =?us-ascii?Q?ESY0mCf9U+FgH7EEc1bNZLCTxYEPq3572/PR3OIePgve1CZOda2lx3FfksaI?= =?us-ascii?Q?MoHLaZWnW+hdqn36iAtPnGSX4n3y7fahGUhe/ICeMAIvCUD6PGw4kAoIEsA+?= =?us-ascii?Q?G3igQ4SfrlRiMCJJvWqokePwG7WVfYUyosRVEaBXGYNoWPvLVSRHygwktspE?= =?us-ascii?Q?GF95ZqbKlemXbD85wlUljntuP7HBpgORF8sE9sIHY4W9YrYXY4NqHFcrh01f?= =?us-ascii?Q?Mdz7hLAN7J/qnzEStYkgb7t1pv3AgfOUhgj5DbIBfwUnocZ+3TpUv3NLxkOX?= =?us-ascii?Q?26qr7Yu055z5hWo13N/dRzmHj7wmojZCbxDOPoftbsdgqNx1i8l7HrQSKYKO?= =?us-ascii?Q?KCKfmRsl59IUc/nP7SdUSEfuIygc9Gx+U/Laznw+rJ6LISuxJ4J3YMZVZmgJ?= =?us-ascii?Q?N0glZ9YrYuqsBKTLldoJuGt6eDM/mRfBlfRxG/qzOfQmP7ri1EDnnCPZoP56?= =?us-ascii?Q?WCkx16fTaUZ0Dpd/tqXPQYsoJHGYIny6j/P8GuFudbu3TI7Qbqf31IVZJ2jv?= =?us-ascii?Q?yIDwAyIC/OWwRxt1mrbZY3m5yFy7blj2rvJzFH7kL0NyCpYpjNwferGKZuYu?= =?us-ascii?Q?OmRK9sbUdwXy8wBsPDyq4sDz+ANxVxgzuDHOpKyfYiMN7WLbJZabpfG8NOe2?= =?us-ascii?Q?vIqoVMRsAL/Bj08+8URkaTyRD5zEtxccp6u30GBBjIGRccmc7wPU9QJ6GX0s?= =?us-ascii?Q?c+M9xkaMYXsPkjGevXy4xOkO8faueytvJeZx3ZM9H0dLL+iFHI0WUNTrJbFO?= =?us-ascii?Q?IwhldIdpxXjJ0b3nLytHiqY+SweMi3BGlXZETxgKEAL2cVu9Gd/TSxVygqA2?= =?us-ascii?Q?gdASqmGZOFGkkVtJS7+bIcMP0xekEP7jBBLHh9Rg1Uqs5c4hA+E8Y3sTyQ0A?= =?us-ascii?Q?wPhDx4aHDtpVuKrmnkHSFQsKrxRg6hIyIy0CFRzL747l0Dkl1eH1YLJ8HgYN?= =?us-ascii?Q?qsBn682pgsbuUkoka+eSwlg+HIJzcAGA/BzO40AeC3JxX8prvPIodwvqj79X?= =?us-ascii?Q?IbdBfdG8KiD3VzDNz0k2wgd+M9UPFzbRL1UB47qlnt+hqgqK2vHUnO+gXoQV?= =?us-ascii?Q?RHL9wfJbtBL0rTEEFheI/WJwBwXcHc/6RH2bKDaWoPrDNyxjDG6PBxXjKO6y?= =?us-ascii?Q?Ol1/pFNkEJjcJtXIfOIgRfST5D5XHDkTbmSCo5sVREI5htOBvLqrW35qzGPN?= =?us-ascii?Q?PntNgCsfUpkGCq3e6VLaZcD2w3KP47SMYSJhr7YLtK6R1yYrPL8w34vrPmAx?= =?us-ascii?Q?+SN+WT4aFU2Ko3n2KKBkyuVNgDUbjFdTF12w4PG6sa/SJLswOHI8sW+8CXv0?= =?us-ascii?Q?4Sy2NBRgd7XZEFqWdCvi4k3g2Dzz5DStThsPmYirqxOqSr0GLNpqGG7WHZEA?= =?us-ascii?Q?uRoakNE+paknHezgAHyMmeLk1VoneIhDcAut4VvS78I/OwWo5HDBbswqoX2k?= =?us-ascii?Q?YSR0PhdrGJrr7H+nkJp6VL/ZGCmMRk8TIQogiH4PYT6NIbgBhvneClzv5NMO?= =?us-ascii?Q?QOHk/Jozjjld/5rZP5p1ZxrQWHGjPmXoTd1l8sgvPNqBjTyyULCRuVjM53bl?= =?us-ascii?Q?0A=3D=3D?= X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 76a93cc6-a589-4aca-886f-08dcb4461648 X-MS-Exchange-CrossTenant-AuthSource: OS0PR01MB6001.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2024 05:27:10.5309 (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: t8PJ+LVOrXriWFtRCe7YFHCm1LQ4UimRb0Sf0bindbvS4H2Xmd2ggw80agEMozRKBeLyViD5mon+i6InUWNsctoQyZVjlCEIaIjoO1ZM7ok= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB11348 Subject: [FFmpeg-devel] [PATCH v7 1/3] avcodec/jpeg2000dec: Add support for CAP and CPF markers 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 commit adds support for CAP and CPF markers. Decoding will exit when encountering Ilegal input codestreams. The variable `Jpeg2000DecoderContext->HT_MAGB` has been changed to `HT_B` according to the definition in the spec (ISO/IEC 15444-15). Signed-off-by: Osamu Watanabe --- libavcodec/jpeg2000.h | 8 +++ libavcodec/jpeg2000dec.c | 128 ++++++++++++++++++++++++++++++++++++++- libavcodec/jpeg2000dec.h | 7 +++ 3 files changed, 142 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index d004c08f10..4bdc38df7c 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -37,12 +37,14 @@ enum Jpeg2000Markers { JPEG2000_SOC = 0xff4f, // start of codestream + JPEG2000_CAP = 0xff50, // extended capabilities JPEG2000_SIZ = 0xff51, // image and tile size JPEG2000_COD, // coding style default JPEG2000_COC, // coding style component JPEG2000_TLM = 0xff55, // tile-part length, main header JPEG2000_PLM = 0xff57, // packet length, main header JPEG2000_PLT, // packet length, tile-part header + JPEG2000_CPF, // corresponding profile JPEG2000_QCD = 0xff5c, // quantization default JPEG2000_QCC, // quantization component JPEG2000_RGN, // region of interest @@ -58,6 +60,12 @@ enum Jpeg2000Markers { JPEG2000_EOC = 0xffd9, // end of codestream }; +enum JPEG2000_Ccap15_b14_15_params { + HTJ2K_HTONLY = 0, // HTONLY, bit 14 and 15 are 0 + HTJ2K_HTDECLARED, // HTDECLARED, bit 14 = 1 and bit 15 = 0 + HTJ2K_MIXED = 3, // MIXED, bit 14 and 15 are 1 +}; + #define JPEG2000_SOP_FIXED_BYTES 0xFF910004 #define JPEG2000_SOP_BYTE_LENGTH 6 diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 091931b1ff..44db131d77 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -408,6 +408,73 @@ static int get_siz(Jpeg2000DecoderContext *s) s->avctx->bits_per_raw_sample = s->precision; return 0; } +/* get extended capabilities (CAP) marker segment */ +static int get_cap(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) +{ + uint32_t Pcap; + uint16_t Ccap_i[32] = { 0 }; + uint16_t Ccap_15; + uint8_t P; + + if (bytestream2_get_bytes_left(&s->g) < 6) { + av_log(s->avctx, AV_LOG_ERROR, "Insufficient space for CAP\n"); + return AVERROR_INVALIDDATA; + } + + Pcap = bytestream2_get_be32u(&s->g); + s->isHT = (Pcap >> (31 - (15 - 1))) & 1; + for (int i = 0; i < 32; i++) { + if ((Pcap >> (31 - i)) & 1) + Ccap_i[i] = bytestream2_get_be16u(&s->g); + } + Ccap_15 = Ccap_i[14]; + if (s->isHT == 1) { + av_log(s->avctx, AV_LOG_INFO, "This is an HTJ2K codestream.\n"); + // Bits 14-15 + switch ((Ccap_15 >> 14) & 0x3) { + case 0x3: + s->Ccap15_b14_15 = HTJ2K_MIXED; + break; + case 0x1: + s->Ccap15_b14_15 = HTJ2K_HTDECLARED; + break; + case 0x0: + s->Ccap15_b14_15 = HTJ2K_HTONLY; + break; + default: + av_log(s->avctx, AV_LOG_ERROR, "Unknown CCap value.\n"); + return AVERROR(EINVAL); + break; + } + // Bit 13 + if ((Ccap_15 >> 13) & 1) { + av_log(s->avctx, AV_LOG_ERROR, "MULTIHT set is not supported.\n"); + return AVERROR_PATCHWELCOME; + } + // Bit 12 + s->Ccap15_b12 = (Ccap_15 >> 12) & 1; + // Bit 11 + s->Ccap15_b11 = (Ccap_15 >> 11) & 1; + // Bit 5 + s->Ccap15_b05 = (Ccap_15 >> 5) & 1; + // Bit 0-4 + P = Ccap_15 & 0x1F; + if (!P) + s->HT_B = 8; + else if (P < 20) + s->HT_B = P + 8; + else if (P < 31) + s->HT_B = 4 * (P - 19) + 27; + else + s->HT_B = 74; + + if (s->HT_B > 31) { + av_log(s->avctx, AV_LOG_ERROR, "Available internal precision is exceeded (MAGB> 31).\n"); + return AVERROR_PATCHWELCOME; + } + } + return 0; +} /* get common part for COD and COC segments */ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) @@ -802,6 +869,15 @@ static int read_crg(Jpeg2000DecoderContext *s, int n) bytestream2_skip(&s->g, n - 2); return 0; } + +static int read_cpf(Jpeg2000DecoderContext *s, int n) +{ + if (bytestream2_get_bytes_left(&s->g) < (n - 2)) + return AVERROR_INVALIDDATA; + bytestream2_skip(&s->g, n - 2); + return 0; +} + /* Tile-part lengths: see ISO 15444-1:2002, section A.7.1 * Used to know the number of tile parts and lengths. * There may be multiple TLMs in the header. @@ -965,6 +1041,14 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno) comp->roi_shift = s->roi_shift[compno]; if (!codsty->init) return AVERROR_INVALIDDATA; + if (s->isHT && (!s->Ccap15_b05) && (!codsty->transform)) { + av_log(s->avctx, AV_LOG_ERROR, "Transformation = 0 (lossy DWT) is found in HTREV HT set\n"); + return AVERROR_INVALIDDATA; + } + if (s->isHT && s->Ccap15_b14_15 != (codsty->cblk_style >> 6) && s->Ccap15_b14_15 != HTJ2K_HTONLY) { + av_log(s->avctx, AV_LOG_ERROR, "SPcod/SPcoc value does not match bit 14-15 values of Ccap15\n"); + return AVERROR_INVALIDDATA; + } if (ret = ff_jpeg2000_init_component(comp, codsty, qntsty, s->cbps[compno], s->cdx[compno], s->cdy[compno], s->avctx)) @@ -2187,22 +2271,57 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) if (!s->tile) s->numXtiles = s->numYtiles = 0; break; + case JPEG2000_CAP: + if (!s->ncomponents) { + av_log(s->avctx, AV_LOG_ERROR, "CAP marker segment shall come after SIZ\n"); + return AVERROR_INVALIDDATA; + } + ret = get_cap(s, codsty); + break; case JPEG2000_COC: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + av_log(s->avctx, AV_LOG_ERROR, "COC marker is found in HOMOGENEOUS HT set\n"); + return AVERROR_INVALIDDATA; + } ret = get_coc(s, codsty, properties); break; case JPEG2000_COD: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + av_log(s->avctx, AV_LOG_ERROR, "COD marker is found in HOMOGENEOUS HT set\n"); + return AVERROR_INVALIDDATA; + } ret = get_cod(s, codsty, properties); break; case JPEG2000_RGN: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + av_log(s->avctx, AV_LOG_ERROR, "RGB marker is found in HOMOGENEOUS HT set\n"); + return AVERROR_INVALIDDATA; + } ret = get_rgn(s, len); + if ((!s->Ccap15_b12) && s->isHT) { + av_log(s->avctx, AV_LOG_ERROR, "RGN marker is found in RGNFREE HT set\n"); + return AVERROR_INVALIDDATA; + } break; case JPEG2000_QCC: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + av_log(s->avctx, AV_LOG_ERROR, "QCC marker is found in HOMOGENEOUS HT set\n"); + return AVERROR_INVALIDDATA; + } ret = get_qcc(s, len, qntsty, properties); break; case JPEG2000_QCD: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + av_log(s->avctx, AV_LOG_ERROR, "QCD marker is found in HOMOGENEOUS HT set\n"); + return AVERROR_INVALIDDATA; + } ret = get_qcd(s, len, qntsty, properties); break; case JPEG2000_POC: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + av_log(s->avctx, AV_LOG_ERROR, "POC marker is found in HOMOGENEOUS HT set\n"); + return AVERROR_INVALIDDATA; + } ret = get_poc(s, len, poc); break; case JPEG2000_SOT: @@ -2252,9 +2371,16 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) "Cannot have both PPT and PPM marker.\n"); return AVERROR_INVALIDDATA; } - + if ((!s->Ccap15_b11) && s->isHT) { + av_log(s->avctx, AV_LOG_ERROR, "PPT marker is found in HOMOGENEOUS HT set\n"); + return AVERROR_INVALIDDATA; + } ret = get_ppt(s, len); break; + case JPEG2000_CPF: + // Corresponding profile marker + ret = read_cpf(s, len); + break; default: av_log(s->avctx, AV_LOG_ERROR, "unsupported marker 0x%.4"PRIX16" at pos 0x%X\n", diff --git a/libavcodec/jpeg2000dec.h b/libavcodec/jpeg2000dec.h index d0ca6e7a79..166cce9eba 100644 --- a/libavcodec/jpeg2000dec.h +++ b/libavcodec/jpeg2000dec.h @@ -112,6 +112,13 @@ typedef struct Jpeg2000DecoderContext { Jpeg2000Tile *tile; Jpeg2000DSPContext dsp; + uint8_t isHT; // HTJ2K? + uint8_t Ccap15_b14_15; // HTONLY(= 0) or HTDECLARED(= 1) or MIXED(= 3) ? + uint8_t Ccap15_b12; // RGNFREE(= 0) or RGN(= 1)? + uint8_t Ccap15_b11; // HOMOGENEOUS(= 0) or HETEROGENEOUS(= 1) ? + uint8_t Ccap15_b05; // HTREV(= 0) or HTIRV(= 1) ? + uint8_t HT_B; // MAGB value + /*options parameters*/ int reduction_factor; } Jpeg2000DecoderContext; -- 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".