From patchwork Mon Jun 24 13:37:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Osamu Watanabe X-Patchwork-Id: 50128 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2015798vqz; Mon, 24 Jun 2024 06:38:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUDOv3UdPsR/r355+8ggH+Sn+Tv+DJQN9HsadQrjyMbkYQGlKXO0XmU9uDy22+ODLK1v97FX10f7idfXMAiBxjb1+seuayTcua//Q== X-Google-Smtp-Source: AGHT+IGDOTcyMJShaxLV0lUKyuLWIixzC/6rkWUkNtRc5YhxqZRLmwU/MY4zO6iwYDE+MOjpdSgC X-Received: by 2002:a50:cdc2:0:b0:57d:2207:a55 with SMTP id 4fb4d7f45d1cf-57d49cb2f8emr2750123a12.15.1719236303101; Mon, 24 Jun 2024 06:38:23 -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-57d306437d0si3661150a12.173.2024.06.24.06.38.22; Mon, 24 Jun 2024 06:38:23 -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="u0Iy/fgU"; 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 B579168D607; Mon, 24 Jun 2024 16:38:04 +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 68E3B68C0DC for ; Mon, 24 Jun 2024 16:37:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KdUIxS7pkgpD0RX2brBE3pTHREo5xhCEAd8Hlt6T08nIXo3cc+AKq7QlDRhuMnMi+w0nB0UhCAdD+tOkkXfmfDWlomc4zg2dHWE7BImFMkCKDjt30x8wbnyBcgAZsTqs9t17gMRJ4TUnGW7Eet/VP5PJ3Q2o6HOruzywfdvQHh5wxJYNFwUGa6suXrEXWmgWkeKrxlfI6Xci0arBGHpTjTj6u8njkkK0hmyfHvmYJWta41Zrp/9TmV64pIONzeKx8riAbl0qE38dZTu8nKVHqVXF22XhdJVp40d04qMqOg4ZfgQ1yDCZ72QrSmp0ocdTequZl8GgMF1T4HSzPoOShg== 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=GZLegjX3bnxVD7DybqK0AZSgi+l/DLj49upmJS8S328=; b=fdm7euisHD4OGutPxNIEdc/yyRTDio/rYwl1hnWYSdG4srWKFvDWY2Y/UDdJYDQk3OGNPThqg0aJ2Hj/bDqxv5TCocog5NvqaxO1OitJC8truo1k62mIKePyV3lALaDI9DxvE4IdGmRhQwvINwiUgLRHpPmW1k0Co8u0eReiohUAlsk73C3c6JrXOco5lZypYdtfbVp5tG4FuW8Kf8MsMuk9dEcU+2d9HXAHeIPNCq9aME6wtuvSBoWdL0a6X9NUuIupJw4FZFt+KIFGiv4n/3TOURLU1z24NYvySOcLCEs2AdP3pbLmtlcm6magK7IKmnaMk4i5M8SO2bHQtDqgEQ== 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=GZLegjX3bnxVD7DybqK0AZSgi+l/DLj49upmJS8S328=; b=u0Iy/fgUkGvWHRvGxuBF0PVWQx8b9jZCik5HUP7AXkFaJeQp9mSxVZf5e1eA7PpslPe/2lPg1s09RmLIJ/pEILzRzDV3DP4hmwlUY4WJBU67wJ1la/qAU6MKcAibQJXpAnVOaRpU1AnxvZfZq658rCexMh8CBxUuKAwFqxivk8g= 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:45 +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:45 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 22:37:34 +0900 Message-Id: <20240624133734.3032409-3-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240624133734.3032409-1-owatanab@es.takushoku-u.ac.jp> References: <20240624133734.3032409-1-owatanab@es.takushoku-u.ac.jp> X-ClientProxiedBy: TYAPR01CA0059.jpnprd01.prod.outlook.com (2603:1096:404:2b::23) 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: 47620c24-ee4e-4854-dfa8-08dc9452d3d7 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: Hz7uyKV0qrvFhKysVSuzAq7HNWYVGfu0kXd8AGtTCFSx5na25mIJRay13dicSJyZo9JyG9eCEWQUeS0hRZCggGYyBd5D3ttJwWAhX4CbPjeCr55DKkhuIaBoBgSYYn7jCBa6IvaGJZ1QthNvImcBBT4rwo4NGKvCd9k8YksS8bC+FetRr2JnQLJ5RQirBNng/4KzQSrUWXi8IPmvQb1mJjuWhFrYKkMhrSGuNbgi4iVBqEwal19DHIcfga/cxrs7WxGa09PXulhkuo7D1Ie2uDMZbZuzkG7A4D+MUvvtJdZYySsUyULVWNwjM4nYFgpEX9mEFrOhhFRuq7eAqwviBiXUx/695QuLLlwop4pfHOnZRMTCK0Za/JTTBZSwm7aEEEtnjIWkcUfE/hU2S4hVAgye1uPLXeZ58bwXB1SWNvvOEyzns1E2fv2eIxRAcoExuZJOcjvZK+Kj0xO4kjw5Ts46gmdNv6AObhCADRmUVgbOeLgdixRXsFQfAZab4qjrnmxSsWmyYzvWXNgkmL2zGmDIF0e2jzEEpJSMDDbM96t4rpqOPEKkdhL7/lJ7ECfuYQly/J1+dbi9LhO0nRuh++JL2AkIi+arklOLHI9y9hxOTcFOfF+fIYe6JyTafzRBd2hsPAO1d1FlVJPixCjREvO4Hj3Asqxj68fQaEtcDikz+durxn/PE9OXkE1W6TZJVPSiDznRqymIkVrizmLP6bcHv1a2fGaPQ0tvA/rlDyP10nbrvyjhT39qCTKRkR0SIErdOrNCLRpNmeHktPYsQen2vsO4jsmkIq14VRKO1sDiWrUQPgUjeOCvVsKvkxteimeNAiibKHaOKuK5WKT7vb+CG47nFN0RgDvobYHh+PvEb1POJMcSpiDGGf4TbRgTkFU3m+innA0cm6sjdo83lw8qEuC1JQR8j6Wmgsp/uNgQkH4XgIZzCkAsHrCQ9/RqGbVxD48rX+CtWNAuw3y3T0FfkHvBSDhHAMuGM2Lp4l98blvsQLSxPFqtfQ6o8NLcTgQVQGfHi/ZfW9v6P4hc5TZAYj/Udi1IPhtRPXx6DMaGoLz4BbGNvE5pnmWnK1C+Py5xGCCf8cmX194Oa7n4L06r90dRBZglU5384gLtbaYNPBhkRZfT2CEDZIpVzg9le68+0vUlcNGo0w/5hE9D5r99c8ByEoFUbM/CTtq18+gqxT1vYUsCpPBggss0nV1o+u9SEorWoiiefTg0kbYHjMWzqR/OAOB3fQ5N+vmgvfWuNbG10sempgefdCK/8W1ysEDHORj2R46H3KYxqYUR+SCzXaaAggKJogN6kgDoOyf0k9RVV27i2O/HhZSl2EkBp03r+eUJjlpUVh4L8C2AVeULSco/5Lg+70NE9CWCAMg= 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: Cvg8RlIcLRJz/4fkLIqGus/uAihXjxjn5UOIIdM5UxGffvsWpFwyD1crnkn+Oj46Ak8KULHQR4nhVRaJ+NZA4SY3CjkTupFJSKVpOB2rJxBhOVrkJkrY6k0dZODROKrZjBMVHHnjhmzgCrXGSaexAuUK7GNQxcRmDapTsR4TTjvHPLk9CEb8zWNop0n8ekywD3wcuZGVUOopCqzOKLBoLhc5cHj+psOOgQS9kwEZ5SO9Sh9DkjPaChbWEhvFjtvU0b5SBxw5C9dTKF6vQ29BsHZJY/8Y+2nfZ3D9A8RKTGlzf+i1e6lDabRyzRpbG847IEvwVUZlz2H82n8GP4/OdlUnWbyOQRNvS+lIA5NPm9+iziMi8xvfqxflfXp2I/hdzxKuf2RklJy5zn/WYm11tCycuKlvcf26RRoESdMIrY0O8TEUcklPsrcsfPxEAm4YKy96WSL9hZK169Lx2Ya7CHjDPrqUUWxrJ+sLJH27QeT8iZEVuzl17epnOfxHP12tKvdsTdTTrQUOd/nmIzjvbdK/ns/ti7Kbt07XdxMebh1pSN1VNBoFKnfctUBzPV7WipQuBD3IwRjmQtfHCgIn2LQcn40NRnMdW7txzBcE8CGz1SRRKRux4kDUkugzZ6JiU7EpH1bLeN3h1Iq+9JvsiSwd1umsaPuHVYWkAIVpwZaxDMZ4dplW8eBuaTARpjEaXz4oWm9JzJJgW5EwVNghmSeR3EZM/tBo1Da5mnxMSs63bujpXC95/NhTVXZx75J90pbgpaRs4mC/gT91VOc7xJV0O40R1OXrtQRcFyV7TzBFiUMd/yhmVwaRJELxw6ReC9dv9rjWD4zgj+8N8QCqRSbvdp5bGAQKXeqk1uvliOU7ozg+KGAE1BDPfN+255x3GFM1XO29lLRR8mZcY/zfIvUhg/MKokMxQtY1Yi3XEbtAIsU/MgH4V9uXAut4IT3WZLPNZdnfjbNLN/6+eWaVYBfkg9dTwm5lMhwHd6ewEMsuYG4jbOfoMp8/obRObXbLTdFqsbylddFynmj+UKjK9YAEXlcVOtOsRSHPv2NCKchMjEiSCKdzf9vzu+/3bp+uPrLLaBXAsyZrpZ4Y//8CZlUVH2QK7i+6I9rdcqAmlpCgKqsxsBo3WoE9PhhTPHwI22uQTLqTn249dkTE8mpRvIw48/Ni3le+r9otNWcPU124wLNIlRUXh0zai1m2tQWRaESXahAP/PtsqWStTvLZcHUFR1Mx+vdKLFbvRsWhMkCs6RXUHSGZLCrQemdA2IINdcVxuEA9mlso5/04IQ7calpMeadY5MyI9ZsS2UOHRftD0o7HAzYo/DXxa3iR0V4sWWdAfpDzXwXjO+bFvSs2IIEWJ/KxymYEO11ydwtzO4NBf4JZLhNF6mGsclsI6ChxcnJYeS+u8wRFZ1aFCKIC7frE7oNSPnCbzxLLQztNEfecDa7wBDV3Gt4Svt+1MCJZurLVuHGVSKRu85BCFKoloIug4wVVOAdm72VQESTzjWomob+r+N4LN39jF8oX1Lw7myNjr6SlrkcypoNgFOp1/iSIlek3dTHxi2ZE2u8NXSrH6AwuYYbEl3AQ/WKVI+VZeSJSXISem5RZDIUIif6Lzg== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 47620c24-ee4e-4854-dfa8-08dc9452d3d7 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:45.3242 (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: ati8001crOtLWxGn+s4pWArwygH4MHTGhO3770gSGnsBuf1DfLfKCWPBYWdNfbOeIOpqiRrofL4H+kSeGhmWtDzV51gmJ9X4u63aUj4fmAI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9396 Subject: [FFmpeg-devel] [PATCH v4 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: pFX3xdNgVWGN 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 | 136 ++++++++++++++++++++++--------------- libavcodec/jpeg2000htdec.h | 2 +- 3 files changed, 89 insertions(+), 60 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 2c66c21b88..83cd5dbc7c 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..0296792a6a 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, @@ -1060,6 +1062,18 @@ static void jpeg2000_process_stripes_block(StateVars *sig_prop, int i_s, int j_s 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) } } } @@ -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 */