From patchwork Mon Jun 24 13:37:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Osamu Watanabe X-Patchwork-Id: 50126 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2015536vqz; Mon, 24 Jun 2024 06:37:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVHAn3W5ip8leeIdl+m/e3su+eTa+Vaw0dhoaLfWnP/+RGqoQ4p1P68vLxxTGaBvAQMVNVhQZman7uuc/ODT8cvWsa00Bx5E7r93w== X-Google-Smtp-Source: AGHT+IFic+TFHY1FKWIuL6kQ1RV6607Ni2fsAwMMolyT4k+V1LaL2CvSGPGcZG+3yX+jeMdAuOAk X-Received: by 2002:a2e:a411:0:b0:2ec:543f:6018 with SMTP id 38308e7fff4ca-2ec5b345e77mr27306901fa.25.1719236279529; Mon, 24 Jun 2024 06:37:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ec4d76f61fsi20744471fa.461.2024.06.24.06.37.59; Mon, 24 Jun 2024 06:37:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@takushoku.onmicrosoft.com header.s=selector2-takushoku-onmicrosoft-com header.b=MEZ+FG2t; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 71E21680276; Mon, 24 Jun 2024 16:37:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2123.outbound.protection.outlook.com [40.107.114.123]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A76A8680276 for ; Mon, 24 Jun 2024 16:37:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pd2Zw/RH6D5JfqN2SC3lctEaeo6BivS8zC6eiwV3oNzyonyVeCaikdzazt89ZimI4QOrodkOL1i8ZCjoyJXvaLMxX1YhX8stfiQqpKq9eJBq9KJUcQoLVt2j3LoKkkjxdS+4Jkcq/jvad62fXSY2GbDaZKX34SvjjfVyFGYsGYIA5OAEr2JHjp6tdILZN39XzdhiZ3WTvHrR89DqsIlUqyyK9fp3/8sna3Au47vDXkuPClYPHFEjFjS9hRJoipczd5TT6ZYnBRtM7jQTWXPCgKKOjFa4DsH18P70r/AIqO8hQLRqWgYnDBYqnyxXpa+ILUQMapA6q69ByUyXy92rgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TyoDZXpZgRk4RBDjWueK3jgg2S92wNQX2tVkXeumGlI=; b=iiAF7mPWcJzFg+lBnPq+SLxo4CM0HTef4zvg3RKFOqZk19OdCvmaIMmCd2iyLdmGMiyVZviKnGatN8gNNqCgnZtfbkymf/WpSwA66sP6rpQEhpGsGnuS+Nmc1hHYR/iT8WunsrKBP6nZ6DdDoAUjYu0YrNlbVhQveGGZT6RPjffETttpzHUdDdwzTr4I/N5iRS7QkHaIAAMxJukAuyzXlzePsF5awps2D/AHblWFDrLq+LDLnhuNk8Cl7Ar6mzNgkmFll+hBEAZgmq4WACZQv7cye7iH+XZB9hiUzvBSF994uswJI0vgldbBZdARfYF/Lal3HfLuHJYlkcWR7rljDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=es.takushoku-u.ac.jp; dmarc=pass action=none header.from=es.takushoku-u.ac.jp; dkim=pass header.d=es.takushoku-u.ac.jp; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=takushoku.onmicrosoft.com; s=selector2-takushoku-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TyoDZXpZgRk4RBDjWueK3jgg2S92wNQX2tVkXeumGlI=; b=MEZ+FG2tW9vkeO0UYNygONam+lKsr0yFQZY69y0GGvszfOS2ByirxDBejI1MLwArLq6BJ79JvL3iS1lgl26vzz+9pHiW1mvOSEx4Jsb39dJval2ky2rkNlPGa3yZddijRCEzyzF8gSzYLozHO/7mJj1IOeQpC7fUm6uHc+pe5j0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=es.takushoku-u.ac.jp; Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) by OS3PR01MB9396.jpnprd01.prod.outlook.com (2603:1096:604:1cc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.28; Mon, 24 Jun 2024 13:37:40 +0000 Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc]) by OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc%6]) with mapi id 15.20.7698.025; Mon, 24 Jun 2024 13:37:40 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 22:37:32 +0900 Message-Id: <20240624133734.3032409-1-owatanab@es.takushoku-u.ac.jp> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TYCP286CA0087.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::18) To OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS0PR01MB6001:EE_|OS3PR01MB9396:EE_ X-MS-Office365-Filtering-Correlation-Id: fbafb634-19ed-4a34-8a4d-08dc9452d0aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230037|376011|41320700010|366013|52116011|1800799021|38350700011; X-Microsoft-Antispam-Message-Info: ng858m1eiP3JPS1PxdF4eDobnjtuOiiS0coJbSVLnOBIxZxqOEKwReGcHXew9776mFZePbrXKvhRFg/Vnk8njHqveNCovJzOsdIQEKZFDkw3UZpWenr+6cPYVDxbOc7JEKD45IgOXQ26axoMvDEzb9kX+UUwOQGA+APnigt3sMC9ng7MHZZb6aUJCgXZlZ3c5nAHXH8YJMutt7LBRY5ihSsnd0ej/avyXiDdPaiU00f1qxevskVnOQTaYTjY7OtfnfxsJ/O1ICTumkVkcdtKhqPlIkNDLpV6n6Yr8ThGY+wx1C5vs/mjctPTwi+UuGy/PFdxHKx3OUvHU1L75Zi3NnI2QU5YF6Elxr3W0xB9nbsypgzu8Xk/wTK3a3+FR9+mQW/8AqOV9Ab0WsolXYqTd1mkhLYvNJ/NN4inMAoBitRhcLHXQG+8JWXwhxOuq1DSLfUku9gef9M8Dc0gw9/X0EIW82b62IvnlgLGpYu9NSZpiiAxu6vU+UuyWYozFyzBckbLvAuzlk8ZRU/h8kUCQVeGIa2740wZvO62HwOsyjQyqjrgfnG3F2Ma32Am3VYlogrtqdBPWYLK1qicmPJcTtVciVFoorkDu/mw9B0+trlOMg5xy9u5e7ecDuw+lgtnrwt3vfXED8+DYJN1ncVFZ2g/JcQogsUW/+A09RwXm02ApLk+Ro2X+CFsspGqQxEC2Ssu7SDbvV0dX05xdLMMi6dMfjS6QbIAEHKRHVnR4owq/DcDFO9MZfNJDQ0rr6S8JW+zI68AZb6NQ4iJCCbp0P5m6HJlq9klsT6wwOCIIWsAY3FldqsDOGvzGrwddJ4yOV71Pj2Xyc4kKMQGAdKbTDt/UMmhad5EAVuIgo1tx0oskn5mqJLh/qxqS/BGV/AF2yOMWyRtJOwvLhv6HoouhNljcJdpQ0EJnBFt1LRLShwW7FnSuDyWzw7AawONnlZx/OnknIBDgfOz1YqkEHbrKpd6FIh9YvohNHrzRjdcG82UL/WUdyrZj7mHA0x7nDjyslP5ilxvFOqUgpuUo4Z8oWIxaAY5AlXpxPH1rydXgj4GhffmL4c5SRNwgH60p4UGBcerR9v/cTxUQLkMysc6eoKd6B9tBLjFFGiIlvJWkvXpeRpqxs5i6M56CQ5d/1/0F8slPnjoDkh5klFG5qhl788MOAeXWOCiPryExsF5R0eRKs8NrIIC/kBRVXdX0x1N9X48IpLSLbdJTSZ8/d56ORAfYruYrNVZA8r5cYStKKQ0Lsk1PtBL/3rHBAGy+O1FaHz1jgz5mTDttUsCIkmJ2AlPJB4WBGIBW4Ouw/ykWjI6GN/NGi8E/OsraC/UborU X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS0PR01MB6001.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230037)(376011)(41320700010)(366013)(52116011)(1800799021)(38350700011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yb64BEisjshyJCbGi3bNQX3Q6HMY84rK/JgM0STirURWdDQ9PDeHEfSI9gTI5InAdK+Im+pHP+76KSvoQ7Px/mWs7GaiRcTzw+EMWbzLzA18GH+Wjb9t6kchtTVc3VPwmC8abgO1P/uCIVnig4AX4Bkxad7Kuj4aHH0U4kMjMXY1o4nN+zsRxEEWt/18f1XjRUdK5utfkfKieCzbO4lpLQOlaRyH2kHehvL5GE+k1pVQplTWqkqWkZUZgZmYqTVAxdiC9O/TkB5d+hKrENAfQ9R0Na8LPfI9Frw0AtWX+EINrGw6bIZ9zifZbLYEGD+Mcw87s4BPnhaab1ZmF8I34aeJVB3HpAi7BTCWzZm8OBYWnWnWXGPj+iwPhe/fWNXABI5uRMs0WOBW58UIy4FnR89hKt0YBfOuS6q0Bgff2E02jAImHtYul0oyK+MDxFJ2+4D4K60k64Ydjo6+0eU0uFT9USr+DKGikipPSMsdnhXRXkBOYKOBqyXz6WduExxcQAghi/Y/rVF7AreTRxA6Erkroi7utKmghJxggcKBCBDJM4OR+tL60NwT0V9Y7e44lJZTQQ6V6gMx0eSs1mlg4tICD+mHiXnnnp/K8d/3KTJQFxB0EDSlIrpHH8Pgk8mwUKpaBlGyyoB+NVsC+f3cu4k0CdMxLCQJo4xDW5McxsB/me5Qy1KC7Sg+LtrlgI0TdoXVUcIs932l7bK9Cootr2vjVjHQh1KhqZWgxDDY3O0/hlcRvKV0lvW+M+OcShshkEJtvW4Xt8euDZwN141RQ/YTh/bRePPBXpukGyNXky8LQtpIdT+XktOxTpc6HmuJQV0kXqHony7jvZeLGc3OH2t7mJItQWXIlXU6u+Dvnzye4UHKTZuwFqzcdj0CPvMsLlFWfThJdbdGyOvlpfNziVvWQUFl6sUNUxYF2YIn0twEeuKwMRLKELVKN+64SVnQ5FLneVQrEK+RAE+fh5gbK0pDaINoYWettjUGvIMOtJaZzqLLshGvMAnDlsoBcSxqpoXN55UuvC/FV06Jn4MQmKOJQOQ3oKsiJDsNwv3qBIRyT8Hn+9FSvU4rSYSyUpBaKUWQGUI1vZzUJP+5zvxgy9RnE/LDScjhmZupBZsMN/VfH0E4XAEre7ktZpCPPgvMFLlDyWcgMuVLDy3TUQaLFGkiwDW3EKVqiuzFwa/UobpiNNvwz+vC9NMaDveBF6ZWatd/S6bj1gaqcK8a31z7lrtyu5doPKYdb/sY1bsgRNPnaC8qCmKW6GmtJ/hKJdE5/B54sDvfzrabWieF0mApr5gvUgoVrbkU4JsrItGcUOlqsJPq3tXW79sxj/70lj4D9h1eKFHnMCDLd5nkf8bws3n4FLf3/o14nH53gY91Oc9Vv7tTftIThwyiPhESQ989Ncu91ZW6w3Lbp6wxkEEVg/+PCgT/OUc3A3pOJ94fTa9kAqWzA8RpfWfhC/ivLB7bXl80P2pQ3OaR8szck/1YdLSEBnLvNcQH9knniBqHcw17Rb29MPClgXIIonN00nZyISBdpFmyh0Eb7iLJqkZsOMHKo1B+YkEUjMbGvVMFsFIr0Uf+UtsyEhW52OAM7LURr70Wb3Ryk3JCisCQiprHOw== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: fbafb634-19ed-4a34-8a4d-08dc9452d0aa X-MS-Exchange-CrossTenant-AuthSource: OS0PR01MB6001.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2024 13:37:40.0041 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 853333e5-13b1-4738-ae04-bfb589cf2665 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uJnkYMxiabDNrHia0VrhJg8ts1Z6xGVop4dsTN0UZwpIBRlBancUoiPq4T9hL27gLgXe6+3IKlWz5WNpkQAsLzEo7/kIAu/pz27rEXrY+Xk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9396 Subject: [FFmpeg-devel] [PATCH v4 1/3] avcodec/jpeg2000dec: Add support for CAP and CPF markers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Osamu Watanabe , pal@sandflow.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DRZ75pH7LjT5 This commit adds support for CAP and CPF markers. The previous version (v3, https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=12246) was wrongly separated. I have fixed the way to separation. The changes are essentially the same as v2 (https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=12199). The suggested modifications have been made according to the discussion on this mailing list. Signed-off-by: Osamu Watanabe --- libavcodec/jpeg2000.h | 8 +++ libavcodec/jpeg2000dec.c | 112 ++++++++++++++++++++++++++++++++++++++- libavcodec/jpeg2000dec.h | 7 +++ 3 files changed, 126 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index d004c08f10..4bdc38df7c 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -37,12 +37,14 @@ enum Jpeg2000Markers { JPEG2000_SOC = 0xff4f, // start of codestream + JPEG2000_CAP = 0xff50, // extended capabilities JPEG2000_SIZ = 0xff51, // image and tile size JPEG2000_COD, // coding style default JPEG2000_COC, // coding style component JPEG2000_TLM = 0xff55, // tile-part length, main header JPEG2000_PLM = 0xff57, // packet length, main header JPEG2000_PLT, // packet length, tile-part header + JPEG2000_CPF, // corresponding profile JPEG2000_QCD = 0xff5c, // quantization default JPEG2000_QCC, // quantization component JPEG2000_RGN, // region of interest @@ -58,6 +60,12 @@ enum Jpeg2000Markers { JPEG2000_EOC = 0xffd9, // end of codestream }; +enum JPEG2000_Ccap15_b14_15_params { + HTJ2K_HTONLY = 0, // HTONLY, bit 14 and 15 are 0 + HTJ2K_HTDECLARED, // HTDECLARED, bit 14 = 1 and bit 15 = 0 + HTJ2K_MIXED = 3, // MIXED, bit 14 and 15 are 1 +}; + #define JPEG2000_SOP_FIXED_BYTES 0xFF910004 #define JPEG2000_SOP_BYTE_LENGTH 6 diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 091931b1ff..d1046661c4 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -408,6 +408,73 @@ static int get_siz(Jpeg2000DecoderContext *s) s->avctx->bits_per_raw_sample = s->precision; return 0; } +/* get extended capabilities (CAP) marker segment */ +static int get_cap(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) +{ + uint32_t Pcap; + uint16_t Ccap_i[32] = { 0 }; + uint16_t Ccap_15; + uint8_t P; + + if (bytestream2_get_bytes_left(&s->g) < 6) { + av_log(s->avctx, AV_LOG_ERROR, "Insufficient space for CAP\n"); + return AVERROR_INVALIDDATA; + } + + Pcap = bytestream2_get_be32u(&s->g); + s->isHT = (Pcap >> (31 - (15 - 1))) & 1; + for (int i = 0; i < 32; i++) { + if ((Pcap >> (31 - i)) & 1) + Ccap_i[i] = bytestream2_get_be16u(&s->g); + } + Ccap_15 = Ccap_i[14]; + if (s->isHT == 1) { + av_log(s->avctx, AV_LOG_INFO, "This is an HTJ2K codestream.\n"); + // Bits 14-15 + switch ((Ccap_15 >> 14) & 0x3) { + case 0x3: + s->Ccap15_b14_15 = HTJ2K_MIXED; + break; + case 0x1: + s->Ccap15_b14_15 = HTJ2K_HTDECLARED; + break; + case 0x0: + s->Ccap15_b14_15 = HTJ2K_HTONLY; + break; + default: + av_log(s->avctx, AV_LOG_ERROR, "Unknown CCap value.\n"); + return AVERROR(EINVAL); + break; + } + // Bit 13 + if ((Ccap_15 >> 13) & 1) { + av_log(s->avctx, AV_LOG_ERROR, "MULTIHT set is not supported.\n"); + return AVERROR_PATCHWELCOME; + } + // Bit 12 + s->Ccap15_b12 = (Ccap_15 >> 12) & 1; + // Bit 11 + s->Ccap15_b11 = (Ccap_15 >> 11) & 1; + // Bit 5 + s->Ccap15_b05 = (Ccap_15 >> 5) & 1; + // Bit 0-4 + P = Ccap_15 & 0x1F; + if (!P) + s->HT_MAGB = 8; + else if (P < 20) + s->HT_MAGB = P + 8; + else if (P < 31) + s->HT_MAGB = 4 * (P - 19) + 27; + else + s->HT_MAGB = 74; + + if (s->HT_MAGB > 31) { + av_log(s->avctx, AV_LOG_ERROR, "Available internal precision is exceeded (MAGB> 31).\n"); + return AVERROR_PATCHWELCOME; + } + } + return 0; +} /* get common part for COD and COC segments */ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) @@ -802,6 +869,15 @@ static int read_crg(Jpeg2000DecoderContext *s, int n) bytestream2_skip(&s->g, n - 2); return 0; } + +static int read_cpf(Jpeg2000DecoderContext *s, int n) +{ + if (bytestream2_get_bytes_left(&s->g) < (n - 2)) + return AVERROR_INVALIDDATA; + bytestream2_skip(&s->g, n - 2); + return 0; +} + /* Tile-part lengths: see ISO 15444-1:2002, section A.7.1 * Used to know the number of tile parts and lengths. * There may be multiple TLMs in the header. @@ -965,6 +1041,14 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno) comp->roi_shift = s->roi_shift[compno]; if (!codsty->init) return AVERROR_INVALIDDATA; + if (s->isHT && (!s->Ccap15_b05) && (!codsty->transform)) { + av_log(s->avctx, AV_LOG_ERROR, "Transformation = 0 (lossy DWT) is found in HTREV HT set\n"); + return AVERROR_INVALIDDATA; + } + if (s->isHT && s->Ccap15_b14_15 != (codsty->cblk_style >> 6) && s->Ccap15_b14_15 != HTJ2K_HTONLY) { + av_log(s->avctx, AV_LOG_ERROR, "SPcod/SPcoc value does not match bit 14-15 values of Ccap15\n"); + return AVERROR_INVALIDDATA; + } if (ret = ff_jpeg2000_init_component(comp, codsty, qntsty, s->cbps[compno], s->cdx[compno], s->cdy[compno], s->avctx)) @@ -2187,22 +2271,43 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) if (!s->tile) s->numXtiles = s->numYtiles = 0; break; + case JPEG2000_CAP: + if (!s->ncomponents) { + av_log(s->avctx, AV_LOG_ERROR, "CAP marker segment shall come after SIZ\n"); + return AVERROR_INVALIDDATA; + } + ret = get_cap(s, codsty); + break; case JPEG2000_COC: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) + av_log(s->avctx, AV_LOG_WARNING, "COC marker is found in HOMOGENEOUS HT set\n"); ret = get_coc(s, codsty, properties); break; case JPEG2000_COD: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) + av_log(s->avctx, AV_LOG_WARNING, "COD marker is found in HOMOGENEOUS HT set\n"); ret = get_cod(s, codsty, properties); break; case JPEG2000_RGN: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) + av_log(s->avctx, AV_LOG_WARNING, "RGB marker is found in HOMOGENEOUS HT set\n"); ret = get_rgn(s, len); + if ((!s->Ccap15_b12) && s->isHT) + av_log(s->avctx, AV_LOG_WARNING, "RGN marker is found in RGNFREE HT set\n"); break; case JPEG2000_QCC: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) + av_log(s->avctx, AV_LOG_WARNING, "QCC marker is found in HOMOGENEOUS HT set\n"); ret = get_qcc(s, len, qntsty, properties); break; case JPEG2000_QCD: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) + av_log(s->avctx, AV_LOG_WARNING, "QCD marker is found in HOMOGENEOUS HT set\n"); ret = get_qcd(s, len, qntsty, properties); break; case JPEG2000_POC: + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) + av_log(s->avctx, AV_LOG_WARNING, "POC marker is found in HOMOGENEOUS HT set\n"); ret = get_poc(s, len, poc); break; case JPEG2000_SOT: @@ -2252,9 +2357,14 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) "Cannot have both PPT and PPM marker.\n"); return AVERROR_INVALIDDATA; } - + if ((!s->Ccap15_b11) && s->isHT) + av_log(s->avctx, AV_LOG_WARNING, "PPT marker is found in HOMOGENEOUS HT set\n"); ret = get_ppt(s, len); break; + case JPEG2000_CPF: + // Corresponding profile marker + ret = read_cpf(s, len); + break; default: av_log(s->avctx, AV_LOG_ERROR, "unsupported marker 0x%.4"PRIX16" at pos 0x%X\n", diff --git a/libavcodec/jpeg2000dec.h b/libavcodec/jpeg2000dec.h index d0ca6e7a79..326a572722 100644 --- a/libavcodec/jpeg2000dec.h +++ b/libavcodec/jpeg2000dec.h @@ -112,6 +112,13 @@ typedef struct Jpeg2000DecoderContext { Jpeg2000Tile *tile; Jpeg2000DSPContext dsp; + uint8_t isHT; // HTJ2K? + uint8_t Ccap15_b14_15; // HTONLY(= 0) or HTDECLARED(= 1) or MIXED(= 3) ? + uint8_t Ccap15_b12; // RGNFREE(= 0) or RGN(= 1)? + uint8_t Ccap15_b11; // HOMOGENEOUS(= 0) or HETEROGENEOUS(= 1) ? + uint8_t Ccap15_b05; // HTREV(= 0) or HTIRV(= 1) ? + uint8_t HT_MAGB; // MAGB value + /*options parameters*/ int reduction_factor; } Jpeg2000DecoderContext; From patchwork Mon Jun 24 13:37:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Osamu Watanabe X-Patchwork-Id: 50127 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2015672vqz; Mon, 24 Jun 2024 06:38:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVc6CMkkN/EBVT5LbYJqBH6Mm4vJmPIA6Q5cARb8pGpy6QmkBz58+zhdJ+Nd4lrsSk+b3AMz3eMDDRqPuyFMfclJICltBZHaPQBLg== X-Google-Smtp-Source: AGHT+IGx7zs/D96sywpbM60oiImBUazWQ9ikbH6CxFxwn252Uwo1QIoyQaJmEe6pCmzOhFJBGCXl X-Received: by 2002:a17:906:2b93:b0:a6f:e069:3b06 with SMTP id a640c23a62f3a-a6ffe3ceb11mr493765766b.21.1719236290746; Mon, 24 Jun 2024 06:38:10 -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-a724c9ad918si151099566b.626.2024.06.24.06.38.10; Mon, 24 Jun 2024 06:38:10 -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=hZTh2utE; 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 B984B68D5AF; Mon, 24 Jun 2024 16:37:57 +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 8B09B68C0DC for ; Mon, 24 Jun 2024 16:37:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XnSEkHTHQjpdsZx2r752glViza02qehqjfXHGMiMf0oYARRU5elFgjwJHmm04XEwNAt4w4BU+m4NSpmSD6DD+QnvS8o4Nd0Iny+pDxUTbFDLTF3Xs4mB0YUkWryipMYp+Ta6EheDOnpo6QlnZTMCMwZQpYs7QnE2vfIG4IYAPbM/l/KZK7oCdbtvqvVimnQ7EXZr/D7k4iaSQwdhacE8kIHJLfryQda3OguRUqjJBdnCL+egmmF9Zm3i2R93q1g1768cxlnkecvqhhAojCFF5k7prKwOXiYpmjt1miVgxFUz1I+P/TYd6JMkeHLc4bSagO3bm4TlBO/Q26lprYeW1Q== 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=gbcRRBGYMco0tD7YzdtD5+LQuqXakrDFzeQMLhzbcOw=; b=XYqjS5Xye2jtYbH/iPxUGTJQlYFj/2G0/H6y5XMml57sR8gnuYhD8pk5Mkrq2zVpIk+e7mYKfMAIz/C2X7S03zmsHMioIGRj5cLf27GS6y2zvj9yCJApMfCMIgMTB9nidBTzlxRIzJutfHKoWeMty0iU5SyImZy3qIuymPrn5kLIVsj/mjMVKg/SkyxhV7PFFhH7qIGTE9qlVP7s/1cPJ3p8HTUp4WH58ykAZxhCElq1a1Mgc7AhFC/IsvP9iPavWOmVYcVNBJ6aEt18Z2bIOQABMsSVqiXzx+hEJ36ud4wcl4AGz12Aqz5EtboLUizwRKNrGR9/ROyqKEcO1g7DIg== 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=gbcRRBGYMco0tD7YzdtD5+LQuqXakrDFzeQMLhzbcOw=; b=hZTh2utExRFFpGCkqPnIPUh7Hf5zmo7stE8RHwJOU8I1Yg6xUO0l4MH3W0W9uD3p1iNF0i58fgPrYaAJLpfZCHQ1UMUuatiQe6i2Bwx6qEYvuriUSq5ET+qa4rieWgseWfVzOekn8XVGZ5EtbIllmGJ5ZBpaW8gfUKLgVEs1QT8= 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:42 +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:42 +0000 From: Osamu Watanabe To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 22:37:33 +0900 Message-Id: <20240624133734.3032409-2-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: TYAPR01CA0071.jpnprd01.prod.outlook.com (2603:1096:404:2b::35) 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: 1019f172-465d-48aa-7c4d-08dc9452d246 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: bJqxKdbraWh8kHM5S/XJoPI7hbahGbV2OaABgz10tsN+OGVpTV68CKj3R2ytqdKOsqglTks/Pf6v542k1UpTDLc94uvV6ZTZ69r0sTZVTGHSLJB3LorLNq4AeHQaNuKJmPfOkc2o+Lt5yzlAtRQBkQTzW6p2vPW/ixuZGghRbGalAMcDiv9ZtsYLSbbfo2p0Fx4/usk3IyuC+GN4HivH7sI7Qcc3VTVCn1/7M1b8ELQDdlY9lL4nzp3Pdy07ySqfktYNUnttkyN0leobckR8ISxf/HhFu/GLpxYXewNPBzjkKlS2PJPHv3MVbMuIs+A9d+sLoJRUjEWPb68DcXhqDMPJvhUg5dDq86FGy4SKr1kYYWSr/qGhKs1azoaSAg8uZmBEk3kaNYZt+HYRSqQBo6Aa/mp76NAZD6dLRJxGzi8rlVf5sVph+wrGkuGRE16xaAAi5KigdLXG/efKjqpH+Su4co1h3ECZfDOnd3a/OasWjnDzBiUAXgJNaRr73sjTIXA/p057zTTlqAsWZpp5z8RKSxKGEDA+XUVZKCz2LHvPUh36rsLG27zZe1rnIUsDglXIcfSnk1vUGQWUVs62HH/r6N1w3NYCqY3zermg/jaM450K5SgUSiWgm1YFBt5hXD/uauw0hinns4ygfWqu4T1orOe/0MCouFEdnjfE/LUN3PJbJkyG/3uSVVJOp/XEnFV7/twXbgwiYlFzjbW//OiE2vqJR1tE2m9npjJcxGL7QLvNkp6+50yErnYemgV/WObpHI+GdhnpeaACxxiwq7Y3SsZO9xTB9tcQDplkyaVfFFKcyW4NJ8ZFoSSGYjAhIVxT/1M67ME7RkN9rZubnZfPEXbVCsfUCnATa1Lm9igCXeS3TPhzQa3pNe890uGzAEBvL9uQ75m9crGHMSqB8ZYrmADSNPs2I7GvZ84GTjJ/LOGltpdbcN0cnCTmE/0at+XuSFgcPklZPZvrJSOyyFkBJ/MqhWDWO/XYgyMfWsuESXw8ivIwhGf3pOShBzHIPMUbWuVreXRlZsqJouz0pl8xB9X/uV+FRXMZgtBVkK5h5gqMDAb11hKl+7nuCpbHX/3MgJVdHJlg8eJlKuqw9GrTPi4stnn3DiYWjltqjsn1ReAwl96b+E7LiZa/RDzoxP1eWbzbG8TNKRJBNoDs1uw2PLzedCHuH6MZTKfs5LBqvpJC+Ti6fP3+3zNltxlSiByua9njWsaVXn3CYh9freJbXIdMWS9tK9nPeDd/hcUX2XyXXk7JX5Pqb+MggeyFaayKuNfSvcADcOvKEVBuJG2zPjsqdZo/rF0YyfvxFzMN0KITiRcc68IZDgqao4A1H9PMg1a/HG1gl5uYZQ/Ag56AD/1m0mkB3kwPOFUz8/M= 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: wy8rtIzak8YHwiffrX3paYAksQgChBjcXfKufghcXqtipRnr9kXeHNhtf1F1AyZJECyDD/yKA3K/ZbcVbfVdTOTx1ohD+HC6WmuNhU8drmJ09UQ+9tDh3uD2+mBtPHs+/KUmQfPuRvLQ3ZX+Z5vNR7GA9gAzPFR+L0XUytzgj/KgGKrG7ueIJ5/uf+dnx1Z+pJDx6GDYxOi73cUfPzwvW5UYVWYd4pz3S2YeEI6hpNBw6PaxqFBXsAN8HifPNQ+02vG9PcWn42y0p8jy37MoTw6cvrvQGJRiYQFLJmysYy32Gs8P+5gDgeMIDP6JRneRPHoNAq2ffwxfQ1tQY097OLX7YlsBWLbjOJ5ObEOltPJmN/Adgoq5FWeE60VZ24bkF7e2SpjwiqoVT63LrtnDeHFwJwq/+AO95L5CqsaYrSA7JRyqBSIQKMHbM5OoAxT4wcmdzOdaIfzss8gJ75YLzsidM36eOvhjn9LxPqExhlcE1eRYm44UbWjS84mhEkrqv1u1U+TNEyl2I9pHYiNFCl4jcn0mhZtw+GIKN7A3gv4l8ER05DkTPK+8VpanxAfr3dWEZtcNtyfC8ASWsikeqK8GUfvSk+0thllBVzISxR1LFhqm3uy1epXukwIENkrqXF/3z4S9w88856C41Iwyxm1TBgPM+k08CaqtHHwcYiwq3dU4l6Qzgb9BJHgzjT0uT/b29HMHA7Ay3cTHWDRuKziNjOI8Kj1cqy2fHYmpQihKELicp51RebK52OS/nglznn1vkHo5C8y3lfRlcLV12HrdZ6cVMWcGC6GV3kgjxKk2WndKFTGw6HbNAQ6lzzO0T4cePok5myg4ocZpG6/pEPbPqJmzGJFJUuzqd1RhWrc4osAr/lU1IZ9s86RMb0n3Qz9ZEZXzBvl0A8y4S7f2pfLjNnDS1RFAztctWltOP1gYqp59Fzld96ZfuW6a29jY/TlPU5nJ2Sb+K1s2eREGZdH+/JloArb3ir/QlxmzaB4DsVR6bS+O8KeGx6LRnt+m7Cj34kwVATr8HI8jOdb+q5C2PPZs+luRP6lKnuynFZifeH1gXQnVcKobvsHIOO04RyAxIfwp419p5G2H+ddTGdK4010swocvi43gkkYnIoxxYfDjSs2whe0Ku2xH7z4xda42vs1xnun3u1m4WqrykeLnO1jv82YlC2clkd2lV9e4sv+X8kcfL6HWg7obngb9ic4nWmqjap3RLBgZBo7nH/BZYHG5S5L778rKplkCvlFWZ1hH65GYEtNZg9Oigqzplljgd19LT681URNk5HKcDX7ZTykZf9RCXO/UCaUYhVnjSkNukIxAPNj2EOH5TYZaHgnaIDM60XwqRMYC542vsoBLgTRTpUbgb0Z+abc2LJaGgU+tSdCFJvdCYAV87LpbhZvXjBovi0SPuPOx6oyyQiZDEayhZnBghIX5ysIDV1MwIfM5h8XsU6sJdOc7fswudJe0JrHM1YeQZsnpp/0USr3b6mPL+4UKMljiTt1sdoP/LeVUySuYGBsEDjYmJYlHjTQVWSkSsCi9M8XfncstmBxnXxVbCZHL7NWc+GeQcVDbU564V04pjtPFajwGgt/jlA+IPz1jgduVdizEor3DJQ== X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 1019f172-465d-48aa-7c4d-08dc9452d246 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:42.6635 (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: ErzV/zMSo0ysMAlCwzO9dZjkO3InDxAlihzMs4Z2eTQ6oRhRkmM+ijUAFiKGuy6C6oGasCVipMrL0IcgemRoqJnp5iMdteb5Wg665iiFrkw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9396 Subject: [FFmpeg-devel] [PATCH v4 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: VmfYnS81KPTM This commit adds support for placeholder pass parsing Signed-off-by: Osamu Watanabe --- libavcodec/jpeg2000.h | 2 + libavcodec/jpeg2000dec.c | 352 +++++++++++++++++++++++++++++-------- libavcodec/jpeg2000htdec.c | 90 +++++----- 3 files changed, 326 insertions(+), 118 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 d1046661c4..2c66c21b88 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/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 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 */