From patchwork Mon Jun 24 06:19:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Osamu Watanabe X-Patchwork-Id: 50110 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1811787vqz; Sun, 23 Jun 2024 23:20:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWDPqu/wl2LjxCrR7SzFe60JAWK7QYpb6b44RzmGMPYua8OSiPybte07iz3SKamPPl3atTwhlXcHvpH4Ve6IvFT7ME4axdI1xu4wA== X-Google-Smtp-Source: AGHT+IFff97uT0CTclGx8qzqOA1iGq454GbhZ1wrVMj5HcMrkl0qur+usdBhZ/Jp51B7Zdd5NHqo X-Received: by 2002:a19:e056:0:b0:52c:d8e9:5d8b with SMTP id 2adb3069b0e04-52ce1835343mr1635920e87.25.1719210016678; Sun, 23 Jun 2024 23:20:16 -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 2adb3069b0e04-52cd63b46a9si1904917e87.56.2024.06.23.23.20.16; Sun, 23 Jun 2024 23:20:16 -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=vMnxyyQ0; 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 DCC5F68CE0E; Mon, 24 Jun 2024 09:20:11 +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-tycjpn01on2091.outbound.protection.outlook.com [40.107.114.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20FDA68D37C for ; Mon, 24 Jun 2024 09:20:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wum0JI7mAHm8Vx63Niyi+QU+kVpNkcA1HdFr0LU2VnBFTfkqVsXNHGsM4Y5Hmi9qEJJ1DiU2QQ7VCdqb1dRn4wi6NC3TZyvEf1bok6oUL0uRReQqmKI60RK2LyLd39tGHoX084wuwsjDD96DiiZo2cS7cWjOW0+oxCR6FYxFk1M+qdUa4oXFj0swO9HZb7+to6RmG78+uJbtk+ci14ZG4lzowXmzM/AUI2OPFGC2Xk4SVCUmEdh4Z8lyDzR63N5tjZR2Y1U5EB4+/TpHwocMXyOOOPFtHiRGrhdSLRoFZfMaTrJhcD99xXm11WJ3tzccyIC4RbKyVcbNFpUMGr5L4A== 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=BdymLZIvW0QKsYZzPVvGOzejWdHE0lxi3PTxN9fPFcM=; b=bhn588a419V7Nj+GoKyTP644LaU0iSAt0xCs+8kqcepzl4Y0odgfTCvij/2INKECMO0+MIXz4L/uGDgbHg4TgsWglvCLpOtjGF8j1vQNJ/w1PM1iG7oAjUqFMI3845/0FnKYrdo6y5MaSDWubXN8fXGdGJTu68/pr/SqvplAi3GFZ0sgC4KKfrN+3ht3L5etW57qPhvAfKmmiNH5rl+l8dNw6MOE60vxCycvkT5eGi0CLl0ubg5i0tsQuf3ozmXuTBseovyu+PRrzZ0960eELW15TbBILV1D5ZXffBZ1Nn1g8A1NgY2ZiDMymZj7vjXr+wL6nWKyWfXrTkoTjZC+bQ== 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=BdymLZIvW0QKsYZzPVvGOzejWdHE0lxi3PTxN9fPFcM=; b=vMnxyyQ0rklh4CpV0iPDVc3XjxnWBJ3eBzJbNgfZp94sLy2gkBWLNGfBrUwp9l27GHCnfmajY0nWf/O58MFAQ9YHlSkLclQqW7f8L/Xt4Zz7uFrjbJ09g2W+PmnrbwRo9AavL2oFzMe/AfR7CLnZKqf+rnKrAu8FHFaVtV6h1fo= 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 OS3PR01MB9317.jpnprd01.prod.outlook.com (2603:1096:604:1c7::11) 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 06:19:53 +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 06:19:53 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 15:19:45 +0900 Message-Id: <20240624061947.1354109-1-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TYWPR01CA0021.jpnprd01.prod.outlook.com (2603:1096:400:aa::8) To OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS0PR01MB6001:EE_|OS3PR01MB9317:EE_ X-MS-Office365-Filtering-Correlation-Id: acd53458-8ba9-4e89-0548-08dc9415a898 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: JcFcwZ9VZek/rWT2Vb+zJz6Z5JCK7ag+toACHvUaDaYcS3dlQypckjVusHXinl7zW4NP7WPMio0bOUpm70qL6/xuL24JrLYLk+1OR2YCu0If/xNdTTXVcs7BR9WTlPkqBsFl4CrgZjZ0mfXwskmjVc3jaO1E3ou063j2kEy9p8psW4jniLlP8QqQDjF5TWmFH/+xVFl8YLPbTOf+QMagyl+JVbU/w8BDEucwh0DzHLITqez7V7WSv9D2+imfujvdmRVX9dGRduxeTCYn7JmfDUBogFO32X1Dzb7WINRv6S1Tv9vHeZzHQaUMe9OdORxOR1LsYpCY13TppxYnlPCGc1AMwTG1R1K60tSRzivUdCWlnWXxkfHiY6zDWpQK+WbqBmBWBpJo3E2k9ZyG7ZEZ93SyAmwqo0B9VaBFpc1jLUvJZ30mNKt+xhfhU/yIFaL/EgQsultnRvhRd4B8fjWvtLoUAEZg8+4X+bRehSkNs4NuEgPBC2uCGgHAI4F8PWA5I1sBvWFZmDg1s4oklztb4fX9fpBRAKWQ+M88cCJIu9jUUgjDgqXuZkqQ3eY31syTWSU4O0A9OvRqFqfk3N57BgRZt+CHIsYuUeLN1E229ZiR0vdu0HQAekNpHM2SfPCOEwat1ZLg+ikqlnyq91mJBNU9IYoyJ+KkYA4B2eBdrQlU1VRohYbbzMhx6LV1WkcvPZLsUlqypaIi5sUCMdIdFfw6kqRIFqRauP+ma/cyy8xmeFHi2diI+M6zBf479hVH1QKRGovWQZ4ylbQ1umKPU8KMXlqej9zJt6cyRibIXa6nmkaN8VcB/4o683dBZOhKzIi5U34vlWHoXYphX2H2KyhFinKiZ7m4fFDt/zhH94JCakbhNCHyJS1V//65Dmj3OwLDRl9c5DMs66dJk2VakeffmUv30+DowDB9zDIGoGAGHWtWpmcN5lvFV9nhmSAFRjOLwTP5HYe7urEcCc8Y43VD+5ESptzizo9x/MR/NI0sv14ud86uLIqzHqzWoaTH9nk/t9j9hm5GvzF6CjQcpk/mddcDMezTsri/HphC1RP9X1tZddBZFIAIDflBm7lX3340rar3kaF+74qLxksxL0it72WkFR7qsFLwVANsilEIa/aopT/BaLvKUlmWcH1tM6eEGH7QXZjcY/HxFi16x+1AZLQUbZWXFYubQ39xJ3SCnbrlQALq3qr/3zUVk0m6mjRMnCDQ/+Xm3Qg4JqOhvGIDC7lPq2uLNFxTfOxReD16svkRBM0CiUQjzcMDiZuo0vli+p/SlhZxFHMJt2E4eD329cUEjDI7Bz34c9MgKx0C8n7tpuqESLaUauQt3mYnuIjranPij5rSqOCYdlrDfrsYDf7iSEYKV5Cn1LZNUF4= 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: Nq8ixHTeyD/uOkjRrg8+h4jvuQe7Gt2xn7Gn+mj6+AJNk3YL+eZOHtd5BpLYhZgy3k5CwPa5Pq0b1hrehy1udj02JKMdt4oxR+vznmtXjBwbeCierkrRZUHwSJiGSfUaFIynzTdb6/vHfNaRZ/24N6qFO86z2RSZfoWHbt7dI2nRR7imOkvVhRQMAYWS8E1MRe+fY87RUBtENrR/y/WRi6mOJZ8YKRUgo9BnSGlx81mAdDfTKlu+hg+ofr00kUj2c+/RASooiBnWFk0WCa1ZlbM5C4Y99j01rtGYy7EyNHP6GTlIXlRGkmDhkgyrTDNJhRtfkHM2KUl+5Ulqli8gYeA/5rpNM7m4cs95iNVmN7r4S8RlJ2J0rIPzSZfGK5O20UPj+JunNgO5PLd2oU0gCFYOkA/tPvRTadDWl58DYwohElTu3Yk6M+LlREibDrOh1KVIWe5lIw4DpmYjbBe69Ku2Ewfxk2AmzYHG7Kw9LRZpyhyKVfw236NGs0rhnZcS5cI6dvZTTUe/TSHjEhw52jUIPgHAZB4Yjlx+MfJaxtQ1QOQkDNtrourhfp/jFS16N/I4I7ILvmL68+smzlO+UHL0qFGKW5Ego9xDXUNyvAHCUQePYr+ldhRXGm8mGIUsGXcLu7qPPaWHzJkv6rZp9wYBUbmwOxthnUYDZ9n2Irn7K5sBWyUxv90mQVDLXmKb9RxlVkpAbHcjTxok6qkedNhFmHi7PJgXxwmMeWlFG4VADXAidoVwCErLnKzMi8C5OdvykXegWquz/cTY+6Q9ZPSOC/0rQ03wVDTbzFcj81shO+wXn0mxNc5tfKoHZqJUFigw4nc+ia6KhnxGFDaINUyAcjhszIaW0e5oDSbk8wU0aURhk+1g6lbl5iInBUIjkIh7RqKHRPACGrcxNMmJQMnR84kOhlV7AJc3NXun/So6o9y3SDiuTaTaRlIQCV7wiqN1P5pZkqqVs1vv6x+QOt2Z+XIV7u4Lc1SjFAR5Py0/Lg7Fs7NeGSPWZ9GkhmRCHpdewYFK6n2EVE2cHlPNZtWMXrO55zVuV/eu4UY8DCIOvFl2zSgiSjNjicjjYAMtShjdpOZ/fG1lISaE/s39E58KiWQaDnePlEjSAaIXM6fv4Mlmxo4xspA+ZX6QS+bO6DWOduQ0wMHxHiGGpAuv4J7kWN9f5+Eb0woUfU0JUZRc7WzB9jIUi+MePN86rVX9uHdzdiHDId3A287A+FW1FaELrEVPymVVyJvPCMwj48GvkFIiSY2y/6kJT8FjHdKwIk61ALK0gGkHoCU2bmEMKK8jyJaK2O9gts4JxR2S4QyVbs9/PrPLEw2kaYmphhWKpW9WNb9m8mgm8mMmtUH0FGumBWVvebkm5TDwJu1/Jg7c1dHpoZzPjj8I8VugGAmk8BxnRxD2qBGOAOFwpz729Bzywtxh58GbUPe1tY46MYX9wW+5oQGr2mAvVYt53gHGvdPG9Ace5dkdC0d0m2qQZ9YT19YyDo7liaRnupAImiyGOt8XU28EvdIx4JwP+7/TDs8qGvaIztqFzfIJd01QXq8Xaei9AzeO6TCfQdYScJ6F3brVAbTrc4qkVBqeepvVMUU8ehZbnfugtLA83j+1YQ== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: acd53458-8ba9-4e89-0548-08dc9415a898 X-MS-Exchange-CrossTenant-AuthSource: OS0PR01MB6001.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2024 06:19:53.4937 (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: Ei3ES8C45KD0fxfVhGNy5QJr8Lt4wi7RuoXC0EzBg1y4y2I4Mo4E/zF9UrwIK9V+2tfGmghGb0Wp/1NX/MF5g7yYxbdvRmL1gKirnPWuAk8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9317 Subject: [FFmpeg-devel] [PATCH v3 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: zUQZqSufgGQY This commit adds suuport for CAP and CPF markers 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;