From patchwork Thu Aug 1 01:52:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Osamu Watanabe X-Patchwork-Id: 50843 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp849559vqs; Wed, 31 Jul 2024 18:53:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUX49SMCUvBE+QWFhsOJmZykzkZ6J8U8fI9yj+Q6gsFL4fPAxi+tzMhv//a+MbxiUEJaTUUOPTkzZtVO/O0Vbr9ftwjCXn4eqB9Uw== X-Google-Smtp-Source: AGHT+IH90MDzhseK3L5TygtT9mKG051hr9Mt69nhzTK0vo2OhDLN7TIxLNGaUEOIlNZyjQHVDEkD X-Received: by 2002:a17:907:8694:b0:a75:2781:a5c4 with SMTP id a640c23a62f3a-a7daf4fdd69mr46417966b.29.1722477208076; Wed, 31 Jul 2024 18:53:28 -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-a7acacc12e9si984222566b.914.2024.07.31.18.53.27; Wed, 31 Jul 2024 18:53:28 -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="n1/b1/wF"; 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 E1DF068D8AE; Thu, 1 Aug 2024 04:53:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11020123.outbound.protection.outlook.com [52.101.229.123]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CCB368D8AE for ; Thu, 1 Aug 2024 04:53:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NK4l3jGMnbutaasQUiSstgx1mpxmNgM96U90BmxowOry0XboCNwUIOdhsN+4VGJrpRmHbOoCpy4hwSf5KJdfgLBOdYx3n34QjcL0iiY5ERFLv0bMPjEk9N3q4EwthrZHUoJER450MXGwugipEHkh9A0JxycKKR25KQ83Is3QTKpjMtVfs+3OsbtF9/rTImiRMzcBu3dMl5fq/7hgo+mLZNMJTeoxetHIrYifbjZEfZzfq33xB/4fD74cci+7O+33qG7FNhOsCU+54I4JiaaZ7ek2gfUYLIQqsM09hy43qq1AOHQYGVzXWeV+Be/lMy6NXBZReN7H4yF4WGw0b89n9g== 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=DonrbjQfLURNFvz7PLCKI+vGN8k0gtejQPFsct8eN44=; b=twXiUsyS5oCzjAf4hgMo8ttp8XV7YmGffwBugP/90IqN/h0l4uaThkt0Qs4pZdVMV8jOtj92WFA4xkxh4iv8pu5XZm3aMmJKYNrJM633RKWxt0ojjzjF06LdnsQZOEZ6Q1jhqXCQ9Gt6nwy/nzRTxiTSFM5WDVZljsreJdjsBBTozw+Caps2vvrptqq47NGTHoYPfzMSowweIhvff67YWaQWpB5ktIMsXAiJttB4b4HPMNJeKpXc2eQXyeNlkA5gLAfkkmXx0pjmDnRMAInmrM/flDM/XOOeM0UmG3/m08VW3IacYwqcp5kPbSB1+1QGEbq/mqqmDp2txqssLioEaQ== 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=DonrbjQfLURNFvz7PLCKI+vGN8k0gtejQPFsct8eN44=; b=n1/b1/wFzfrfub/+784uOkP2HN4uQHydxdjWL/4c+94d3kSON+DP9mgls+WkHDtq0WPerxsOzbRuHosNcqTk4kxrf2nfUqYEzB7qRK0xzY+0DIuyK/s2fDnogNS3TbODMQUvyBsZzV/tLcuGUa+rhdwpjDSY9jgDoMIj4urXIdE= 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 TYCPR01MB7011.jpnprd01.prod.outlook.com (2603:1096:400:be::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.21; Thu, 1 Aug 2024 01:52:56 +0000 Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc]) by OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc%3]) with mapi id 15.20.7828.021; Thu, 1 Aug 2024 01:52:56 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Aug 2024 10:52:35 +0900 Message-Id: <20240801015235.181022-3-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240801015235.181022-1-owatanab@es.takushoku-u.ac.jp> References: <20240801015235.181022-1-owatanab@es.takushoku-u.ac.jp> X-ClientProxiedBy: TYCP286CA0090.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::19) To OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS0PR01MB6001:EE_|TYCPR01MB7011:EE_ X-MS-Office365-Filtering-Correlation-Id: 99db06c3-d15e-49c2-e91e-08dcb1cca9ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|41320700013|1800799024|366016|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: 0bW6W3vJcwneK+efAtWu3Bs0CPDZ87mfkOOOJjzpmeFOfi8N1b1ZzZO7H/4FyST+7XEv9B6RG/+6/g6n0OFuf/UuWPbhTPmqcrwUtVnutXo1OUsII6mtezWtS9rgWnPtWBY9U3q95uNQA+6T1h2yggQ2DmEmwRIFbZeqsGRpASZ4jvghpRI8ShKDcx/efq3ozULytPHBzT8GolMeJdXPNNT6jvwluU9GXAaV7ug5o7zxH8rWFNdTqx/zihCe1unQVFMRzPleb99BtAGp0vA8Ej0yaWwpaWCUg/TB426/9yGgNL2yVKSw/lYAWKU8Z8SSNqD3mACxwb6xZGCncpQ4Sf2IPATxL1MzYMCV0T176OwKfZytTSFQ2ZRznk/5LEyi6YGrUzgvbvIpaX0hLGVEdIx2vy0KVm3FwNPpZ74Ejai2Dk+/9zxJjxtQAenp+mwCDh3vr7inHgt1RegTfM8MRNfKvagCMxwP8CIR3pEa3TEk0gbehCvwhqujXhXQgmxtxQtst0QxlIx/db3putAtTDyyoYgSDe9a9p3zoVz9UNM9iXXH8FhY3koOqjLgVAo4a6ar/dEY/9+LdRl7jx7KklNCmUqjeUFWD6o/VNyX8rl7B6Q/seFaxkiYtjCM0qByvGpdBk/ioD/0nQT30lZ5LgfOdIGiCGyAhGHK/7RDElojkjpssp8/FlLMuADz+Qfq8j1UXyIk3TZdxHPcdizkwNsn0JoSGVsGZenTc9kQeP80MK1H8OymXV19/GTAbDr7oh+nVlJA4nUG0heY9pStnN/SNi7NoHxCYaRX1YNzICliTsRWJd72I0Z+EGtj9QuanngQLUhthef6iUd5pHhO02tU7EiDChLw7wBqtCH1/m0F/k7NhwH/VCooRql2H3RwBWeabAyhiwXGR/+nxm9VCUMC4CGtLxrf36UxN5y5kHJQxLQhBR1nfY5j6khCn58X0UztklPNfwD3h8FqZp3mostu046SrFJ+x1nCTuvWSUpDVr8rsr+jZaiUYbmUbB2CTqy+JFzUp5w2MMjiGSL8LoDmBWStFE6goXJe7NKGxz+kM+ZjWFBwvlw92Wo2y3NzuRfL9aqMJViYqijecG6lvEPFdOcphR8I9lDCAxFC18OPmPy9Z07efSaFXCG5FMmipsLB8GoSkqeNXOpacFpw+G3uc5uazowQOyr6Edkkp7FfLXvE5uQlgoxVC/xUFL4VtZv9eXba2C/EaWvcV7/mI5VD+1hduceoyfC+HD/agskWTCd1R3S5unywS6QCgxyT+SRHmWTRM3IROJRIMqJYQoF4kP0bwc1Lj1DvCsDoZXV25Lx46GFkAayKkhIPj197ZPlXbJVD8lmKuFSmi0lW/Qak61z8paFsx7gEEeQZGix5p9pVs2jfw4XdyT15Ba22MGEr3ZSwcP/tYY9Fls5DPg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS0PR01MB6001.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(41320700013)(1800799024)(366016)(52116014)(376014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BiKWCMdxXLHYK2RC6dFv7G9TEup2KdMhwKE6RwR7Br8jEqQoHZCR1R08mBdUqM3Ybbkcorh4zOMZ/w427NeIR9AXduNe8u51OmHt8+LlQDLFd3LqjKWdqqy3zOyZ6cVYOYECAUUEDXopnV0pRJaOHxiARCbp0Rh/cfzhrfWwlXQUBnfIhNxT5zX2ZdONfOafT3VCrZflJOTULV5Xr9dJZ1GKqljw+3DlqklJyQuFIeQ0AdE2/+DLWS9lhHA8h4YgutYtlOSPqr1/VGCGLSTQ2tvYM+OUlqVkVJZ4HhiD+/S9DAHtFht2aDkEm9XkkDyn3bmkZwEIY5XaiwcL0wrDFVNNjXnkbsNHzRObkJh/qLVe+Iv46jSgg3472KI75xbb8gIz/1OlC7cqDcLQ/3bzQkuMPSp53LDeVMa9y9I4JeYUtUkduCWjAKxNQiUKmiBGP3IUTRy9iGWwbZdIVnUzXWgjnckxU9GpwnyOZrjeyqJIGCiG1J3peZ6KhOZPIKcDYGJIqdOfv2vByB7vvWJAfuVBwaCZ3A9YmI6MV4xt0PWXgt8Pu5kNLDyj4k2PldY8sNTNCKmsBgenDNMXrDXYH6DstcHVWa0FNC6XQbz1cIgQu9aijCTefiBQyUuaxdNBWdt4JidsnAKRE/4hxxGLy0P4B/Tql6R/RqXT8O5pXeGflEIhbWmiorYfA66incTaeNwMTcOGnKxbLii6bHvWxAj53Jl5OZ9SjVKHVk877hHGilWD4dYj0X6nHs8MMOGW6UTjU8b/bPjLDe6aJ1iy7UVHEXYus+CZWaFmUS3TMlPwhUGnUasFsGo8slHSg5J8PL9KPWBVv9GPbXlIL684qLPbv9njNwoY+qgqveEbnZqobSOQ4wTw/JWLZC7JRi774/kL78UHQdCSv/EKgQOtjiBnmyIJ74C3k7iXpokN71eYiRW3hrCdYR67pCnunSWA0Tq84PdR1F5bpNIw5us8YY45Q/qsmaqA0eRCvwVTFwXj0Cdjt0G/cjF1dtkXaUHy3Ij9QHd+Yb8T01MhlbzhuVxV3iyx0a1z5Hyqedw96Cjr2BqITFFQxYfYj8ehQd2sgtvNBhkE4+6I+w/SZabjlJ/7C3PmXsd+5rchdwIckg4TBTZGznuksM2EPljpfWqpXaD8/Pl3AkLVIv+xzR/c2OC5mjBpQR7c0a0mYBNmpwsH7a59Cp6AdpjpgJvkjihWG9DotL5YCvTgDS+W3VQcQIzjO3wyb19HgfpA+bbobSw2c2DkjbhcN1awVM7nsj8Lx/7UtzFH0VbmYqHKJF9dfUVuEOve0BEGjt02mWl0FQjhrtJqMxUbe8+IDUxoDd0PbSXOt0uRc5XH442tOzdcoLdcyExR6cAla2966V65qwQ6hOuKWTUppZLCvnBRoY/qoJvbudOEiPkQkw+rhu9SWA0XLnjymjX7AN0+HS5ipQGdbiLzoDQ99Uo9dyIRoZvwNqRmAfR52ilckPHxsbY2cbCpZE6g6ZbFJmdvLY/+8xwCVY3S2uYosQsBuKrraPvMttrRBSHqkttn8DGysUhZecjRJSn+PlmbIe28nzDYjylLGzz9dYveClCfbQix1SuEhgFRaRt0//OwhN4YGn7kYQ== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 99db06c3-d15e-49c2-e91e-08dcb1cca9ad X-MS-Exchange-CrossTenant-AuthSource: OS0PR01MB6001.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2024 01:52:56.8767 (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: HnXqzqiWACrjkegtZfTdP1Ktdfw9xHMLCMc+XmEs2R14iUykjdTMnfWBk/OlqCxX0aDjkIzxtrJ6bAuHQvxS46nqHNa4k+ACzetYcO2enY0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB7011 Subject: [FFmpeg-devel] [PATCH v5 3/3] This commit fixes wrong treatment of MAGBP value in Ccap15 and bugs in HT block 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: FjXw9xGRCbt4 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 00ff9bea6f..6653fc1ab4 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 */