From patchwork Wed Aug 7 03:48:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WATANABE Osamu X-Patchwork-Id: 50920 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d7b2:0:b0:489:2eb3:e4c4 with SMTP id dc18csp129189vqb; Tue, 6 Aug 2024 20:49:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVi4pTzrGNRNzCF/SwQkAfoBl8wItb8OE86QVO9pvlBW0DcRcILfZxDdFm+jntFyeL8QKz1ugeGnXvIHeAYyq3cngyhmdtcofSqyw== X-Google-Smtp-Source: AGHT+IGq2MPQIvZto8d2Dcx/kjAgHiywYzJGbTJ5lDoazghlzlhM8BOs9+NB8umH4DREnD4N+igo X-Received: by 2002:a05:6512:3f0d:b0:52c:9421:2739 with SMTP id 2adb3069b0e04-530bb366816mr10413816e87.9.1723002548313; Tue, 06 Aug 2024 20:49:08 -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 a640c23a62f3a-a7dc9c169a4si636168066b.236.2024.08.06.20.49.07; Tue, 06 Aug 2024 20:49:08 -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="px+h/bGG"; 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 E43A168DAD2; Wed, 7 Aug 2024 06:49:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11020077.outbound.protection.outlook.com [52.101.228.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A570968D9C9 for ; Wed, 7 Aug 2024 06:48:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P00TQN8fESdhSUUcC6abRbI2c9wmmrib20BuqxyngSEkSr0cm0ybQJCD3WTxZOX3ABA3l5FhkKeF4g/dXmiXHrf5KCpmeY7IRoih1EEv5xF++qPy/3ySDTv8CnyinFo/7nkTqfYG0wWId0Qev8kNIT0Q7aSDFGfDDG6MYdE1cDYNMEyB2ZH49SyUkcoIQLuNsxsVVUjs5UaE9pGyip37FxxckEFo1dswjoBqIRf5d4QtX2WlaIrEzGa9TYF9vb59aFGmmr4G4f4eSwOSQjg5Y7tBkP9KypEWcSqTqYgu38J9ZYzOixpoUr+Jcj5FT69H18JfN8Ih93L1UBlkqJt74A== 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=NT0Z5c3UVQHpuTDQzAT9yMGDRrgWTYK5400zKlNJIVU=; b=P1137uCywCCvPHI5PJ3QBvXOFOdnB3o3tVRwnydMSdVlHwZ3OhcwcFC6wpJdxagsE5dVAQ0/NDeYTf9/YLp6peoBDAEvc52Ookk/rvcqNBFYypzjBvGyHMGKxksELWOUGJ05pEMyErqui/Xvvj7ONeuWmYtxTgjf7J9gUo9gyUQG4QgP4PtRXjNudf3AJ1PX8WySDvDvyOPtC2WkUTPG1YMUlUB222g3QJQDi7HYmsNwVtek50NGPRPVXYwxHE4Ja80yKBcvL8jCBawzBcum0203xyx+zdx22OTPgb/nHM0inSfS7GuFdVuoRRy3C/OOfisqSPs4kGaaRyE2Grbjkw== 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=NT0Z5c3UVQHpuTDQzAT9yMGDRrgWTYK5400zKlNJIVU=; b=px+h/bGGj6JZ3S0gtpttWoh5dbLt+IppjOkjvB224XvE1TMFB4H5ndupZvCUIFoE/gctm1LbdEvhRSrKDJr6nnevx9RjyQS2gAGVynaNCiPHHrb2vwA9qD445O/Fkkb7Y65plXd+dIgw83DPSAFHmVfYpKkUGOGmgbNrVJgCZwQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=es.takushoku-u.ac.jp; Received: from TYCPR01MB6016.jpnprd01.prod.outlook.com (2603:1096:400:4c::12) by OSCPR01MB12849.jpnprd01.prod.outlook.com (2603:1096:604:337::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.13; Wed, 7 Aug 2024 03:48:50 +0000 Received: from TYCPR01MB6016.jpnprd01.prod.outlook.com ([fe80::32fe:be82:2878:fc7c]) by TYCPR01MB6016.jpnprd01.prod.outlook.com ([fe80::32fe:be82:2878:fc7c%7]) with mapi id 15.20.7849.008; Wed, 7 Aug 2024 03:48:50 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Aug 2024 12:48:43 +0900 Message-Id: <20240807034845.363526-1-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TY2PR02CA0010.apcprd02.prod.outlook.com (2603:1096:404:56::22) To TYCPR01MB6016.jpnprd01.prod.outlook.com (2603:1096:400:4c::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB6016:EE_|OSCPR01MB12849:EE_ X-MS-Office365-Filtering-Correlation-Id: 4aa6ecc2-6aa1-4a2d-6476-08dcb693d893 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: D57C3NFlCIuJ2Z2LsRCScp7YVJps3inbWFgHMdcqvnYJAljCuaBhyqx3VrnYTrf7DwJxgC9gkyjF3jwtGVMvKRl+faN81P43nq1jVnZ2Jch06CwXfLfTag8OOyzWB5Z34smTaHsd2dwBeBvAPmanoEMtkhNZ9ZJ+qYSV4J/x3ymdQQDSwFum1OcqJLmHtYfmltX6o4KyRiiDs7S+rKDfnlss5xWaQuzZO3ZAyk06ttiMbJmxpnQg8RMw9sOnlexAuz/4px52Bf3CKwF8HKM9PhWe1IGCjoml8Rlz5i9DMZe8lkO6kN4t8IGchNaE4w1xgzkv9kaZXS/1ltlB6hU3GEbh3RZbv+1OYvMbDn62uIVy5prM8DOmE94uAJJAn+MMl+tX7wGJZj+7Brc+4tYLoINcx6thnArLML6h1YYnRZJDi7Huf6q5u1ImD3h/AvEBXlid/5dFoCjHwJHg3UT4WlysnAcqAV9+8yOWF0rkTAf0PobjG+8MTmC7H469K+/iFBiaDCtRYkCpVggUgNxTWcY6M2xrga1Ep4KEBLYZrVdDRolvI1BrRdgRD7pnBcJ0yf7R0Bm6J57+pGdfRQxaU7n7GsYhtQMh+S3JwRLssRYlhRcRL5Eif98XTasFpZwheANy8UGbt9D9zT9kOizOKPhVWgRjXk5lqr/DUuKfkVBAr4fPwjps8d/gPTG8/TUrHg2KcRN9hAYntUXCSRh+fLTEiBUXMOZjiEbzkUa//hf1nakTM2G38ksvcVzJCPuFSeN6XB38LVEGITYFpFDMLH6tzmjRdxmWN3NQCK6ZwnCuVIPufyVbNtut776OlYrqQ8eIzB4o+ezC5vmCTnkE5PEO+ozRWMoDGI29RpFcEGk2pc+8pKP9OoO2eNy3iZC/rmZuabUh6m3e1nuIkRvD2UR4oZPOKOpgTa2iTBt3NvBHQ1mGDjct+8L1JkbdO7aItF98DFGokIMTAqlh+4E27dL8E+fd3/6Hn/t/FKwt0aKDYJsfcEwwxrOXLNPyGHEquXip+L0pwlThq+2F0VTD2LPMA4HtYvVawb/2Qyv36VkLDgZ8gSGU+HgSJxWwLzdUu0b3ADPoK3QYuICGVLQspVX3drKUlC9isAsIDWxoRQRj+lznTXSuRNGToWxo9CAdkN6V8sAF5hdgXfEiCKakFLEL0PsRrxzP8OED9nfx1dO3gQoKMcTLFxVRF2fpAV0TJ55eVW6Px02EMwOoYXCB1TMq6MveYjywbrUorWpN0IA7SKgzuTZxCL5UUVZ9A8ea8SrLKz/X9t7pLy0NhIA0zm+NP/m84+44skcCXbihguY+Mv+6JcBzvWW+xcSiS9WuOAeGE9EedIINgMwV231vZEADgS6D4snmKlAmExhsPU47XlFnXq1h/Uwf7d/bf/RpmqC4PZf6jjx+sn1HsQkV3Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB6016.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(41320700013)(1800799024)(376014)(52116014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eKSSX5IMfJWxKJN5+a7Rlnl8xqcjn6QHbIK412isD51NFK+ykbwMsOnzNt505B+Px2FkTs5NKQ2PGLGioRWnRI48XADFxJWgEXQIKN2AtX+MFlVczcCx/Sd8kJuF5ftsr9o3fCyFEf5s0JUnuV+3N5QcdMnTHAbnbZEklqZ8J5XERGoTqwPpJAwNIN6TTqg/KqZSxgpyjX6qWbekYccYPkl3mwUA/vBMK8cFhudb07YvSDXiPL9w5GlPq+zlMimFf+Bc0fEtslZKbGigJ+BFVBHl/AbtYJNIaW3wjvQe23Ru0zvcfSPooPSj2Ryy15iDvCkSaio8no83C4aCNO+sg1Y9nWc7IZwJO6FWqztrQE3/SAJMmJCQV5ULdayPe4w0oAWebb7xEUDPsyIt4GT8kCcoUV1kL3pubrYWc1wlzNeB7X0Nvf43LXDOT8eiAdP3OXykgzKh9sVJnmY4QVEuvAelIjOUNr6dvf8UNMQg5GE2/+q/pcFx1J+vuWHu7LHsKbRz+yVL4MNt85PDK8l956/C0SePD5F1G4JLtSqBPFEW72ctO2XjP9Wnru2tBcrTkBWztNgsHHjEdDOzSGdK9xQzhK3/j6wn/15M+ScCtEu7Srg/5m9GLGB6q7Un8NDYaaAYU1RzauzM+YiGLjSXbvS0U2C8q4WOk8tvyUuWc701lKwTFcjDDqzky3vhxWf4Cgq34nZPqTxuBBFLSyNnVYEX8L13sBirlXz5U1I4q5SaIJPK4aelU3WyK3OD3UMS/yBPjNSOBguJJ/gcTux8vAwh14PBRNqUoN3KO7ywDDdZ805rz/7MSIkcDElHPmDmbOP4qJx8E4DqsDb/Yiukdo3dKOHFaJOk1sN/zUSK1xzmIL6bqCi4TZ6a85n13VQG7LSW+RqEQQrHeBxeRut6hNyxjcsWYo4BAhNe+2VcXn0nuSRU02qfxMEWTMl/6oU5A4jeAFscOdnjyxLp5QrBqGSNfkVVC8xgW5UvKGzeRJaJeajIndhKA57g/68IDxdKERcB5FuPClPcc6pPCisZalKHWe9DDIj0O/5Kn/TsrusdYySnAT5pKMFPXve7FFOiq4Mqov0HtfoRtnIncSFr/77yHrLWjIO0dFaVHCtZppDTaCoYpzW2myM3a8IFuLEfkQpgMSvRcJGL3ZtA1afMD5o0UeAJ6oHXRSYNG8z8kG5xVqAROqDgZtcczCAK1rA+Hi9X9COjPljoA4luwq2p6w4eizPVvYzT0VHlXbQvhP2J3nMemhp9uNUv9jyRwU+UpJ9r85XkcbQRZ5V/uJaZ8sjxJEktmSlnmWavYp2R2Lq5zoQ+QvVe/tKAW857fgX6Yl8YD3qqV3NoVrrw1KefgQZORpUXkk/J54A3uub+q/jKdis/7rmaGQKBNDyN2TpCiGt/shhW3E310F8ZlT1idKAMNDVDJBFzUqz+FZc1FZ2vr31UaxAskVZOkqsAW5yoeWea2fd22tmxCetFCBjaCOloHRgjmOkzxozTvJ2M/Ec/IT3P/shGH1IsvjvzJrzzJ+Zj1PkdZWmgnVDa00wk54rmVwWmpkEeDo+IuvS5HQ8ECnU5X7QajkcL6Mt8Age0YpUlpH8i6nnO3aCWKfe+Ig== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 4aa6ecc2-6aa1-4a2d-6476-08dcb693d893 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB6016.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2024 03:48:50.0757 (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: cvgBkQYbZJz/6NklpoLFPkiwYkA4AWoSL2omYZer2qHRZBWn/mL+2baZZrMXdEdr5b3zr+mcMs5mWsnROyQj+RySDSgbu1TyRAwaAyHxlBQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSCPR01MB12849 Subject: [FFmpeg-devel] [PATCH v8 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: DMcj85u11/ZT This commit adds support for CAP and CPF markers. Decoding will exit when encountering Ilegal input codestreams. Signed-off-by: Osamu Watanabe --- libavcodec/jpeg2000.h | 8 +++ libavcodec/jpeg2000dec.c | 134 ++++++++++++++++++++++++++++++++++++++- libavcodec/jpeg2000dec.h | 7 ++ 3 files changed, 148 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..62faa8d9f5 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, "Underflow while parsing the CAP marker\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 codestream uses the HT block coder.\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, "Codestream exceeds available precision (B > 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,63 @@ 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 found in a tile header but the codestream belongs to the HOMOGENEOUS 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 found in a tile header but the codestream belongs to the HOMOGENEOUS 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, + "RGN marker found in a tile header but the codestream belongs to the HOMOGENEOUS 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 found but the codestream belongs to the RGNFREE 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 found in a tile header but the codestream belongs to the HOMOGENEOUS 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 found in a tile header but the codestream belongs to the HOMOGENEOUS 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 found in a tile header but the codestream belongs to the HOMOGENEOUS set\n"); + return AVERROR_INVALIDDATA; + } ret = get_poc(s, len, poc); break; case JPEG2000_SOT: @@ -2252,9 +2377,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 found but the codestream belongs to the HOMOGENEOUS 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; From patchwork Wed Aug 7 03:48:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WATANABE Osamu X-Patchwork-Id: 50921 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d7b2:0:b0:489:2eb3:e4c4 with SMTP id dc18csp129300vqb; Tue, 6 Aug 2024 20:49:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW3jxyxX4qhMD4bThxjwPWnVleSJNr4OkrGrOQH3PGchaJ+R8xrUgRRVvJI5wKC+InYan+edxhxZ1zcqhTVaVw78YWgvaXwrsydxg== X-Google-Smtp-Source: AGHT+IHtmvbAd3n/wilJCgJEBOoC8/cAipPTyjgMwrMp5+MBml8rS+POVT1Pr5wGLJ9tbfB0rZFP X-Received: by 2002:a2e:884a:0:b0:2ec:4093:ec7 with SMTP id 38308e7fff4ca-2f15ab29329mr135227391fa.30.1723002560834; Tue, 06 Aug 2024 20:49:20 -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-2f15e1233edsi30147291fa.12.2024.08.06.20.49.20; Tue, 06 Aug 2024 20:49:20 -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=uxGHkooi; 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 250C368DACE; Wed, 7 Aug 2024 06:49:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11020077.outbound.protection.outlook.com [52.101.228.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D66268DAA4 for ; Wed, 7 Aug 2024 06:49:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qg92hPyMLV36DRR1ciaJ5Q4IhzrXd2Iv33gD6AelpSEyBLy2SlszptYe+stBxeRPRuQ6fthcMUL3V99zSiUgWWs13JVzbnAAyU2uU9JsRwFhOQg+GFhrV/FO1Q5O4P6Uj3DIUAzfE73fEIqmNqZ/4J37hfWeOXxpyPZFmPcjpRp2MS46ZgBcKiXz1w2AIncZhVIUD4j7pievmYHgedvKENwFk0rpPmn5bHVwOkWp5iB4pZf2awU8Luz0epGS3fRiFhPZDy264ImnS6QsgxwXDTcB2e+QwU1CAuV4Ar2pwHhQMsyE8pXXoyTgH9Q8ijroKjZ0uUtNB2wfWHMoagcZlQ== 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=0Eb4sXupK+6KfJ95yGNcRAOHydSXwW5sXNhs2J/OkWw=; b=tzKrFr+Qxgd/iyjlZemX1HC5hm8mlK7+JAbGg3NaVbFv54b16wkKpHa/+x9PBfC8JMQwzg9nLgP6qtXZjrQyqANVQBpf3Hc8agHL5IeUmIBf/XNVyTAHOf26co3FkDuvL2XVyWsdqMfUYIcqDwf+XPaNbM+eMkGJ6vVhhyzR6k5W5w3SQsgdI99dgvhqXhrrnn6nJuWRGAWQxOFGPeFJbs9nHKprsMYoZJMlgy7rTxwWgtKMyAdJHo86WBKzsNGGj5tEMBWsKZ+S7Ot0Uf90kYsLHRehwPWQTfYkm+4l5cjRXgpgACNFtbsa6sPLKtU2+tcvElGQ/Z/RH5Ojfh35qg== 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=0Eb4sXupK+6KfJ95yGNcRAOHydSXwW5sXNhs2J/OkWw=; b=uxGHkooiUMoi0EKCQ3m0OGbXNRrSK2rt4ik0Utu08QsVBN70iG6vS/dnKfVNGiA3OFrx2js6HhGRURepjUYPD3mot8EXNnFS4IM3Bb5LkWYtyjTmG6wqS680N+jY7X2PA3k4MulRYFdoAx9E/c2IEfy1X/Xm/1sO5U8MlgerNwU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=es.takushoku-u.ac.jp; Received: from TYCPR01MB6016.jpnprd01.prod.outlook.com (2603:1096:400:4c::12) by OSCPR01MB12849.jpnprd01.prod.outlook.com (2603:1096:604:337::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.13; Wed, 7 Aug 2024 03:48:51 +0000 Received: from TYCPR01MB6016.jpnprd01.prod.outlook.com ([fe80::32fe:be82:2878:fc7c]) by TYCPR01MB6016.jpnprd01.prod.outlook.com ([fe80::32fe:be82:2878:fc7c%7]) with mapi id 15.20.7849.008; Wed, 7 Aug 2024 03:48:51 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Aug 2024 12:48:44 +0900 Message-Id: <20240807034845.363526-2-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240807034845.363526-1-owatanab@es.takushoku-u.ac.jp> References: <20240807034845.363526-1-owatanab@es.takushoku-u.ac.jp> X-ClientProxiedBy: TYCP286CA0127.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b6::9) To TYCPR01MB6016.jpnprd01.prod.outlook.com (2603:1096:400:4c::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB6016:EE_|OSCPR01MB12849:EE_ X-MS-Office365-Filtering-Correlation-Id: bad9a29d-fbc9-48f3-9523-08dcb693d96c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: ddAjlJ05xXwmvbJ60j8whhipUp976UbBDi4LlDz/E1f3NRR9LMYmVbdDiFBiExrm5rtwkbhazym1Fr6TGcX1DbAA6yc3J31Y+viLhrYXvK3khV243l+pQRrnXQJjBqLfm3oymvCSZEmAO4E5mZqUjdFcs1A4n2/o4IbaHxQt2H0CYc6cEW2HEVf/U0Xh6sJxx43d9v1IA/KD12pRFkUkJMqazzlO7RIkGxs9H9Grp0x8lopCPeeTDkj62NQ2qgfoCZ/c00ZOTIq78ft5vLUf4UDQ/XDY2Ac8CQviqqY6E+eEI1H7l5GdB4KH8E22+lmSlTT7vZDvxrL7Lp8ZO8fVaF0hw4dP3FOLCTEzaP1xBjJlqx1DCy43KFg1OZwj9lN8U887ttKJc5/Gasmv+b9/HSHFxpk/Z24/49n2pOncZe5Gxnx2VK/VpvGH6iGjf9XfYEQWtba+aPKJ4QVqltj4JTnmyK4tMbn5G8ihvuHvc0UuZMwPzWM4aAN51r+qlYm3aeAI+D+T1XG8QXw4engHmxfPdKxw+R/knlypOba2/hRVzLlBnWPyCVVQq39qRCpzBWHdJX6BNtOVDrId+D7ng4EO3naSWv3hCXUPYxtmSwfMrupPwvldLsoXoMwnbuUJS+q7Gcepett3D0N77qOilKLnmjgWu3Ia7rLOqgPys22OG1LtToUKvHIWnOYceXF2fIEhs1KKl2vX6xO3AfkN7kn9leSJuO3wg9a2Nl97nRFRFMPWU8h7g/A0GbIoH8ZL2zT3q0jaoiZdvau+Pc2G5PSBrDltZxmyBlPkLewzk/618xFxsZWZ8bYKYEmr/n5DXLq1zhG57WgJq3cYDQub93aptZLzN3LhlaOgxd5sveJ5jqGXomfsw2NmGBsWGOGDgpZ6sk+uDCdCnhUum7r/h2Yc41RFitEi9GjlYe/d3e6JSie8lwOugg2RiNF+3c8Vull4id78lWEiGA6cY87AvBIQ0oIVH6mGrWP7ha6scAuzk3Ca8D7QPoR1AULaUOCqzfk6EpCiiQLYKuqpMNprqG02A3ZQqfOgeSi5ep8fc2sOje/UcZghiqrW84ouV8hsG0+4+rmOWHHWRBJ7TmoCnmQYSkTr1sHzJjdOEGgwQDIPltBzjDIYxjqYeIIAB7ZpZmr6tgyxg7Z+/3reeCkNGJYqvGLD+2cv/8diH8aRSB8pd06q/1OK6D671Ag0rzXGJeA4FYXHfjlJW1t/jUQfR0hihtjDOLBngh7UORsv8TpDm3lE6wmaxGMO204mJtlh5qOxAmlMCi4cV8xzcL48sfBfwss9Er8TQMq3STONwlvuWWHpF5qOEgDGi0TykqpGGiKhMXc6EXEfX022d0A4WP0vXscefe1wV+gLIqjHC4yqtI4w9lPwWe4fyNrPc72OwIicylmmR4wifcNdJ3UZ2Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB6016.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(41320700013)(1800799024)(376014)(52116014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lU2yNjKu+VSkXP4pc7LwxeECVmA1tT5QmREUSHy45/1RewLFlcyMhNs47MjKY9Xy70OcRT798RPHrzpr/iIsP3UnxOmZbT99XEQApR37YYYqviHGlA2+8MvdYcCVrXOHeJONZanR5YPbpfeb6MyNZHIvsz+ewc0fOLIdE6Ypf6HkqmBhBnThyLELILU8BY/SLkmebK+3GrqD+EYoTZRkAVCgagq+TZqx0UIWIYQ/cTrZl9yibxzAU6zHUCRGuAMf2MpspLWWF2a0LqvcX8XQ9+NJwDnzh/9Zyq4bkJQ6337Nb6irkyXPrBzQl6NnjGyeBeJ0rEoVyxpn1qBiMGg52wOmm3nPv2PZ9thTVjDikx9CkRiLh/2BSFtymY+1TS5ZyoYpnCnZNnEaVjIbBEiuZq+68Hj3vwmqzaujj5ToVRk1lplYoG1aQNIbjPkqbbUBCCEvg76c0y0+QZAdiy9B7ExPBDOtG9tUVqYlv2z3ieARd6hORGRqJYlC3poz5S3lnHrKB4IEMGj068h9e+aC7ouZJuUFUY/z8bJMpEpqQzQxuv6D4D5cY142r2j+h3bBb00d1UA8s8gmkLVz+mFi88unRZtFHSm+XmWdx6khyJofSwPu7oSuAK2wE8UXuXK7YmmWeHlMp8FSqCr94yOoOlPqQi+YO87f6hkPhNiZCj+ZaRj/7nhB5BvtgwqinmrDgLEQEQNdHUuDFnO0XvAfzDaX2Yq7Lph0yjvDrFkch1z1pRMb1Z7W87cZOTnsBpUrv7PFBjz+ekC9Du1y0JZbm3qqR90MO2r3y3EqffebYhVoQm/f1XRNBm0CUtQZr5yYsxF1auHyQnIDJ2Kcz98Q7lit6ZB/Y2XCwVi6QXiU6P9Pfn0X3We1lAFEpH1KCEhfi6Hih9yk3JdxoT3E4OmR5+IJcgxC1D/sH1lLGtH5crRCOpP661te8EkePFMt4s1TjxHzmWqUPEzGCKVddwJ2SL4eky1112nEKwOp+dlaORWPIeHJlR+SOAJ/vEz399N3PaTkePfZ69lp2HjAyJJyhbdmYyIu8YQktptQZgPn4q25zlt4Jdfaae/xoKlwQXXm6OQoyrg1xI+OAjQuY2MF3uGZgZXBQVL+EPNUhHBfNWzwBu6aOPEuLQlo9U3t7odVUr4Meam2C6irIvmftDnt/yDUasxqyKA2mcpk+i8DrI4nXG4RS7pv//OHo9QBqBzJRJLUw9bM02SYYf7V+nkKpl1Nn7AS0tzkXVE2tqkKMpVLWssNl9WOeFqiLQjdA9w7aCvVmt/Q4UwZaMP1FM93U34bIzxK6oaTio9mbhRdopYTLuIRpMis6EfhFmXkPSNotHG0busw8PpDXO9vNIXrfoLgr6E0XaXlRMI8Zd7NMKzPqSfy7+Kuj2Qon2CAPK1fn4NxmPuiyAxMoFQTPvGa4ZADevcASfEWLkSL1LbAigrya1qLQTE8AllrQpalR68O46p2DF+RaK00R1orvPmVGR+H9Ms4ngI+w2PcKITL+2MjB/qAtRRKb8WgPSYPYv/rDEX+RKR5U72lRJDJsKAMa+RHbfkz/3GqTDDlwLWXAYbVKBZQs3hA79YsWN8GWgK66WICIi8Nfite6c5WrfIjmg== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: bad9a29d-fbc9-48f3-9523-08dcb693d96c X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB6016.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2024 03:48:51.4989 (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: UYwLsvuxrS6NIN9uW3qbe1Ay0FGj6tmOS0yq0A7wM3kfJ9Cz+0q2BBm/mxhnhO/4cv0FhYBff94qus1YoudlrJydg318YOu1OoMgGTUmkFA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSCPR01MB12849 Subject: [FFmpeg-devel] [PATCH v8 2/3] avcodec/jpeg2000dec: Add support for placeholder passes 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: aGzDL5d5Bp7D This commit adds support for placeholder pass parsing. Signed-off-by: Osamu Watanabe --- libavcodec/jpeg2000.h | 2 + libavcodec/jpeg2000dec.c | 352 +++++++++++++++++++++++++++++-------- libavcodec/jpeg2000dec.h | 2 +- libavcodec/jpeg2000htdec.c | 90 +++++----- 4 files changed, 327 insertions(+), 119 deletions(-) diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 4bdc38df7c..93221d90ca 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -200,6 +200,8 @@ typedef struct Jpeg2000Cblk { /* specific to HT code-blocks */ int zbp; int pass_lengths[2]; + uint8_t modes; // copy of SPcod/SPcoc field to parse HT-MIXED mode + uint8_t ht_plhd; // are we looking for HT placeholder passes? } Jpeg2000Cblk; // code block typedef struct Jpeg2000Prec { diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 62faa8d9f5..d13eedfaf7 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -54,6 +54,15 @@ #define HAD_COC 0x01 #define HAD_QCC 0x02 +// Values of flag for placeholder passes +enum HT_PLHD_STATUS { + HT_PLHD_OFF, + HT_PLHD_ON +}; + +#define HT_MIXED 0x80 // bit 7 of SPcod/SPcoc + + /* get_bits functions for JPEG2000 packet bitstream * It is a get_bit function with a bit-stuffing routine. If the value of the * byte is 0xFF, the next byte includes an extra zero bit stuffed into the MSB. @@ -1160,100 +1169,293 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, int incl, newpasses, llen; void *tmp; - if (cblk->npasses) - incl = get_bits(s, 1); - else + if (!cblk->incl) { + incl = 0; + cblk->modes = codsty->cblk_style; + if (cblk->modes >= JPEG2000_CTSY_HTJ2K_F) + cblk->ht_plhd = HT_PLHD_ON; + if (layno > 0) + incl = tag_tree_decode(s, prec->cblkincl + cblkno, 0 + 1) == 0; incl = tag_tree_decode(s, prec->cblkincl + cblkno, layno + 1) == layno; - if (!incl) - continue; - else if (incl < 0) - return incl; - - if (!cblk->npasses) { - int zbp = tag_tree_decode(s, prec->zerobits + cblkno, 100); - int v = expn[bandno] + numgbits - 1 - zbp; - if (v < 0 || v > 30) { - av_log(s->avctx, AV_LOG_ERROR, - "nonzerobits %d invalid or unsupported\n", v); - return AVERROR_INVALIDDATA; + if (incl) { + int zbp = tag_tree_decode(s, prec->zerobits + cblkno, 100); + int v = expn[bandno] + numgbits - 1 - (zbp - tile->comp->roi_shift); + if (v < 0 || v > 30) { + av_log(s->avctx, AV_LOG_ERROR, + "nonzerobits %d invalid or unsupported\n", v); + return AVERROR_INVALIDDATA; + } + cblk->incl = 1; + cblk->nonzerobits = v; + cblk->zbp = zbp; + cblk->lblock = 3; } - cblk->zbp = zbp; - cblk->nonzerobits = v; - } - if ((newpasses = getnpasses(s)) < 0) - return newpasses; - av_assert2(newpasses > 0); - if (cblk->npasses + newpasses >= JPEG2000_MAX_PASSES) { - avpriv_request_sample(s->avctx, "Too many passes"); - return AVERROR_PATCHWELCOME; - } - if ((llen = getlblockinc(s)) < 0) - return llen; - if (cblk->lblock + llen + av_log2(newpasses) > 16) { - avpriv_request_sample(s->avctx, - "Block with length beyond 16 bits"); - return AVERROR_PATCHWELCOME; + } else { + incl = get_bits(s, 1); } - cblk->lblock += llen; - - cblk->nb_lengthinc = 0; - cblk->nb_terminationsinc = 0; - av_free(cblk->lengthinc); - cblk->lengthinc = av_calloc(newpasses, sizeof(*cblk->lengthinc)); - if (!cblk->lengthinc) - return AVERROR(ENOMEM); - tmp = av_realloc_array(cblk->data_start, cblk->nb_terminations + newpasses + 1, sizeof(*cblk->data_start)); - if (!tmp) - return AVERROR(ENOMEM); - cblk->data_start = tmp; - do { - int newpasses1 = 0; + if (incl) { + uint8_t bypass_term_threshold = 0; + uint8_t bits_to_read = 0; + uint32_t segment_bytes = 0; + int32_t segment_passes = 0; + uint8_t next_segment_passes = 0; + int32_t href_passes, pass_bound; + uint32_t tmp_length = 0; + int32_t newpasses_copy, npasses_copy; + + if ((newpasses = getnpasses(s)) <= 0) + return newpasses; + if (cblk->npasses + newpasses >= JPEG2000_MAX_PASSES) { + avpriv_request_sample(s->avctx, "Too many passes"); + return AVERROR_PATCHWELCOME; + } + if ((llen = getlblockinc(s)) < 0) + return llen; + if (cblk->lblock + llen + av_log2(newpasses) > 16) { + avpriv_request_sample(s->avctx, + "Block with length beyond 16 bits"); + return AVERROR_PATCHWELCOME; + } + cblk->nb_lengthinc = 0; + cblk->nb_terminationsinc = 0; + av_free(cblk->lengthinc); + cblk->lengthinc = av_calloc(newpasses, sizeof(*cblk->lengthinc)); + if (!cblk->lengthinc) + return AVERROR(ENOMEM); + tmp = av_realloc_array(cblk->data_start, cblk->nb_terminations + newpasses + 1, + sizeof(*cblk->data_start)); + if (!tmp) + return AVERROR(ENOMEM); + cblk->data_start = tmp; + cblk->lblock += llen; + + // Count number of necessary terminations for non HT code block + newpasses_copy = newpasses; + npasses_copy = cblk->npasses; + if (!(cblk->modes & JPEG2000_CTSY_HTJ2K_F)) { + do { + int newpasses1 = 0; + + while (newpasses1 < newpasses_copy) { + newpasses1++; + if (needs_termination(codsty->cblk_style, npasses_copy + newpasses1 - 1)) { + cblk->nb_terminationsinc++; + break; + } + } + npasses_copy += newpasses1; + newpasses_copy -= newpasses1; + } while (newpasses_copy); + } - while (newpasses1 < newpasses) { - newpasses1 ++; - if (needs_termination(codsty->cblk_style, cblk->npasses + newpasses1 - 1)) { - cblk->nb_terminationsinc ++; - break; + if (cblk->ht_plhd) { + href_passes = (cblk->npasses + newpasses - 1) % 3; + segment_passes = newpasses - href_passes; + pass_bound = 2; + bits_to_read = cblk->lblock; + if (segment_passes < 1) { + // No possible HT Cleanup pass here; may have placeholder passes + // or an original J2K block bit-stream (in MIXED mode). + segment_passes = newpasses; + while (pass_bound <= segment_passes) { + bits_to_read++; + pass_bound += pass_bound; + } + segment_bytes = get_bits(s, bits_to_read); + if (segment_bytes) { + if (cblk->modes & HT_MIXED) { + cblk->ht_plhd = HT_PLHD_OFF; + cblk->modes &= (uint8_t) (~(JPEG2000_CTSY_HTJ2K_F)); + } + else { + av_log(s->avctx, AV_LOG_WARNING, "Length information for a HT-codeblock is invalid\n"); + } + } + } else { + while (pass_bound <= segment_passes) { + bits_to_read++; + pass_bound += pass_bound; + } + segment_bytes = get_bits(s, bits_to_read); + if (segment_bytes) { + // No more placeholder passes + if (!(cblk->modes & HT_MIXED)) { + // Must be the first HT Cleanup pass + if (segment_bytes < 2) + av_log(s->avctx, AV_LOG_WARNING, "Length information for a HT-codeblock is invalid\n"); + next_segment_passes = 2; + cblk->ht_plhd = HT_PLHD_OFF; + // Write length information for HT CleanUp segment + cblk->pass_lengths[0] = segment_bytes; + } else if (cblk->lblock > 3 && segment_bytes > 1 + && (segment_bytes >> (bits_to_read - 1)) == 0) { + // Must be the first HT Cleanup pass, since length MSB is 0 + next_segment_passes = 2; + cblk->ht_plhd = HT_PLHD_OFF; + // Write length information for HT CleanUp segment + cblk->pass_lengths[0] = segment_bytes; + } else { + // Must have an original (non-HT) block coding pass + cblk->modes &= (uint8_t) (~(JPEG2000_CTSY_HTJ2K_F)); + cblk->ht_plhd = HT_PLHD_OFF; + segment_passes = newpasses; + while (pass_bound <= segment_passes) { + bits_to_read++; + pass_bound += pass_bound; + segment_bytes <<= 1; + segment_bytes += get_bits(s, 1); + } + } + } else { + // Probably parsing placeholder passes, but we need to read an + // extra length bit to verify this, since prior to the first + // HT Cleanup pass, the number of length bits read for a + // contributing code-block is dependent on the number of passes + // being included, as if it were a non-HT code-block. + segment_passes = newpasses; + if (pass_bound <= segment_passes) { + while (1) { + bits_to_read++; + pass_bound += pass_bound; + segment_bytes <<= 1; + segment_bytes += get_bits(s, 1); + if (pass_bound > segment_passes) + break; + } + if (segment_bytes) { + if (cblk->modes & HT_MIXED) { + cblk->modes &= (uint8_t) (~(JPEG2000_CTSY_HTJ2K_F)); + cblk->ht_plhd = HT_PLHD_OFF; + } else { + av_log(s->avctx, AV_LOG_WARNING, "Length information for a HT-codeblock is invalid\n"); + } + } + } + } + } + } else if (cblk->modes & JPEG2000_CTSY_HTJ2K_F) { + // Quality layer commences with a non-initial HT coding pass + if(bits_to_read != 0) + av_log(s->avctx, AV_LOG_WARNING, "Length information for a HT-codeblock is invalid\n"); + segment_passes = cblk->npasses % 3; + if (segment_passes == 0) { + // newpasses is a HT Cleanup pass; next segment has refinement passes + segment_passes = 1; + next_segment_passes = 2; + if (segment_bytes == 1) + av_log(s->avctx, AV_LOG_WARNING, "Length information for a HT-codeblock is invalid\n"); + } else { + // newpasses = 1 means npasses is HT SigProp; 2 means newpasses is + // HT MagRef pass + segment_passes = newpasses > 1 ? 3 - segment_passes : 1; + next_segment_passes = 1; + bits_to_read = av_log2(segment_passes); + } + bits_to_read = (uint8_t) (bits_to_read + cblk->lblock); + segment_bytes = get_bits(s, bits_to_read); + // Write length information for HT Refinment segment + cblk->pass_lengths[1] += segment_bytes; + } else if (!(cblk->modes & (JPEG2000_CBLK_TERMALL | JPEG2000_CBLK_BYPASS))) { + // Common case for non-HT code-blocks; we have only one segment + bits_to_read = (uint8_t) cblk->lblock + av_log2((uint8_t) newpasses); + segment_bytes = get_bits(s, bits_to_read); + segment_passes = newpasses; + } else if (cblk->modes & JPEG2000_CBLK_TERMALL) { + // RESTART MODE + bits_to_read = cblk->lblock; + segment_bytes = get_bits(s, bits_to_read); + segment_passes = 1; + next_segment_passes = 1; + } else { + // BYPASS MODE + bypass_term_threshold = 10; + if(bits_to_read != 0) + av_log(s->avctx, AV_LOG_WARNING, "Length information for a codeblock is invalid\n"); + if (cblk->npasses < bypass_term_threshold) { + // May have from 1 to 10 uninterrupted passes before 1st RAW SigProp + segment_passes = bypass_term_threshold - cblk->npasses; + if (segment_passes > newpasses) + segment_passes = newpasses; + while ((2 << bits_to_read) <= segment_passes) + bits_to_read++; + next_segment_passes = 2; + } else if ((cblk->npasses - bypass_term_threshold) % 3 < 2) { + // 0 means newpasses is a RAW SigProp; 1 means newpasses is a RAW MagRef pass + segment_passes = newpasses > 1 ? 2 - (cblk->npasses - bypass_term_threshold) % 3 : 1; + bits_to_read = av_log2(segment_passes); + next_segment_passes = 1; + } else { + // newpasses is an isolated Cleanup pass that precedes a RAW SigProp pass + segment_passes = 1; + next_segment_passes = 2; } + bits_to_read = (uint8_t) (bits_to_read + cblk->lblock); + segment_bytes = get_bits(s, bits_to_read); } - - if (newpasses > 1 && (codsty->cblk_style & JPEG2000_CTSY_HTJ2K_F)) { - // Retrieve pass lengths for each pass - int href_passes = (cblk->npasses + newpasses - 1) % 3; - int eb = av_log2(newpasses - href_passes); - int extra_bit = newpasses > 2 ? 1 : 0; - if ((ret = get_bits(s, llen + eb + 3)) < 0) - return ret; - cblk->pass_lengths[0] = ret; - if ((ret = get_bits(s, llen + 3 + extra_bit)) < 0) - return ret; - cblk->pass_lengths[1] = ret; - ret = cblk->pass_lengths[0] + cblk->pass_lengths[1]; + // Update cblk->npasses and write length information + cblk->npasses = (uint8_t) (cblk->npasses + segment_passes); + cblk->lengthinc[cblk->nb_lengthinc++] = segment_bytes; + + if ((cblk->modes & JPEG2000_CTSY_HTJ2K_F) && cblk->ht_plhd == HT_PLHD_OFF) { + newpasses -= (uint8_t) segment_passes; + while (newpasses > 0) { + segment_passes = newpasses > 1 ? next_segment_passes : 1; + next_segment_passes = (uint8_t) (3 - next_segment_passes); + bits_to_read = (uint8_t) (cblk->lblock + av_log2(segment_passes)); + segment_bytes = get_bits(s, bits_to_read); + newpasses -= (uint8_t) (segment_passes); + // This is a FAST Refinement pass + // Write length information for HT Refinement segment + cblk->pass_lengths[1] += segment_bytes; + // Update cblk->npasses and write length information + cblk->npasses = (uint8_t) (cblk->npasses + segment_passes); + cblk->lengthinc[cblk->nb_lengthinc++] = segment_bytes; + } } else { - if ((ret = get_bits(s, av_log2(newpasses1) + cblk->lblock)) < 0) - return ret; - cblk->pass_lengths[0] = ret; + newpasses -= (uint8_t) (segment_passes); + while (newpasses > 0) { + if (bypass_term_threshold != 0) { + segment_passes = newpasses > 1 ? next_segment_passes : 1; + next_segment_passes = (uint8_t) (3 - next_segment_passes); + bits_to_read = (uint8_t) (cblk->lblock + av_log2(segment_passes)); + } else { + if ((cblk->modes & JPEG2000_CBLK_TERMALL) == 0) + av_log(s->avctx, AV_LOG_WARNING, "Corrupted packet header is found.\n"); + segment_passes = 1; + bits_to_read = cblk->lblock; + } + segment_bytes = get_bits(s, bits_to_read); + newpasses -= (uint8_t) (segment_passes); + + // Update cblk->npasses and write length information + cblk->npasses = (uint8_t) (cblk->npasses + segment_passes); + cblk->lengthinc[cblk->nb_lengthinc++] = segment_bytes; + } } - if (ret > cblk->data_allocated) { - size_t new_size = FFMAX(2*cblk->data_allocated, ret); + + for (int i = 0; i < cblk->nb_lengthinc; ++i) + tmp_length = (tmp_length < cblk->lengthinc[i]) ? cblk->lengthinc[i] : tmp_length; + + if (tmp_length > cblk->data_allocated) { + size_t new_size = FFMAX(2 * cblk->data_allocated, tmp_length); void *new = av_realloc(cblk->data, new_size); if (new) { cblk->data = new; cblk->data_allocated = new_size; } } - if (ret > cblk->data_allocated) { + if (tmp_length > cblk->data_allocated) { avpriv_request_sample(s->avctx, "Block with lengthinc greater than %"SIZE_SPECIFIER"", cblk->data_allocated); return AVERROR_PATCHWELCOME; } - cblk->lengthinc[cblk->nb_lengthinc++] = ret; - cblk->npasses += newpasses1; - newpasses -= newpasses1; - } while(newpasses); + } else { + // This codeblock has no contribution to the current packet + continue; + } } } jpeg2000_flush(s); @@ -1788,7 +1990,7 @@ static int decode_cblk(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *cod Jpeg2000T1Context *t1, Jpeg2000Cblk *cblk, int width, int height, int bandpos, uint8_t roi_shift) { - int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1 + roi_shift; + int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1; int pass_cnt = 0; int vert_causal_ctx_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_VSC; int term_cnt = 0; @@ -2028,7 +2230,7 @@ static inline int tile_codeblocks(const Jpeg2000DecoderContext *s, Jpeg2000Tile Jpeg2000Cblk *cblk = prec->cblk + cblkno; - if (codsty->cblk_style & JPEG2000_CTSY_HTJ2K_F) + if (cblk->modes & JPEG2000_CTSY_HTJ2K_F) ret = ff_jpeg2000_decode_htj2k(s, codsty, &t1, cblk, cblk->coord[0][1] - cblk->coord[0][0], cblk->coord[1][1] - cblk->coord[1][0], diff --git a/libavcodec/jpeg2000dec.h b/libavcodec/jpeg2000dec.h index 166cce9eba..78eba27ed9 100644 --- a/libavcodec/jpeg2000dec.h +++ b/libavcodec/jpeg2000dec.h @@ -117,7 +117,7 @@ typedef struct Jpeg2000DecoderContext { 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 + uint8_t HT_B; // The parameter B for MAGBp value (see Table 4 in the Rec. ITU-T T.814 | ISO/IEC 15444-15) /*options parameters*/ int reduction_factor; diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c index eba0936089..9b473e11d3 100644 --- a/libavcodec/jpeg2000htdec.c +++ b/libavcodec/jpeg2000htdec.c @@ -1032,25 +1032,31 @@ static void jpeg2000_calc_mbr(uint8_t *mbr, const uint16_t i, const uint16_t j, static void jpeg2000_process_stripes_block(StateVars *sig_prop, int i_s, int j_s, int width, int height, int stride, int pLSB, int32_t *sample_buf, uint8_t *block_states, - uint8_t *magref_segment, uint32_t magref_length) + uint8_t *magref_segment, uint32_t magref_length, + uint8_t is_causal) { for (int j = j_s; j < j_s + width; j++) { uint32_t mbr_info = 0; for (int i = i_s; i < i_s + height; i++) { - int modify_state, cond; + int modify_state; uint8_t bit; - uint8_t causal_cond = i != (i_s + height - 1); + uint8_t causal_cond = (is_causal == 0) || (i != (i_s + height - 1)); int32_t *sp = &sample_buf[j + (i * (stride))]; uint8_t mbr = 0; - if (jpeg2000_get_state(i, j, stride - 2, HT_SHIFT_SIGMA, block_states) == 0) + if (jpeg2000_get_state(i, j, stride, HT_SHIFT_SIGMA, block_states) == 0) jpeg2000_calc_mbr(&mbr, i, j, mbr_info & 0x1EF, causal_cond, block_states, stride); mbr_info >>= 3; - cond = mbr != 0; - bit = jpeg2000_peek_bit(sig_prop, magref_segment, magref_length); - *sp |= (bit * cond) << pLSB; - sig_prop->bits -= cond; - modify_state = (((1 << HT_SHIFT_REF_IND) | (1 << HT_SHIFT_REF)) * cond) | 1 << HT_SHIFT_SCAN; + + modify_state = block_states[(i + 1) * stride + (j + 1)]; + modify_state |= 1 << HT_SHIFT_SCAN; + if (mbr != 0) { + modify_state |= 1 << HT_SHIFT_REF_IND; + bit = jpeg2000_peek_bit(sig_prop, magref_segment, magref_length); + modify_state |= bit << HT_SHIFT_REF; + *sp |= bit << pLSB; + *sp |= bit << (pLSB - 1); // Add 0.5 (reconstruction parameter = 1/2) + } jpeg2000_modify_state(i, j, stride, modify_state, block_states); } } @@ -1074,6 +1080,7 @@ static void jpeg2000_decode_sigprop_segment(Jpeg2000Cblk *cblk, uint16_t width, int last_width; uint16_t i = 0, j = 0; + uint8_t is_causal = cblk->modes & JPEG2000_CBLK_VSC; jpeg2000_init_zero(&sp_dec); @@ -1082,14 +1089,14 @@ static void jpeg2000_decode_sigprop_segment(Jpeg2000Cblk *cblk, uint16_t width, for (int n2 = 0; n2 < num_h_stripe; n2++) { jpeg2000_process_stripes_block(&sp_dec, i, j, b_width, b_height, stride, pLSB, sample_buf, block_states, magref_segment, - magref_length); + magref_length, is_causal); j += 4; } last_width = width % 4; if (last_width) jpeg2000_process_stripes_block(&sp_dec, i, j, last_width, b_height, stride, pLSB, sample_buf, block_states, magref_segment, - magref_length); + magref_length, is_causal); i += 4; } @@ -1099,20 +1106,20 @@ static void jpeg2000_decode_sigprop_segment(Jpeg2000Cblk *cblk, uint16_t width, for (int n2 = 0; n2 < num_h_stripe; n2++) { jpeg2000_process_stripes_block(&sp_dec, i, j, b_width, b_height, stride, pLSB, sample_buf, block_states, magref_segment, - magref_length); + magref_length, is_causal); j += 4; } last_width = width % 4; if (last_width) jpeg2000_process_stripes_block(&sp_dec, i, j, last_width, b_height, stride, pLSB, sample_buf, block_states, magref_segment, - magref_length); + magref_length, is_causal); } /** * See procedure decodeSigPropMag at Rec. ITU-T T.814, 7.5. */ -static int +static void jpeg2000_decode_magref_segment( uint16_t width, uint16_t block_height, const int stride, uint8_t *magref_segment,uint32_t magref_length, uint8_t pLSB, int32_t *sample_buf, uint8_t *block_states) @@ -1152,15 +1159,14 @@ jpeg2000_decode_magref_segment( uint16_t width, uint16_t block_height, const int } } } - return 1; } int ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, Jpeg2000T1Context *t1, Jpeg2000Cblk *cblk, - int width, int height, int magp, uint8_t roi_shift) + int width, int height, int M_b, uint8_t roi_shift) { - uint8_t p0 = 0; // Number of placeholder passes + uint8_t p0 = 0; // 3 * p0 = Number of placeholder passes uint32_t Lcup; // Length of HT cleanup segment uint32_t Lref; // Length of Refinement segment uint32_t Scup; // HT cleanup segment suffix length @@ -1174,7 +1180,7 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c int z_blk; // Number of ht coding pass - uint8_t empty_passes; + uint8_t num_plhd_passes; // Number of placeholder passes StateVars mag_sgn; // Magnitude and Sign StateVars mel; // Adaptive run-length coding @@ -1190,8 +1196,9 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c uint8_t *block_states = NULL; int32_t n, val; // Post-processing - - int32_t M_b = magp; + const uint32_t mask = UINT32_MAX >> (M_b + 1); // bit mask for ROI detection + + uint8_t num_rempass; const int quad_buf_width = width + 4; const int quad_buf_height = height + 4; @@ -1201,22 +1208,17 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c av_assert0(width * height <= 4096); av_assert0(width * height > 0); - if (roi_shift) - avpriv_report_missing_feature(s->avctx, "ROI shift"); - memset(t1->data, 0, t1->stride * height * sizeof(*t1->data)); memset(t1->flags, 0, t1->stride * (height + 2) * sizeof(*t1->flags)); if (cblk->npasses == 0) return 0; - if (cblk->npasses > 3) - p0 = 0; - else if (cblk->length == 0) - p0 = 1; - - empty_passes = p0 * 3; - z_blk = cblk->npasses - empty_passes; + num_rempass = cblk->npasses % 3; // Number of remainder passes + num_plhd_passes = num_rempass ? cblk->npasses - num_rempass : cblk->npasses - 3; + av_assert0(num_plhd_passes % 3 == 0); + p0 = num_plhd_passes / 3; + z_blk = cblk->npasses - num_plhd_passes; if (z_blk <= 0) return 0; // No passes within this set, continue @@ -1232,6 +1234,7 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c Dcup = cblk->data; Dref = cblk->data + Lcup; // Dref comes after the refinement segment S_blk = p0 + cblk->zbp; + cblk->zbp = S_blk - 1; pLSB = 30 - S_blk; Scup = (Dcup[Lcup - 1] << 4) + (Dcup[Lcup - 2] & 0x0F); @@ -1277,31 +1280,32 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c goto free; } - if (cblk->npasses > 1) + if (z_blk > 1) jpeg2000_decode_sigprop_segment(cblk, width, height, quad_buf_width, Dref, Lref, pLSB - 1, sample_buf, block_states); - if (cblk->npasses > 2) { - - if (Lref < 2){ - av_log(s->avctx,AV_LOG_ERROR,"Invalid magnitude refinement length\n"); - ret = AVERROR_INVALIDDATA; - goto free; - } - if ((ret = jpeg2000_decode_magref_segment(width, height, quad_buf_width, Dref, Lref, - pLSB - 1, sample_buf, block_states)) < 0) - goto free; - } + if (z_blk > 2) + jpeg2000_decode_magref_segment(width, height, quad_buf_width, Dref, Lref, + pLSB - 1, sample_buf, block_states); pLSB = 31 - M_b; /* Reconstruct the sample values */ for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { + int32_t sign; + n = x + (y * t1->stride); val = sample_buf[x + (y * quad_buf_width)]; + sign = val & INT32_MIN; + val &= INT32_MAX; + /* ROI shift, if necessary */ + if (roi_shift && (((uint32_t)val & ~mask) == 0)) + val <<= roi_shift; /* Convert sign-magnitude to two's complement. */ - val = val >> 31 ? 0x80000000 - val : val; + if (sign) + val = -val; + /* Shift down to 1 bit upper from decimal point for reconstruction value (= 0.5) */ val >>= (pLSB - 1); t1->data[n] = val; } From patchwork Wed Aug 7 03:48:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WATANABE Osamu X-Patchwork-Id: 50922 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d7b2:0:b0:489:2eb3:e4c4 with SMTP id dc18csp129332vqb; Tue, 6 Aug 2024 20:49:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWEVZnL10uxM0ZV4mqjgns/3VjXWku8iCDJ0dVDVYVKwOTJ/jMX5dDW6wuoNQ1TRjTWPK5d7YMgbxBIJi7ilngqGnsI76JoqtsIDg== X-Google-Smtp-Source: AGHT+IHV04tmlKrJFzBoxSF0B/dEyEuXoe+hDOiiWyWhH0+pSP/YWJHbkSGmH4MXf8m7NQJyJNkL X-Received: by 2002:a05:6512:3d89:b0:52e:987f:cfe4 with SMTP id 2adb3069b0e04-530bb396e7amr10862366e87.30.1723002569337; Tue, 06 Aug 2024 20:49:29 -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 4fb4d7f45d1cf-5b83c523c10si6217927a12.483.2024.08.06.20.49.28; Tue, 06 Aug 2024 20:49:29 -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=QZ2K4Ehy; 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 4D02968DB10; Wed, 7 Aug 2024 06:49:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11020077.outbound.protection.outlook.com [52.101.228.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A240168DACE for ; Wed, 7 Aug 2024 06:49:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w763YiQTAkd/hMuC87Hj1K6jULEuD7mjy+ASrdHYwRL4MA47K7NkiItwgJDRMo4O9X/PkcoRqlSIBklFg4Kwvr6Kq1A76NljgTgaKrrt9o+vvDs2TYONGmDzAarfEl4oars/f+CtrCkZ7RSavD+8TX3wyg1lDbZjYbvUxo23AwTHXbFY9XiA5dG1EC9wFGyQcbLtIHpPuAb/1ZNYFUfTsIpeRpYMnQhgLoncEaqxsOk4JtpSc7fb0XBmfdJA7GJFZOUczUsK9pAc8atnti0QLrpleeUhMCg7S8HVvpWMV4F2S1IDSK96UErru0Tj+5LFuqvhNUtp2l5CPN6fYh7Ixw== 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=b5GKOCswhUPdRF+yJ52yNcb4wkqwleTxv15PMnMqhtw=; b=sSyu3Zco59CL5y/4OJN+vSI0fC2jSpx+vf1t6d+/nVXtuOs/rrpjWQLCxSvLYTVJBWAsuLCTO1O6FQNZHod+oYDh9Gl38w9HQ0bBuDdZtRkaliYbnu3CInaqTO7Pn83XRONteUKrg2dr4hyQYMaQAGnH9VIARkFrP7mZQYAP0xMKbrEMEhrYerykKqxO69JRCp2zYgaokGB0PxqiXgA2vRh9/8dAvSrWCtiaRNtztK06LXyronOe8cSebhLRTASdF4GUd1SgZrTDB0FPJMCfS/zkLm+PuF6Q4oFuvHTKIk0Qe+Jicnm35xx5PdHy6b+88tESabvKwuZ+BNx9q2Lw+g== 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=b5GKOCswhUPdRF+yJ52yNcb4wkqwleTxv15PMnMqhtw=; b=QZ2K4EhyG/A9tb3PEFRLney5sS9vJ/ndV3aMyytDRTtXrO1tZyisKHiRHMDkZDjTWofqeXhAuJuwHDhS9pOqNhT76G3CwIS/etPKbz5loFuZFX6omYwLOLQ20PQGXjp2oxliopWGRt2AZjv7IqaY3IDDkTnBkS90qjpevZHAlDg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=es.takushoku-u.ac.jp; Received: from TYCPR01MB6016.jpnprd01.prod.outlook.com (2603:1096:400:4c::12) by OSCPR01MB12849.jpnprd01.prod.outlook.com (2603:1096:604:337::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.13; Wed, 7 Aug 2024 03:48:53 +0000 Received: from TYCPR01MB6016.jpnprd01.prod.outlook.com ([fe80::32fe:be82:2878:fc7c]) by TYCPR01MB6016.jpnprd01.prod.outlook.com ([fe80::32fe:be82:2878:fc7c%7]) with mapi id 15.20.7849.008; Wed, 7 Aug 2024 03:48:53 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Aug 2024 12:48:45 +0900 Message-Id: <20240807034845.363526-3-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240807034845.363526-1-owatanab@es.takushoku-u.ac.jp> References: <20240807034845.363526-1-owatanab@es.takushoku-u.ac.jp> X-ClientProxiedBy: TY2PR02CA0035.apcprd02.prod.outlook.com (2603:1096:404:a6::23) To TYCPR01MB6016.jpnprd01.prod.outlook.com (2603:1096:400:4c::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB6016:EE_|OSCPR01MB12849:EE_ X-MS-Office365-Filtering-Correlation-Id: fda12fa3-ded3-4201-5c2e-08dcb693da5c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: vRO8fNp5r5M/p11Xk2+tkFmoWFdL3B25icmxoQ+aSA5fhRQ0FpwDHVHZB07JgJe6X5Rdbn1vDkVxhuqnL9lRKNR5LMeUvAMAmRTJj/VZ8ob8lSLcP04QXn9OsMyhH51Afnn3R5HZ0u//VWnc2XHSma9GA67xnZKh5miM4TqIqvoS/qr6slQ9NyIRPPixZWezK9UgFi1jxOJW8pWOXFEuHkS74DDbe25rlsYvFpy8fLXFlhZTbrtSp8+arcSwsn4FM/bOrKMaU9ysBd/xQDw074OBCk/1Pl35AXdZ+YRwtYgQ5nEOJNpT3C5yrRR8Jq6A8bfXA7ZqWSEdgsmf637REwPicHzyVSEhTB8ly0OAwuK3YWapOAYDV3oA3V5Top+nFs0Q1fhUEabNMliz/5PWiK3LSjChBtWOFl7XcVQR5SpHAQrqRb1iJT/utJ6Q5L42AdjGysFN56uX7nWAA//z0Ou4Q4zkNGZvO+Wqq82OzV2TZuuNNKgk9yvU/WU94xhpR0UFfOpr0FGVUJDEldl7q24urRqd/t4gyeBE7IiLQWImtGxhoCm64mnRmTMThV/Ngjly4WnkXEU6IZOQzy6CSdpONq6uLVJpoSllwKTPUHOZTGPSgAKSBRhl7kQNYcmIvz5fBtMnKvXrd8r3pYwoYCKmOuSxLyF+Mb2+SLahDn+mzi5h9YmzL0CIKYttU/AuosgppwulUT4yudf5w9FhosAT8T/iX6OZnYik5Ylw08ffTxH/EnYg0mgRDHXxJbGtQFkvJlSjb/mePwl+2cjvumDWUU9lvF1XJckJQ6YZ5lakXdrq5JMCLlPewJMD58FazxytWJkeoa2oQsbmoapfVoeJ2mGNpKPa1YckLb7N0ML0RT3mqtvW3+07QIZbgAjo9CTsUD2rh5JZPwOEMkzoiKRLhny+MNJP8Hm0KpX1Lr9GzWN4S2CqWNKSSkr9o25Ux8OCLwnSGrKomFmdGMIP+AtRSRkVmRnQTcD1mRTxVZN7RLOx3eON2n+mSZd/SgMui6wamDqCR7YRCpEmLXgRO1jlrViCzdemGS/8ZpkOvrW5xUfpeaW2YNU97aLTgmak5946D/DxML7jUX/wEVWb4IrUHrUB7lVes4KRAuQHDuWpXSrXh+BCqid25R0xXrI274+3lFwmdoQcMg1DpZOw0qe6o603RAnI+ZQ/OaEAIXfAAnHTS/ARe2zLRzFFc2Y4Qu/miaIBv1jzZb89t8JQvMAGW03j5V8b4LP8lyjGV4o/X0GN5xbQi393IRsphw9IEyQYZ5x/Z0pMXpXjaR6vtxfuoZWDPUgDUVRF63ykuY/b8xYhULjRgw/L6AGt26+XWzWv98t0Uqf3ylEVA0Pzpp+CMIa/fX7H/NkP10SMq3FE2e+i43GevtQ0ZJZY9sV4nKHcW7B5qZqw6RyGinDvWA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB6016.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(41320700013)(1800799024)(376014)(52116014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 812Ccq7ugjYoXJA0w7OO9uhspkDDQRBilV1k+37pxQTCH6BBhnFx3RxvbAkIjXMJ5oM2pz1hPkiDFHyJ8GcnqhHPzu1LaJ5ZifNmMB1uz1PqAROK+gHLeiQ1FtIrGTkX+hldCfIIT8CmwmLyJUPHighYvHXc/1TDab2E7KtCwZMCsSxWrpGzoYcgKoj056vzjUrH1xRL8wVwdit8dnDfp/I3+peAlAkAMB7nK0ColDVArMz7hyS1jEFgGiDIk5IW6UPByBLfmSwmP0hBi5w10a+rlJfHs5MLvl9xqkRDt0rCck1cUs10IbBUmFSwDMAmx2MM3qMYrwfX/ZVcraOeuA70DCsuNbAY/RwU+v5rxMtCB3uTuZVGEIa2bWFcZmJVAO/XNvbnn2bilQs+te0yn1WtQvIA1uvqLYm4t8KG5zC5Y0qh2i7XnTz4DPVgHBx55eaqEQrgt1duTBDAKcfwlF6ByEF91biQwr5d2Nlrb+2VHV/KMI1jryHdMPQakn/GykLUW6Xu3ryHTAI0j4hS0vclImGzl16ViDWhOEeBeu+yCPy4gnDRpGDC0XuFcnI4ffzOc+rCjVj2D8I02p3tlH9YKt2VGO3c3yCEeekyHFNJA4O+T9nruoe/7X58xtoLx0S8C65uyRC9CQjSMvtfwVdtwYIccNlTMeYTy+FU4nk1ZOzYr2tRsB964dgz2+pPi0qXxVTLqk/AjW+PVgJaEwb4FobIjHQH3fygsAswSzPdqSroIH1FbSF4N7e7Lx6ObNBj3PttN0P+ORh9yUPOIGyIdoOU1tGMx/H/M4laPqo1QOEm4K9vYzjlB874F8Hd8zuXHVmrgVzCKi9aElPlH8JNGRdrKqq8nr9PqCThxsQehLcUAyBkL7QcLQcwLrT9Z+Xl8LmI4NpvhMXIWHtSG1DHqznWUe3NDdX9A0JlXdtFL+NX3FdqFmUlWNxZJAFAeegjdFO7NQkJiyIgOqgxulF/SNyemb+bEJq6S6BNMZXqjSkdABCZojgRFdzCD/SijwNKzuhIggA+g59aSB6aHJTNFKoqawE9cToc8I3FqXxTp+LQjYoZgJ0YM1BiZM9AaAyYRIpMTf9uVtMMgDBg0DvMkH1Y241i1OagP6qkY6xglaYEAEL8xpDZ9VYmjg68ZkwU+h2H8yePUV7ykgNUyozz6l5b2ZZ2cq2+DKInDvx9M2vZXvsJJbYPLWRQpZUOE0m68G7JWE2PmRgXWreUkQ8XpQnHN0DTUviFZDYjeZNrf/7N0zFYj4eGqbXTAWue1b2NsZhV4XBWsuZOe3O+bjZiOdfEhrkhYnrsILZsM0IEQrat7gLBDWcse48BDPDpyL3sjnagLe06gN2ZgzCrxRD209ezl5U2KQB0a6VQWuJQVrp+9qHFcabmubuoDS22zk2uD9uNfjVz09lTZ/uKZ1CKV4WyKsT80gXv0WY9UyMOdfCOte0Mo/py0CcM7f4ZQ2miY9CP3ApnD3lQAP4AD1WDyqKWJ0JP7CBwSTOIpBnuLoNgIiVUnB0sHW+/ZqidAdcJV8fuOObaZ34LdAoqjFugFeDrbiwAh2S1l5fTeYX3Um3+cMn8gP7ErfBGSlCwJyWh8ot8dn9PFIvNq4QRbg== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: fda12fa3-ded3-4201-5c2e-08dcb693da5c X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB6016.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2024 03:48:53.0580 (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: atkn5X3Oz63cxjeO7utY4oOrzSOiAAH3VM523NCP6FQOaxoT5tb8s7buWK+xDc+O1QCkMwU8ADawOpy9mWyjnpcqdxVB60JiEDDThoHJbDs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSCPR01MB12849 Subject: [FFmpeg-devel] [PATCH v8 3/3] avcodec/jpeg2000dec: Fix HT decoding 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: pySFwzbv77A8 This commit fixes wrong treatment of MAGBP value in Ccap15 and bugs in HT block decoding. Signed-off-by: Osamu Watanabe --- libavcodec/jpeg2000dec.c | 11 +-- libavcodec/jpeg2000htdec.c | 144 ++++++++++++++++++++++--------------- libavcodec/jpeg2000htdec.h | 2 +- 3 files changed, 93 insertions(+), 64 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index d13eedfaf7..2e09b279dc 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -391,6 +391,9 @@ static int get_siz(Jpeg2000DecoderContext *s) } else if (ncomponents == 1 && s->precision == 8) { s->avctx->pix_fmt = AV_PIX_FMT_GRAY8; i = 0; + } else if (ncomponents == 1 && s->precision == 12) { + s->avctx->pix_fmt = AV_PIX_FMT_GRAY16LE; + i = 0; } } @@ -2204,7 +2207,7 @@ static inline int tile_codeblocks(const Jpeg2000DecoderContext *s, Jpeg2000Tile Jpeg2000Band *band = rlevel->band + bandno; int cblkno = 0, bandpos; /* See Rec. ITU-T T.800, Equation E-2 */ - int magp = quantsty->expn[subbandno] + quantsty->nguardbits - 1; + int M_b = quantsty->expn[subbandno] + quantsty->nguardbits - 1; bandpos = bandno + (reslevelno > 0); @@ -2212,8 +2215,8 @@ static inline int tile_codeblocks(const Jpeg2000DecoderContext *s, Jpeg2000Tile band->coord[1][0] == band->coord[1][1]) continue; - if ((codsty->cblk_style & JPEG2000_CTSY_HTJ2K_F) && magp >= 31) { - avpriv_request_sample(s->avctx, "JPEG2000_CTSY_HTJ2K_F and magp >= 31"); + if ((codsty->cblk_style & JPEG2000_CTSY_HTJ2K_F) && M_b >= 31) { + avpriv_request_sample(s->avctx, "JPEG2000_CTSY_HTJ2K_F and M_b >= 31"); return AVERROR_PATCHWELCOME; } @@ -2234,7 +2237,7 @@ static inline int tile_codeblocks(const Jpeg2000DecoderContext *s, Jpeg2000Tile ret = ff_jpeg2000_decode_htj2k(s, codsty, &t1, cblk, cblk->coord[0][1] - cblk->coord[0][0], cblk->coord[1][1] - cblk->coord[1][0], - magp, comp->roi_shift); + M_b, comp->roi_shift); else ret = decode_cblk(s, codsty, &t1, cblk, cblk->coord[0][1] - cblk->coord[0][0], diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c index 9b473e11d3..c47c8d61fe 100644 --- a/libavcodec/jpeg2000htdec.c +++ b/libavcodec/jpeg2000htdec.c @@ -122,7 +122,7 @@ static void jpeg2000_init_mel(StateVars *s, uint32_t Pcup) static void jpeg2000_init_mag_ref(StateVars *s, uint32_t Lref) { - s->pos = Lref - 2; + s->pos = Lref - 1; s->bits = 0; s->last = 0xFF; s->tmp = 0; @@ -145,9 +145,10 @@ static void jpeg2000_init_mel_decoder(MelDecoderState *mel_state) static int jpeg2000_bitbuf_refill_backwards(StateVars *buffer, const uint8_t *array) { uint64_t tmp = 0; - int32_t position = buffer->pos - 4; uint32_t new_bits = 32; + buffer->last = array[buffer->pos + 1]; + if (buffer->bits_left >= 32) return 0; // enough data, no need to pull in more bits @@ -157,9 +158,24 @@ static int jpeg2000_bitbuf_refill_backwards(StateVars *buffer, const uint8_t *ar * the bottom most bits. */ - for(int i = FFMAX(0, position + 1); i <= buffer->pos + 1; i++) - tmp = 256*tmp + array[i]; - + if (buffer->pos >= 3) { // Common case; we have at least 4 bytes available + tmp = array[buffer->pos - 3]; + tmp = (tmp << 8) | array[buffer->pos - 2]; + tmp = (tmp << 8) | array[buffer->pos - 1]; + tmp = (tmp << 8) | array[buffer->pos]; + tmp = (tmp << 8) | buffer->last; // For stuffing bit detection + buffer->pos -= 4; + } else { + if (buffer->pos >= 2) + tmp = array[buffer->pos - 2]; + if (buffer->pos >= 1) + tmp = (tmp << 8) | array[buffer->pos - 1]; + if (buffer->pos >= 0) + tmp = (tmp << 8) | array[buffer->pos]; + buffer->pos = 0; + tmp = (tmp << 8) | buffer->last; // For stuffing bit detection + } + // Now remove any stuffing bits, shifting things down as we go if ((tmp & 0x7FFF000000) > 0x7F8F000000) { tmp &= 0x7FFFFFFFFF; new_bits--; @@ -176,13 +192,11 @@ static int jpeg2000_bitbuf_refill_backwards(StateVars *buffer, const uint8_t *ar tmp = (tmp & 0x0000007FFF) + ((tmp & 0xFFFFFF0000) >> 1); new_bits--; } - - tmp >>= 8; // Remove temporary byte loaded + tmp >>= 8; // Shifts away the extra byte we imported /* Add bits to the MSB of the bit buffer */ buffer->bit_buf |= tmp << buffer->bits_left; buffer->bits_left += new_bits; - buffer->pos = FFMAX(0, position); return 0; } @@ -406,6 +420,7 @@ static void recover_mag_sgn(StateVars *mag_sgn, uint8_t pos, uint16_t q, int32_t E[n] = 32 - ff_clz(v[pos][i] | 1); mu_n[n] = (v[pos][i] >> 1) + 1; mu_n[n] <<= pLSB; + mu_n[n] |= (1 << (pLSB - 1)); // Add 0.5 (reconstruction parameter = 1/2) mu_n[n] |= ((uint32_t) (v[pos][i] & 1)) << 31; // sign bit. } } @@ -414,7 +429,7 @@ static void recover_mag_sgn(StateVars *mag_sgn, uint8_t pos, uint16_t q, int32_t static int jpeg2000_import_bit(StateVars *stream, const uint8_t *array, uint32_t length) { int cond = stream->pos < length; - int pos = FFMIN(stream->pos, length); + int pos = FFMIN(stream->pos, length - 1); if (stream->bits == 0) { stream->bits = (stream->tmp == 0xFF) ? 7 : 8; stream->pos += cond; @@ -426,14 +441,22 @@ static int jpeg2000_import_bit(StateVars *stream, const uint8_t *array, uint32_t static int jpeg2000_peek_bit(StateVars *stream, const uint8_t *array, uint32_t length) { + uint8_t bit; + if (stream->bits == 0) { - int cond = stream->pos < length; - int pos = FFMIN(stream->pos, length); - stream->bits = (stream->tmp == 0xFF) ? 7 : 8; - stream->pos += cond; - stream->tmp = cond ? array[pos] : 0xFF; + stream->bits = (stream->last == 0xFF) ? 7 : 8; + if (stream->pos < length) { + stream->tmp = array[stream->pos]; + stream->pos++; + } else { + stream->tmp = 0; + } + stream->last = stream->tmp; } - return (stream->tmp >> stream->bits) & 1; + bit = stream->tmp & 1; + stream->tmp >>= 1; + stream->bits--; + return bit; } static int jpeg2000_decode_mel_sym(MelDecoderState *mel_state, @@ -994,39 +1017,18 @@ static void jpeg2000_calc_mbr(uint8_t *mbr, const uint16_t i, const uint16_t j, const uint32_t mbr_info, uint8_t causal_cond, uint8_t *block_states, int stride) { - int local_mbr = 0; - - local_mbr |= jpeg2000_get_state(i - 1, j - 1, stride, HT_SHIFT_SIGMA, block_states); - local_mbr |= jpeg2000_get_state(i - 1, j + 0, stride, HT_SHIFT_SIGMA, block_states); - local_mbr |= jpeg2000_get_state(i - 1, j + 1, stride, HT_SHIFT_SIGMA, block_states); - - local_mbr |= jpeg2000_get_state(i + 0, j - 1, stride, HT_SHIFT_SIGMA, block_states); - local_mbr |= jpeg2000_get_state(i + 0, j + 1, stride, HT_SHIFT_SIGMA, block_states); - - local_mbr |= jpeg2000_get_state(i + 1, j - 1, stride, HT_SHIFT_SIGMA, block_states) * causal_cond; - local_mbr |= jpeg2000_get_state(i + 1, j + 0, stride, HT_SHIFT_SIGMA, block_states) * causal_cond; - local_mbr |= jpeg2000_get_state(i + 1, j + 1, stride, HT_SHIFT_SIGMA, block_states) * causal_cond; - - local_mbr |= jpeg2000_get_state(i - 1, j - 1, stride, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i - 1, j - 1, stride, HT_SHIFT_SCAN, block_states); - local_mbr |= jpeg2000_get_state(i - 1, j + 0, stride, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i - 1, j - 1, stride, HT_SHIFT_SCAN, block_states); - local_mbr |= jpeg2000_get_state(i - 1, j + 1, stride, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i - 1, j + 1, stride, HT_SHIFT_SCAN, block_states); - - local_mbr |= jpeg2000_get_state(i + 0, j - 1, stride, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i + 0, j - 1, stride, HT_SHIFT_SCAN, block_states); - local_mbr |= jpeg2000_get_state(i + 0, j + 1, stride, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i + 0, j + 1, stride, HT_SHIFT_SCAN, block_states); - - local_mbr |= jpeg2000_get_state(i + 1, j - 1, stride, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i + 1, j - 1, stride, HT_SHIFT_SCAN, block_states) * causal_cond; - local_mbr |= jpeg2000_get_state(i + 1, j + 0, stride, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i + 1, j + 0, stride, HT_SHIFT_SCAN, block_states) * causal_cond; - local_mbr |= jpeg2000_get_state(i + 1, j + 1, stride, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i + 1, j + 1, stride, HT_SHIFT_SCAN, block_states) * causal_cond; - - *mbr |= local_mbr; + uint8_t *state_p0 = block_states + i * stride + j; + uint8_t *state_p1 = block_states + (i + 1) * stride + j; + uint8_t *state_p2 = block_states + (i + 2) * stride + j; + + uint8_t mbr0 = state_p0[0] | state_p0[1] | state_p0[2]; + uint8_t mbr1 = state_p1[0] | state_p1[2]; + uint8_t mbr2 = state_p2[0] | state_p2[1] | state_p2[2]; + *mbr = mbr0 | mbr1 | (mbr2 & causal_cond); + *mbr |= (mbr0 >> HT_SHIFT_REF) & (mbr0 >> HT_SHIFT_SCAN); + *mbr |= (mbr1 >> HT_SHIFT_REF) & (mbr1 >> HT_SHIFT_SCAN); + *mbr |= (mbr2 >> HT_SHIFT_REF) & (mbr2 >> HT_SHIFT_SCAN) & causal_cond; + *mbr &= 1; } static void jpeg2000_process_stripes_block(StateVars *sig_prop, int i_s, int j_s, @@ -1051,15 +1053,27 @@ static void jpeg2000_process_stripes_block(StateVars *sig_prop, int i_s, int j_s modify_state = block_states[(i + 1) * stride + (j + 1)]; modify_state |= 1 << HT_SHIFT_SCAN; if (mbr != 0) { - modify_state |= 1 << HT_SHIFT_REF_IND; + modify_state |= 1 << HT_SHIFT_REF_IND; bit = jpeg2000_peek_bit(sig_prop, magref_segment, magref_length); - modify_state |= bit << HT_SHIFT_REF; - *sp |= bit << pLSB; + modify_state |= bit << HT_SHIFT_REF; + *sp |= bit << pLSB; *sp |= bit << (pLSB - 1); // Add 0.5 (reconstruction parameter = 1/2) } jpeg2000_modify_state(i, j, stride, modify_state, block_states); } } + // decode sign + for (int j = j_s; j < j_s + width; j++) { + for (int i = i_s; i < i_s + height; i++) { + uint8_t bit; + int32_t *sp = &sample_buf[j + (i * (stride))]; + uint8_t *state_p = block_states + (i + 1) * stride + (j + 1); + if ((state_p[0] >> HT_SHIFT_REF) & 1) { + bit = jpeg2000_peek_bit(sig_prop, magref_segment, magref_length); + *sp |= (int32_t)bit << 31; + } + } + } } /** @@ -1130,7 +1144,8 @@ jpeg2000_decode_magref_segment( uint16_t width, uint16_t block_height, const int uint16_t height = 4; uint16_t i_start = 0; int32_t *sp; - + int32_t bit; + int32_t tmp; jpeg2000_init_mag_ref(&mag_ref, magref_length); for (int n1 = 0; n1 < num_v_stripe; n1++) { @@ -1141,9 +1156,13 @@ jpeg2000_decode_magref_segment( uint16_t width, uint16_t block_height, const int * Rec. ITU-T T.814, Figure 7. */ sp = &sample_buf[j + i * stride]; - if (jpeg2000_get_state(i, j, width, HT_SHIFT_SIGMA, block_states) != 0) { - jpeg2000_modify_state(i, j, width, 1 << HT_SHIFT_REF_IND, block_states); - *sp |= jpeg2000_import_magref_bit(&mag_ref, magref_segment, magref_length) << pLSB; + if (jpeg2000_get_state(i, j, stride, HT_SHIFT_SIGMA, block_states) != 0) { + jpeg2000_modify_state(i, j, stride, 1 << HT_SHIFT_REF_IND, block_states); + bit = jpeg2000_import_magref_bit(&mag_ref, magref_segment, magref_length); + tmp = 0xFFFFFFFE | (uint32_t)bit; + tmp <<= pLSB; + sp[0] &= tmp; + sp[0] |= 1 << (pLSB - 1); // Add 0.5 (reconstruction parameter = 1/2) } } } @@ -1153,9 +1172,13 @@ jpeg2000_decode_magref_segment( uint16_t width, uint16_t block_height, const int for (int j = 0; j < width; j++) { for (int i = i_start; i < i_start + height; i++) { sp = &sample_buf[j + i * stride]; - if (jpeg2000_get_state(i, j, width, HT_SHIFT_SIGMA, block_states) != 0) { - jpeg2000_modify_state(i, j, width, 1 << HT_SHIFT_REF_IND, block_states); - *sp |= jpeg2000_import_magref_bit(&mag_ref, magref_segment, magref_length) << pLSB; + if (jpeg2000_get_state(i, j, stride, HT_SHIFT_SIGMA, block_states) != 0) { + jpeg2000_modify_state(i, j, stride, 1 << HT_SHIFT_REF_IND, block_states); + bit = jpeg2000_import_magref_bit(&mag_ref, magref_segment, magref_length); + tmp = 0xFFFFFFFE | (uint32_t)bit; + tmp <<= pLSB; + sp[0] &= tmp; + sp[0] |= 1 << (pLSB - 1); // Add 0.5 (reconstruction parameter = 1/2) } } } @@ -1197,7 +1220,7 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c int32_t n, val; // Post-processing const uint32_t mask = UINT32_MAX >> (M_b + 1); // bit mask for ROI detection - + uint8_t num_rempass; const int quad_buf_width = width + 4; @@ -1233,6 +1256,9 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c } Dcup = cblk->data; Dref = cblk->data + Lcup; // Dref comes after the refinement segment + + cblk->data[cblk->length] = 0xFF; // an extra byte for refinement segment (buffer->last) + S_blk = p0 + cblk->zbp; cblk->zbp = S_blk - 1; pLSB = 30 - S_blk; diff --git a/libavcodec/jpeg2000htdec.h b/libavcodec/jpeg2000htdec.h index 572d095c92..8d6919a0de 100644 --- a/libavcodec/jpeg2000htdec.h +++ b/libavcodec/jpeg2000htdec.h @@ -29,6 +29,6 @@ int ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, Jpeg2000T1Context *t1, Jpeg2000Cblk *cblk, int width, - int height, int magp, uint8_t roi_shift); + int height, int M_b, uint8_t roi_shift); #endif /* AVCODEC_JPEG2000HTDEC_H */