From patchwork Mon Jun 24 13:37:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Osamu Watanabe X-Patchwork-Id: 50126 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2015536vqz; Mon, 24 Jun 2024 06:37:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVHAn3W5ip8leeIdl+m/e3su+eTa+Vaw0dhoaLfWnP/+RGqoQ4p1P68vLxxTGaBvAQMVNVhQZman7uuc/ODT8cvWsa00Bx5E7r93w== X-Google-Smtp-Source: AGHT+IFic+TFHY1FKWIuL6kQ1RV6607Ni2fsAwMMolyT4k+V1LaL2CvSGPGcZG+3yX+jeMdAuOAk X-Received: by 2002:a2e:a411:0:b0:2ec:543f:6018 with SMTP id 38308e7fff4ca-2ec5b345e77mr27306901fa.25.1719236279529; Mon, 24 Jun 2024 06:37:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ec4d76f61fsi20744471fa.461.2024.06.24.06.37.59; Mon, 24 Jun 2024 06:37:59 -0700 (PDT) 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=@takushoku.onmicrosoft.com header.s=selector2-takushoku-onmicrosoft-com header.b=MEZ+FG2t; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 71E21680276; Mon, 24 Jun 2024 16:37:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2123.outbound.protection.outlook.com [40.107.114.123]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A76A8680276 for ; Mon, 24 Jun 2024 16:37:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pd2Zw/RH6D5JfqN2SC3lctEaeo6BivS8zC6eiwV3oNzyonyVeCaikdzazt89ZimI4QOrodkOL1i8ZCjoyJXvaLMxX1YhX8stfiQqpKq9eJBq9KJUcQoLVt2j3LoKkkjxdS+4Jkcq/jvad62fXSY2GbDaZKX34SvjjfVyFGYsGYIA5OAEr2JHjp6tdILZN39XzdhiZ3WTvHrR89DqsIlUqyyK9fp3/8sna3Au47vDXkuPClYPHFEjFjS9hRJoipczd5TT6ZYnBRtM7jQTWXPCgKKOjFa4DsH18P70r/AIqO8hQLRqWgYnDBYqnyxXpa+ILUQMapA6q69ByUyXy92rgg== 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=TyoDZXpZgRk4RBDjWueK3jgg2S92wNQX2tVkXeumGlI=; b=iiAF7mPWcJzFg+lBnPq+SLxo4CM0HTef4zvg3RKFOqZk19OdCvmaIMmCd2iyLdmGMiyVZviKnGatN8gNNqCgnZtfbkymf/WpSwA66sP6rpQEhpGsGnuS+Nmc1hHYR/iT8WunsrKBP6nZ6DdDoAUjYu0YrNlbVhQveGGZT6RPjffETttpzHUdDdwzTr4I/N5iRS7QkHaIAAMxJukAuyzXlzePsF5awps2D/AHblWFDrLq+LDLnhuNk8Cl7Ar6mzNgkmFll+hBEAZgmq4WACZQv7cye7iH+XZB9hiUzvBSF994uswJI0vgldbBZdARfYF/Lal3HfLuHJYlkcWR7rljDQ== 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=TyoDZXpZgRk4RBDjWueK3jgg2S92wNQX2tVkXeumGlI=; b=MEZ+FG2tW9vkeO0UYNygONam+lKsr0yFQZY69y0GGvszfOS2ByirxDBejI1MLwArLq6BJ79JvL3iS1lgl26vzz+9pHiW1mvOSEx4Jsb39dJval2ky2rkNlPGa3yZddijRCEzyzF8gSzYLozHO/7mJj1IOeQpC7fUm6uHc+pe5j0= 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 OS3PR01MB9396.jpnprd01.prod.outlook.com (2603:1096:604:1cc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.28; Mon, 24 Jun 2024 13:37:40 +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.7698.025; Mon, 24 Jun 2024 13:37:40 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 22:37:32 +0900 Message-Id: <20240624133734.3032409-1-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TYCP286CA0087.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::18) To OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS0PR01MB6001:EE_|OS3PR01MB9396:EE_ X-MS-Office365-Filtering-Correlation-Id: fbafb634-19ed-4a34-8a4d-08dc9452d0aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230037|376011|41320700010|366013|52116011|1800799021|38350700011; X-Microsoft-Antispam-Message-Info: ng858m1eiP3JPS1PxdF4eDobnjtuOiiS0coJbSVLnOBIxZxqOEKwReGcHXew9776mFZePbrXKvhRFg/Vnk8njHqveNCovJzOsdIQEKZFDkw3UZpWenr+6cPYVDxbOc7JEKD45IgOXQ26axoMvDEzb9kX+UUwOQGA+APnigt3sMC9ng7MHZZb6aUJCgXZlZ3c5nAHXH8YJMutt7LBRY5ihSsnd0ej/avyXiDdPaiU00f1qxevskVnOQTaYTjY7OtfnfxsJ/O1ICTumkVkcdtKhqPlIkNDLpV6n6Yr8ThGY+wx1C5vs/mjctPTwi+UuGy/PFdxHKx3OUvHU1L75Zi3NnI2QU5YF6Elxr3W0xB9nbsypgzu8Xk/wTK3a3+FR9+mQW/8AqOV9Ab0WsolXYqTd1mkhLYvNJ/NN4inMAoBitRhcLHXQG+8JWXwhxOuq1DSLfUku9gef9M8Dc0gw9/X0EIW82b62IvnlgLGpYu9NSZpiiAxu6vU+UuyWYozFyzBckbLvAuzlk8ZRU/h8kUCQVeGIa2740wZvO62HwOsyjQyqjrgfnG3F2Ma32Am3VYlogrtqdBPWYLK1qicmPJcTtVciVFoorkDu/mw9B0+trlOMg5xy9u5e7ecDuw+lgtnrwt3vfXED8+DYJN1ncVFZ2g/JcQogsUW/+A09RwXm02ApLk+Ro2X+CFsspGqQxEC2Ssu7SDbvV0dX05xdLMMi6dMfjS6QbIAEHKRHVnR4owq/DcDFO9MZfNJDQ0rr6S8JW+zI68AZb6NQ4iJCCbp0P5m6HJlq9klsT6wwOCIIWsAY3FldqsDOGvzGrwddJ4yOV71Pj2Xyc4kKMQGAdKbTDt/UMmhad5EAVuIgo1tx0oskn5mqJLh/qxqS/BGV/AF2yOMWyRtJOwvLhv6HoouhNljcJdpQ0EJnBFt1LRLShwW7FnSuDyWzw7AawONnlZx/OnknIBDgfOz1YqkEHbrKpd6FIh9YvohNHrzRjdcG82UL/WUdyrZj7mHA0x7nDjyslP5ilxvFOqUgpuUo4Z8oWIxaAY5AlXpxPH1rydXgj4GhffmL4c5SRNwgH60p4UGBcerR9v/cTxUQLkMysc6eoKd6B9tBLjFFGiIlvJWkvXpeRpqxs5i6M56CQ5d/1/0F8slPnjoDkh5klFG5qhl788MOAeXWOCiPryExsF5R0eRKs8NrIIC/kBRVXdX0x1N9X48IpLSLbdJTSZ8/d56ORAfYruYrNVZA8r5cYStKKQ0Lsk1PtBL/3rHBAGy+O1FaHz1jgz5mTDttUsCIkmJ2AlPJB4WBGIBW4Ouw/ykWjI6GN/NGi8E/OsraC/UborU 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)(52116011)(1800799021)(38350700011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yb64BEisjshyJCbGi3bNQX3Q6HMY84rK/JgM0STirURWdDQ9PDeHEfSI9gTI5InAdK+Im+pHP+76KSvoQ7Px/mWs7GaiRcTzw+EMWbzLzA18GH+Wjb9t6kchtTVc3VPwmC8abgO1P/uCIVnig4AX4Bkxad7Kuj4aHH0U4kMjMXY1o4nN+zsRxEEWt/18f1XjRUdK5utfkfKieCzbO4lpLQOlaRyH2kHehvL5GE+k1pVQplTWqkqWkZUZgZmYqTVAxdiC9O/TkB5d+hKrENAfQ9R0Na8LPfI9Frw0AtWX+EINrGw6bIZ9zifZbLYEGD+Mcw87s4BPnhaab1ZmF8I34aeJVB3HpAi7BTCWzZm8OBYWnWnWXGPj+iwPhe/fWNXABI5uRMs0WOBW58UIy4FnR89hKt0YBfOuS6q0Bgff2E02jAImHtYul0oyK+MDxFJ2+4D4K60k64Ydjo6+0eU0uFT9USr+DKGikipPSMsdnhXRXkBOYKOBqyXz6WduExxcQAghi/Y/rVF7AreTRxA6Erkroi7utKmghJxggcKBCBDJM4OR+tL60NwT0V9Y7e44lJZTQQ6V6gMx0eSs1mlg4tICD+mHiXnnnp/K8d/3KTJQFxB0EDSlIrpHH8Pgk8mwUKpaBlGyyoB+NVsC+f3cu4k0CdMxLCQJo4xDW5McxsB/me5Qy1KC7Sg+LtrlgI0TdoXVUcIs932l7bK9Cootr2vjVjHQh1KhqZWgxDDY3O0/hlcRvKV0lvW+M+OcShshkEJtvW4Xt8euDZwN141RQ/YTh/bRePPBXpukGyNXky8LQtpIdT+XktOxTpc6HmuJQV0kXqHony7jvZeLGc3OH2t7mJItQWXIlXU6u+Dvnzye4UHKTZuwFqzcdj0CPvMsLlFWfThJdbdGyOvlpfNziVvWQUFl6sUNUxYF2YIn0twEeuKwMRLKELVKN+64SVnQ5FLneVQrEK+RAE+fh5gbK0pDaINoYWettjUGvIMOtJaZzqLLshGvMAnDlsoBcSxqpoXN55UuvC/FV06Jn4MQmKOJQOQ3oKsiJDsNwv3qBIRyT8Hn+9FSvU4rSYSyUpBaKUWQGUI1vZzUJP+5zvxgy9RnE/LDScjhmZupBZsMN/VfH0E4XAEre7ktZpCPPgvMFLlDyWcgMuVLDy3TUQaLFGkiwDW3EKVqiuzFwa/UobpiNNvwz+vC9NMaDveBF6ZWatd/S6bj1gaqcK8a31z7lrtyu5doPKYdb/sY1bsgRNPnaC8qCmKW6GmtJ/hKJdE5/B54sDvfzrabWieF0mApr5gvUgoVrbkU4JsrItGcUOlqsJPq3tXW79sxj/70lj4D9h1eKFHnMCDLd5nkf8bws3n4FLf3/o14nH53gY91Oc9Vv7tTftIThwyiPhESQ989Ncu91ZW6w3Lbp6wxkEEVg/+PCgT/OUc3A3pOJ94fTa9kAqWzA8RpfWfhC/ivLB7bXl80P2pQ3OaR8szck/1YdLSEBnLvNcQH9knniBqHcw17Rb29MPClgXIIonN00nZyISBdpFmyh0Eb7iLJqkZsOMHKo1B+YkEUjMbGvVMFsFIr0Uf+UtsyEhW52OAM7LURr70Wb3Ryk3JCisCQiprHOw== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: fbafb634-19ed-4a34-8a4d-08dc9452d0aa X-MS-Exchange-CrossTenant-AuthSource: OS0PR01MB6001.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2024 13:37:40.0041 (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: uJnkYMxiabDNrHia0VrhJg8ts1Z6xGVop4dsTN0UZwpIBRlBancUoiPq4T9hL27gLgXe6+3IKlWz5WNpkQAsLzEo7/kIAu/pz27rEXrY+Xk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9396 Subject: [FFmpeg-devel] [PATCH v4 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DRZ75pH7LjT5 This commit adds support for CAP and CPF markers. The previous version (v3, https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=12246) was wrongly separated. I have fixed the way to separation. The changes are essentially the same as v2 (https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=12199). The suggested modifications have been made according to the discussion on this mailing list. Signed-off-by: Osamu Watanabe --- libavcodec/jpeg2000.h | 8 +++ libavcodec/jpeg2000dec.c | 112 ++++++++++++++++++++++++++++++++++++++- libavcodec/jpeg2000dec.h | 7 +++ 3 files changed, 126 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..d1046661c4 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_MAGB = 8; + else if (P < 20) + s->HT_MAGB = P + 8; + else if (P < 31) + s->HT_MAGB = 4 * (P - 19) + 27; + else + s->HT_MAGB = 74; + + if (s->HT_MAGB > 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,43 @@ 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_WARNING, "COC marker is found in HOMOGENEOUS HT set\n"); 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_WARNING, "COD marker is found in HOMOGENEOUS HT set\n"); 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_WARNING, "RGB marker is found in HOMOGENEOUS HT set\n"); ret = get_rgn(s, len); + if ((!s->Ccap15_b12) && s->isHT) + av_log(s->avctx, AV_LOG_WARNING, "RGN marker is found in RGNFREE HT set\n"); break; case JPEG2000_QCC: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) + av_log(s->avctx, AV_LOG_WARNING, "QCC marker is found in HOMOGENEOUS HT set\n"); 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_WARNING, "QCD marker is found in HOMOGENEOUS HT set\n"); 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_WARNING, "POC marker is found in HOMOGENEOUS HT set\n"); ret = get_poc(s, len, poc); break; case JPEG2000_SOT: @@ -2252,9 +2357,14 @@ 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_WARNING, "PPT marker is found in HOMOGENEOUS HT set\n"); 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..326a572722 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_MAGB; // MAGB value + /*options parameters*/ int reduction_factor; } Jpeg2000DecoderContext;