From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D39204C86E for ; Wed, 7 Aug 2024 03:53:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7402468DB22; Wed, 7 Aug 2024 06:52:58 +0300 (EEST) Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11021091.outbound.protection.outlook.com [52.101.125.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D5D868D682 for ; Wed, 7 Aug 2024 06:52:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hrlpFy71x5Dlgbp/eqAKq/OG+5MMLvy6bZQKhKu4YKPl+wT8jKEVcAmJFAxhBHOu4OiLosTYBe/30M6rOLYofkFjS8vL8YxRjvfyFnErv4Z6Xwuxi4HQSmXvuNcAk/Sq/03Xa2mnjBn5jWgmiUdgDvl7rLBc52EWu8FVpdTzXhfTo69hiDgfrz/0JwAsQ5701KWxxHB3CTg+e72PSnBUQLY5TGnzAYWfL31obiYVO+Dw3kVDCyk1sXhNg2l8jdP3nZlb0myx9s1C1KjDTMrrAgf0AL7e/I+0jyxTx9X2PZQruB6Ehf8rzKv6XT+q9eLQ/3MuPX3Pwfca4SG1GgdiHQ== 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=/EyCSNz1wq/SuEQb6emEFdJaPjNMVxaWWg5ZVtkvDac=; b=gPyrFeiC12dogpOI5sVxkm8ZUZgP70lAjXe47aG21rDdMFvo0r0nRwu67cpYXioyjxIzXVEG+mxEGjTcr38aDREnHumhsI7Da80MT0URuuMPSTv8FS8ZNkK8I5J6AC1eHSeYghbY/UfVkLXo9cqq+MOarEmJjvYG+Tee9dtsy5QyZXGj3sIB5EVq+m8irVQwmCGqmFk35zZf2WeEIDPL5TYBtZTZ5x/YTKeXKOQsMphIV/4oOmxLS1eO/KwhKnmW5WxT7ZND1iRaxafwarmnJ4Hg0AoQtl3yLXxeTy+fgOsbSEwne80V+QKfrCbNQBo9/BftaZGjPzCJsXYx1NMAOg== 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=/EyCSNz1wq/SuEQb6emEFdJaPjNMVxaWWg5ZVtkvDac=; b=IoB6jI92oyXOcGbyr6VJDpPzeuPmrjDVCwHmYsLVjPALeKal46vmZxMOdLf33GTEy7ITsvVK+NxPx3CiMFe3HE05BK9yQvBXHv7QvLxWKf5YlrFmldquhdKNEPYtPFTPYZHkPaz296FcfOOvTZdUW4UHqLqOkHEGTAwWGujsulI= Received: from TYCPR01MB6016.jpnprd01.prod.outlook.com (2603:1096:400:4c::12) by OSCPR01MB12849.jpnprd01.prod.outlook.com (2603:1096:604:337::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.13; Wed, 7 Aug 2024 03:52:48 +0000 Received: from TYCPR01MB6016.jpnprd01.prod.outlook.com ([fe80::32fe:be82:2878:fc7c]) by TYCPR01MB6016.jpnprd01.prod.outlook.com ([fe80::32fe:be82:2878:fc7c%7]) with mapi id 15.20.7849.008; Wed, 7 Aug 2024 03:52:48 +0000 From: WATANABE Osamu To: Pierre-Anthony Lemieux Thread-Topic: [PATCH v7 1/3] avcodec/jpeg2000dec: Add support for CAP and CPF markers Thread-Index: AQHa5i70pK3qtjtE8UCNuYgGltE+J7IY7UiAgAJA1oA= Date: Wed, 7 Aug 2024 03:52:48 +0000 Message-ID: <305C3D16-A0AE-4236-B550-EC97B25134DF@es.takushoku-u.ac.jp> References: <20240804052706.292107-1-owatanab@es.takushoku-u.ac.jp> In-Reply-To: Accept-Language: en-US, ja-JP Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=es.takushoku-u.ac.jp; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TYCPR01MB6016:EE_|OSCPR01MB12849:EE_ x-ms-office365-filtering-correlation-id: b194e222-3afc-4bde-3ae1-08dcb6946727 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|376014|38070700018; x-microsoft-antispam-message-info: =?iso-2022-jp?B?U1EzaXhzYWhvZlIyMGJnT1B6UDRncTRkc2l6Tk9yQ0d2eWdLZmc3R3dF?= =?iso-2022-jp?B?Si81bjVpd1ZIOVVkaXdnMmd4dGRQSzFGOFloYlFzazlDSTZQZ09TY1dl?= =?iso-2022-jp?B?elZycjFNbjh2M2taeXFsM2J5bnhuK3pDZ0hyaXpXOW95RHBoaWpYV0ll?= =?iso-2022-jp?B?clFnd0RqbnBtbEJmdE5PWXRhRnlhOFpXQU91WkIxZGFLY3hxZHllKzBh?= =?iso-2022-jp?B?c3lpM0gxK1JTV1FGQVNkZytIMmFzQ0YybE0reHRBTUhvMGNaS1o4Unk0?= =?iso-2022-jp?B?VWNmRlRPMFpFNzI3Y1hmT2pWOGxjdDE1TlNYSGU1dWVnMk01NEg5bkRC?= =?iso-2022-jp?B?ZWtJaHFDZVNzclFzSktVNWNBU09IY2dNeE8vSStqYzlUZXNsbmhRT251?= =?iso-2022-jp?B?aWlORWsyMXQxSGNJYzlNMGFzRTJNR3lBSVk2WGg2SzUxMENNRTJVL0Va?= =?iso-2022-jp?B?cHpqOTI5Z3VvSkdCbFRCSTErYmtWWGMxeDJLSHVMVWMzUENNWDNCeXh5?= =?iso-2022-jp?B?ODF3SDUvbDdrUXVpelJrMlVmeE9BYzZIT3liN05oaDJaSHRwZk5oM3dY?= =?iso-2022-jp?B?RWRQYzREbkFWUEhhN012N05ObGhSa2MvcXd5c1E5S1l3MmxJWUZBZ2NV?= =?iso-2022-jp?B?ZE8xNjJyck5IZDFXeTJYNlNuWXJkWGdWQ3hpcUUxODJqRnQwcU5ZNTEr?= =?iso-2022-jp?B?eld2bG5FZzMzcVFpbE14TnRkOThVL2RsVHlybG5NaGRMWVQ3THoxYXI3?= =?iso-2022-jp?B?ZHVVVklrRUpydHg2cElNbG5pWEtJWDd1N3VXZW5jMGZLZ3FweitYSGow?= =?iso-2022-jp?B?SUQ5Q0p0MFE3WW9ncC9OSEdFOStUa3hxMkczbTYvc0QvMDQxSktQYU5u?= =?iso-2022-jp?B?MGdyOEFIeFgzSFZKN3VkOXpxMlVrSWVNM3EvZDJubFpsdnBIQ09aUUE4?= =?iso-2022-jp?B?Y0c4VkNGVXVlcXp0MFF3R1pJWnZIQkJGa1VnQldKQUFPSUUzSDltM0FE?= =?iso-2022-jp?B?L2p2N0h5TG1qaDl0ejFuR090ZGtMMDZKKytudCtkbldsdlErdUFxQkJw?= =?iso-2022-jp?B?MVRia0RXY2N3c1pheE1zajhiVGlaSmdnaWl0WjREeWFrRVZlTXk4ODA1?= =?iso-2022-jp?B?M2ZkQjJpZzREYjlJWHo0N1NRd05qUGc0SXV5YSsxaDZBVUJZdnlVVys0?= =?iso-2022-jp?B?dklmTlRLTjJGV0Y3NmdmcGVMMEZ0SWxFdGZRR0kxb2JJMTd3aThUR25q?= =?iso-2022-jp?B?dGs1SGh3Q3Q2ZVBPSVVFSnMxS01SdFhKV0hUU1ZiTC9CWjRwYjcyRDJS?= =?iso-2022-jp?B?T01TK3BHTEcvcWZWYkhwb1NVWUM0QTltcFdURjJqQ3M4dWdyNTNuNDlr?= =?iso-2022-jp?B?ZnVsVng5VkFuV3dQUS9mVWtwMlFSV2NIZkliMGxLeDdKUTFzVmpVSXg1?= =?iso-2022-jp?B?dkFJamhQMk5JWnBiU2JPVXdweXF3eDR4dEo2eU1aR0Zyb1NmN3VnMU5T?= =?iso-2022-jp?B?djErWDBLKzhnRVBiUGhCSUhFZzNVQUtMOGdzU3lVRkJPOG1mSFk0Rzlz?= =?iso-2022-jp?B?dTFXSlFlQzhVbUM4eDRTTmxRem9GeW5pdmJmSHRBS0gzZitYeFpNS0Zn?= =?iso-2022-jp?B?TGg1WUlaeG5mTUgwZlA4Y28zdlZ0ei85aDAxYTZKQUJmbWhSSlB5SlJp?= =?iso-2022-jp?B?WWJSUmpLRy92WHdYWmlQOHlSK3duNUhtUlZWbDZicXdkd0hvOWF5bHB1?= =?iso-2022-jp?B?cDBaUWVHRU9oQTlmSCt5VjBwdHlaWXFUS25iTVFyK3hoRTlHcGJXNFFN?= =?iso-2022-jp?B?MGNodnp3WkJKQitiQmMrVnpDNEd0UzNaL3dKQjc3RHJrVVhjRG9GempL?= =?iso-2022-jp?B?aWdvMnJyUzh2aWVUVnQ3U3I3TkJoZDdYekYweFJDUzNJRS9odFRabFdo?= =?iso-2022-jp?B?NmtpbGEwUWd3eGxnNTdPYUhXTmtxWDNUY2R2anVlOXZVN0lVclMxdlA1?= =?iso-2022-jp?B?ZSt6OE9EVVFuK3NJRW1jdmFjbnl5c2lEREUxa1M3MjFwTGpPOE52NHRZ?= =?iso-2022-jp?B?d0E9PQ==?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB6016.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(41320700013)(1800799024)(376014)(38070700018); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-2022-jp?B?WitaVTJKWXo0M0ZGT2hYTmQwNjdMR1g0dmY4NUF6VzhlSzRwOTNlS2VK?= =?iso-2022-jp?B?SFRLS3llZ3hocmE3am54U2VXdzVYcGkzVWlGbE9vVWhTdWJsNWxrSGsx?= =?iso-2022-jp?B?OVppYzVtME41NkpGV1FIbGVaSE9UTjlqTC81WGpjK2s0clhBV210SHA4?= =?iso-2022-jp?B?cU5iaWZ6TWZSQ0R0dThtYUZjeHpJL0lLQWU4U01HdWdUb1FRd0dLZ3Qw?= =?iso-2022-jp?B?SEdFcjJ3RWtKV0gzRU5aWGRwRlV6UEFtSFNZS0dCTXpwWVdQTlhBcUty?= =?iso-2022-jp?B?OTk2R0psQmtDbHR2ekZtdzJUV1Nld2JtUWJpNXlGaGJyNWNCRmN3ZWxu?= =?iso-2022-jp?B?aUYrcSs2Q2MxWUpNSm4wdEp1WEIwc2p6RExscEVTNUgwOEdMejFCeVY2?= =?iso-2022-jp?B?WTNNc2tWcVhkL1hFNGtQNytrTWZJZGNDWkp4dFEzQW52NmtnS2N2M2RJ?= =?iso-2022-jp?B?VTJCVWNBQW1oN2RSaGdnb2l4TDVRaWFXSlFLNE1nSlRCRENpdVhOY1hS?= =?iso-2022-jp?B?TVZlSlRnRU1LQ3N2YW9UVEcwRXNjUmlxTEZQK2xwcEJ0cWhvbllxc29Q?= =?iso-2022-jp?B?blB1eXlOa2hTbzk4OHJHWnJFcndFSE1yRHNCczN5cXlCVlNBdHYyTG5p?= =?iso-2022-jp?B?U1BkcTd3WG51WTFkK2VPbVpTSUZzTEtoeFhHYUJYSlJNMXFkMUUvTEJB?= =?iso-2022-jp?B?VkVvMlVCM3UxQWNGa3JPRVBpU2duR25scmRwOU0rMTgrWjNLaU92NmIx?= =?iso-2022-jp?B?WVhpc2NseW0xd0c5dGdvRlZpeUhNRkd4ejViYjJETmtXRzhsSEF5eGxo?= =?iso-2022-jp?B?dkN1SmlTYURkUks2NWFKNjBqcGMva2JTSExLVmtJK0pVWnpudVJKL21E?= =?iso-2022-jp?B?RXh0dUQwM1hrUVFuaHpKUDlzOE5VbFU3czZDN3Y0c2NpOWVnaE1PK0FQ?= =?iso-2022-jp?B?dDFxWDNKLzdiSTJnOVFqblZrZndvdnBITDhEdEorVzRoVkszOUdsQ3py?= =?iso-2022-jp?B?Mkw5Y01LOG5obnFtUE5tYUIySXpQaldCSzBaZzJLQS9NMWZ6cVpnN3By?= =?iso-2022-jp?B?cm5ZMVB3SGlmTmNQYW0ySlcyQ3J2WlpGMWJobnUxYS9VMVVNcDc1RzFE?= =?iso-2022-jp?B?VXpwakU3MlU1bktRM2RJMHRzL0ZKRkcyb0xxRmtZdHRWVVRERnVMY0tk?= =?iso-2022-jp?B?NTV0dENITmlkNzh4ZENIemxGNGU2c05BMG1TZHNiSFRVTlpVQmlKN3Na?= =?iso-2022-jp?B?SFdyRFRGWHl0U3BoTDhIMTNxN3dWaHFjVHFDM2djTERHaThYRm1YR3RT?= =?iso-2022-jp?B?a3d4enU4dFU1bE5NVVEzRDZ1a0ZJN3hlMDNoTG1MRWtJUU5odEk0WnNk?= =?iso-2022-jp?B?QmlGdE1YdENNL09Lc3RNZVl0STN5bTZUTkJUbUd4TERQMGZreHZHWGgv?= =?iso-2022-jp?B?V2lOWEhDTUxJMGMzWjE4RXpJTjlCdlh1R25kVnoyL0JIQlpNMEdhVVVE?= =?iso-2022-jp?B?KzhhV2haWVZMN3Y4RStRU0VtSGlJNmFKVWpDM2tFOXBDSTFYdXNlWjF4?= =?iso-2022-jp?B?N2hyMW93OWprNFdHMDB2Nk5JKzl6OWZxbGVkS01GeDQ5WWV3MGNOdGNO?= =?iso-2022-jp?B?RThhYVBaSmZYOHJaUEFZK0lCcVRMeHA0UTNIUTlVZUFEbm5DbGRIMlNI?= =?iso-2022-jp?B?anlTWWtiWmdFTmp2TnFIZ0Q4U2FmNGZRZTIwSUcwQ2hPaThWS3BoNFNQ?= =?iso-2022-jp?B?SFQ2RzFvaUJBU2M1Y2lPTG1kV0Q5ZTB2bzVjK3hibUlPRFBIdGN6NWxO?= =?iso-2022-jp?B?K1V4NWYxTXRwSjhHckF5Y2ZKdnIxQ2VSeGlJMVhRS0psUmhRbTFkWGYz?= =?iso-2022-jp?B?OXcwdGpNVk9CekZhYWZ4OEltVkVuNUF3Q0dnVTYwRjNkNlJOVFB4SXky?= =?iso-2022-jp?B?ZnRrbmdqaE0wZXV0NGNjY0VNeElXNDkvVG1JTHhONTZrQXZWMjJYTURn?= =?iso-2022-jp?B?ZnUwUXB5WHhSQy9Tais4OGwxVkxqUFVOb0ozbitlaUdSK2NPdmNiZ1VR?= =?iso-2022-jp?B?TDA2eENUT2VMRk1xNVE4bXNPUThRcHZxdXdDdWZsWHRDM0s1ZkVMbGtH?= =?iso-2022-jp?B?MTNrdGxPU2NITHFHVlBGbkxaQ0VHSlpWWkxLT0U5b1ZOQXhqQy8vWTZi?= =?iso-2022-jp?B?RTVLcG1JZDRoM0FHNjMyK1dOMEVxZ2VCYzBmQi9IS3ZHci9RelM3djNO?= =?iso-2022-jp?B?b3pwMVoyYmZKeWNJemRWSVl4TVFubWp3QVltbWhGckdCcTIyTnFXK2c3?= =?iso-2022-jp?B?UFpzRkUyaCtyOGJaSjZWMGxxeDhRZmNMZUE9PQ==?= Content-ID: MIME-Version: 1.0 X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB6016.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b194e222-3afc-4bde-3ae1-08dcb6946727 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Aug 2024 03:52:48.1197 (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: xycMpqWq7fCqxH+zDDsgzDCUi6kMN4BQm6S65k3gbtH+8QSBPGr3EY0wGA7YSuAB0hj2JUS/y2Ibzr9M2Ra3OByTKFvKTTUBac/2WZ089Gw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSCPR01MB12849 Subject: Re: [FFmpeg-devel] [PATCH v7 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: "ffmpeg-devel@ffmpeg.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Hi Pierre, Thanks for suggesting the improvements. All the suggestions have been reflected in version 8 of the patch set. Best, Osamu > On Aug 6, 2024, at 2:28, Pierre-Anthony Lemieux wrote: > > Hi Osamu, > > Below are suggested improvements to error messages. > > There are also a couple of errant trailing white spaces in jpeg2000htdec.c. > > Can you fix them? > > Best, > > -- Pierre > > > On Sat, Aug 3, 2024 at 10:27?PM Osamu Watanabe > wrote: >> >> This commit adds support for CAP and CPF markers. Decoding will exit when encountering Ilegal input codestreams. >> >> The variable `Jpeg2000DecoderContext->HT_MAGB` has been changed to `HT_B` according to the definition in the spec (ISO/IEC 15444-15). >> >> Signed-off-by: Osamu Watanabe >> --- >> libavcodec/jpeg2000.h | 8 +++ >> libavcodec/jpeg2000dec.c | 128 ++++++++++++++++++++++++++++++++++++++- >> libavcodec/jpeg2000dec.h | 7 +++ >> 3 files changed, 142 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..44db131d77 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"); > > av_log(s->avctx, AV_LOG_ERROR, "Underflow while parsing the CAP marker\n"); > >> + return AVERROR_INVALIDDATA; >> + } >> + >> + Pcap = bytestream2_get_be32u(&s->g); >> + s->isHT = (Pcap >> (31 - (15 - 1))) & 1; >> + for (int i = 0; i < 32; i++) { >> + if ((Pcap >> (31 - i)) & 1) >> + Ccap_i[i] = bytestream2_get_be16u(&s->g); >> + } >> + Ccap_15 = Ccap_i[14]; >> + if (s->isHT == 1) { >> + av_log(s->avctx, AV_LOG_INFO, "This is an HTJ2K codestream.\n"); > > av_log(s->avctx, AV_LOG_INFO, "This codestream contains HT codeblocks.\n"); > >> + // Bits 14-15 >> + switch ((Ccap_15 >> 14) & 0x3) { >> + case 0x3: >> + s->Ccap15_b14_15 = HTJ2K_MIXED; >> + break; >> + case 0x1: >> + s->Ccap15_b14_15 = HTJ2K_HTDECLARED; >> + break; >> + case 0x0: >> + s->Ccap15_b14_15 = HTJ2K_HTONLY; >> + break; >> + default: >> + av_log(s->avctx, AV_LOG_ERROR, "Unknown CCap value.\n"); >> + return AVERROR(EINVAL); >> + break; >> + } >> + // Bit 13 >> + if ((Ccap_15 >> 13) & 1) { >> + av_log(s->avctx, AV_LOG_ERROR, "MULTIHT set is not supported.\n"); >> + return AVERROR_PATCHWELCOME; >> + } >> + // Bit 12 >> + s->Ccap15_b12 = (Ccap_15 >> 12) & 1; >> + // Bit 11 >> + s->Ccap15_b11 = (Ccap_15 >> 11) & 1; >> + // Bit 5 >> + s->Ccap15_b05 = (Ccap_15 >> 5) & 1; >> + // Bit 0-4 >> + P = Ccap_15 & 0x1F; >> + if (!P) >> + s->HT_B = 8; >> + else if (P < 20) >> + s->HT_B = P + 8; >> + else if (P < 31) >> + s->HT_B = 4 * (P - 19) + 27; >> + else >> + s->HT_B = 74; >> + >> + if (s->HT_B > 31) { >> + av_log(s->avctx, AV_LOG_ERROR, "Available internal precision is exceeded (MAGB> 31).\n"); > > av_log(s->avctx, AV_LOG_ERROR, "Codestream exceeds available internal > precision (B > 31).\n"); > >> + return AVERROR_PATCHWELCOME; >> + } >> + } >> + return 0; >> +} >> >> /* get common part for COD and COC segments */ >> static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) >> @@ -802,6 +869,15 @@ static int read_crg(Jpeg2000DecoderContext *s, int n) >> bytestream2_skip(&s->g, n - 2); >> return 0; >> } >> + >> +static int read_cpf(Jpeg2000DecoderContext *s, int n) >> +{ >> + if (bytestream2_get_bytes_left(&s->g) < (n - 2)) >> + return AVERROR_INVALIDDATA; >> + bytestream2_skip(&s->g, n - 2); >> + return 0; >> +} >> + >> /* Tile-part lengths: see ISO 15444-1:2002, section A.7.1 >> * Used to know the number of tile parts and lengths. >> * There may be multiple TLMs in the header. >> @@ -965,6 +1041,14 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno) >> comp->roi_shift = s->roi_shift[compno]; >> if (!codsty->init) >> return AVERROR_INVALIDDATA; >> + if (s->isHT && (!s->Ccap15_b05) && (!codsty->transform)) { >> + av_log(s->avctx, AV_LOG_ERROR, "Transformation = 0 (lossy DWT) is found in HTREV HT set\n"); >> + return AVERROR_INVALIDDATA; >> + } >> + if (s->isHT && s->Ccap15_b14_15 != (codsty->cblk_style >> 6) && s->Ccap15_b14_15 != HTJ2K_HTONLY) { >> + av_log(s->avctx, AV_LOG_ERROR, "SPcod/SPcoc value does not match bit 14-15 values of Ccap15\n"); >> + return AVERROR_INVALIDDATA; >> + } >> if (ret = ff_jpeg2000_init_component(comp, codsty, qntsty, >> s->cbps[compno], s->cdx[compno], >> s->cdy[compno], s->avctx)) >> @@ -2187,22 +2271,57 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) >> if (!s->tile) >> s->numXtiles = s->numYtiles = 0; >> break; >> + case JPEG2000_CAP: >> + if (!s->ncomponents) { >> + av_log(s->avctx, AV_LOG_ERROR, "CAP marker segment shall come after SIZ\n"); >> + return AVERROR_INVALIDDATA; >> + } >> + ret = get_cap(s, codsty); >> + break; >> case JPEG2000_COC: >> + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { >> + av_log(s->avctx, AV_LOG_ERROR, "COC marker is found in HOMOGENEOUS HT set\n"); > > av_log(s->avctx, AV_LOG_ERROR, "COC marker found in a tile header but > the codestream belongs to the HOMOGENEOUS set\n"); > >> + return AVERROR_INVALIDDATA; >> + } >> ret = get_coc(s, codsty, properties); >> break; >> case JPEG2000_COD: >> + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { >> + av_log(s->avctx, AV_LOG_ERROR, "COD marker is found in HOMOGENEOUS HT set\n"); > > av_log(s->avctx, AV_LOG_ERROR, "COD marker found in a tile header but > the codestream belongs to the HOMOGENEOUS set\n"); > >> + return AVERROR_INVALIDDATA; >> + } >> ret = get_cod(s, codsty, properties); >> break; >> case JPEG2000_RGN: >> + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { >> + av_log(s->avctx, AV_LOG_ERROR, "RGB marker is found in HOMOGENEOUS HT set\n"); > > av_log(s->avctx, AV_LOG_ERROR, "RGN marker found in a tile header but > the codestream belongs to the HOMOGENEOUS set\n"); > >> + return AVERROR_INVALIDDATA; >> + } >> ret = get_rgn(s, len); >> + if ((!s->Ccap15_b12) && s->isHT) { >> + av_log(s->avctx, AV_LOG_ERROR, "RGN marker is found in RGNFREE HT set\n"); > > av_log(s->avctx, AV_LOG_ERROR, "RGN marker found but the codestream > belongs to the RGNFREE set\n"); > >> + return AVERROR_INVALIDDATA; >> + } >> break; >> case JPEG2000_QCC: >> + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { >> + av_log(s->avctx, AV_LOG_ERROR, "QCC marker is found in HOMOGENEOUS HT set\n"); > > av_log(s->avctx, AV_LOG_ERROR, "QCC marker found in a tile header but > the codestream belongs to the HOMOGENEOUS set\n"); > >> + return AVERROR_INVALIDDATA; >> + } >> ret = get_qcc(s, len, qntsty, properties); >> break; >> case JPEG2000_QCD: >> + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { >> + av_log(s->avctx, AV_LOG_ERROR, "QCD marker is found in HOMOGENEOUS HT set\n"); > > av_log(s->avctx, AV_LOG_ERROR, "QCD marker found in a tile header but > the codestream belongs to the HOMOGENEOUS set\n"); > >> + return AVERROR_INVALIDDATA; >> + } >> ret = get_qcd(s, len, qntsty, properties); >> break; >> case JPEG2000_POC: >> + if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { >> + av_log(s->avctx, AV_LOG_ERROR, "POC marker is found in HOMOGENEOUS HT set\n"); > > av_log(s->avctx, AV_LOG_ERROR, "POC marker found in a tile header but > the codestream belongs to the HOMOGENEOUS set\n"); > >> + return AVERROR_INVALIDDATA; >> + } >> ret = get_poc(s, len, poc); >> break; >> case JPEG2000_SOT: >> @@ -2252,9 +2371,16 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) >> "Cannot have both PPT and PPM marker.\n"); >> return AVERROR_INVALIDDATA; >> } >> - >> + if ((!s->Ccap15_b11) && s->isHT) { >> + av_log(s->avctx, AV_LOG_ERROR, "PPT marker is found in HOMOGENEOUS HT set\n"); > > av_log(s->avctx, AV_LOG_ERROR, "PPT marker found but the codestream > belongs to the HOMOGENEOUS set\n"); > >> + return AVERROR_INVALIDDATA; >> + } >> ret = get_ppt(s, len); >> break; >> + case JPEG2000_CPF: >> + // Corresponding profile marker >> + ret = read_cpf(s, len); >> + break; >> default: >> av_log(s->avctx, AV_LOG_ERROR, >> "unsupported marker 0x%.4"PRIX16" at pos 0x%X\n", >> diff --git a/libavcodec/jpeg2000dec.h b/libavcodec/jpeg2000dec.h >> index d0ca6e7a79..166cce9eba 100644 >> --- a/libavcodec/jpeg2000dec.h >> +++ b/libavcodec/jpeg2000dec.h >> @@ -112,6 +112,13 @@ typedef struct Jpeg2000DecoderContext { >> Jpeg2000Tile *tile; >> Jpeg2000DSPContext dsp; >> >> + uint8_t isHT; // HTJ2K? >> + uint8_t Ccap15_b14_15; // HTONLY(= 0) or HTDECLARED(= 1) or MIXED(= 3) ? >> + uint8_t Ccap15_b12; // RGNFREE(= 0) or RGN(= 1)? >> + uint8_t Ccap15_b11; // HOMOGENEOUS(= 0) or HETEROGENEOUS(= 1) ? >> + uint8_t Ccap15_b05; // HTREV(= 0) or HTIRV(= 1) ? >> + uint8_t HT_B; // MAGB value >> + >> /*options parameters*/ >> int reduction_factor; >> } Jpeg2000DecoderContext; >> -- >> 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".