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 D58144A853 for ; Fri, 17 May 2024 19:49:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F060B68D154; Fri, 17 May 2024 22:49:13 +0300 (EEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2121.outbound.protection.outlook.com [40.107.114.121]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF61568CFE3 for ; Fri, 17 May 2024 22:49:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Av03sSp9HMUC590B4eYxgP+Ta4rOIAe6jetlSM4ZpOoek91paiID5GFrObgpqVZRpOe0kjzVviCfhWK6ypwuDEeijTqBj+5iQ1Lc41CRRdTLTuHGINPfd9bIsIzgMTymdyfjejtvyWclOUufTp5GRnQAKlDDfYTX2tw9ZwQ1W5DKvjuYfDyTCmBznSKNmxNYaAWwMDDjEn4bzEVdB3kbsy3uq/nENjB/3Lz7wtPXJBOU+UeZ4hguIe3cKGVjmSjEwNBnGu6pAz9zeORQCQm8u+LzaZeGe5vlnHB1MVYxDmdHVq4pxwVIUfOhsKfKUhqnJLTZ4Gbl2KcnQmpEdxiP+A== 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=eeV4msLDlaezEp0mBUMnYdHnhafV9NqudIrSjleFtd0=; b=YkQ+qMUr3zqMWfKH0HZ+1dCb52AZ6dRZppy0xh9X6Gj0o2xF2uQfY5SQqSNHtvtcrBFbVmoc9kjx48CCkFia1xoekkA5e1WG5cgHlWMK4jkTGqTuexLDMVy9euNSJ91zsx4DvRhnkOoxzJRUwgYbyiafCYm9LYzgMhDTVQ+yI0MpLdmVHOgeS85cBACHdnaV4GkXwr9VUR2SVchzs4M4BmzstqKl4jIl/uyH1KOvIoxOOEvN5O06XPxCxO1mYtUt2SvjuDZP/0buagdZQHQcvbOTfXMWvdRqNyauht3w6l/Nfmsi4PyZVHxFbITEPm3k/RjdGcRN7KSgMeVFUtnSMQ== 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=eeV4msLDlaezEp0mBUMnYdHnhafV9NqudIrSjleFtd0=; b=tAZDJJt4HZtkuYUcum/XWcvQtWVRKt1AWnu8PmTXh6euJBbpK1Ka1tzTLdSjyicI32oNBxXd5xMFU+g4GnkTa2uZ++maRHOPHr2hwGHUllJnIDTz6xujXesnS64oM6ZC/sUzz07pkFU5llz4uxopiZllZoqFcpbB1iTMlf1XR9w= Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) by OS3PR01MB9462.jpnprd01.prod.outlook.com (2603:1096:604:1c6::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.30; Fri, 17 May 2024 19:48:59 +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.7587.028; Fri, 17 May 2024 19:48:59 +0000 From: WATANABE Osamu To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 1/2] avcodec/jpeg2000dec: fix HT block decoder issue #10905 Thread-Index: AQHaqJNCn1pDPFST/Ue7o2YG6dh2fg== Date: Fri, 17 May 2024 19:48:59 +0000 Message-ID: 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: OS0PR01MB6001:EE_|OS3PR01MB9462:EE_ x-ms-office365-filtering-correlation-id: 25eec5b1-d622-43ec-16f9-08dc76aa6520 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230031|41320700004|366007|376005|1800799015|38070700009; x-microsoft-antispam-message-info: =?iso-2022-jp?B?MGFMOUpKbGZ4K21RcjZWMTRuWkNoNDhoMGNKdFlsRCtEWmpWR21rNjZn?= =?iso-2022-jp?B?QlZNMzNwUWdNenBzYkQ4ZTA5QWVNVjA4WEdNNVoxcUVEYUdra3VsZWVk?= =?iso-2022-jp?B?eWs4QU94a2tkNFMxL3hPV3ZOQXRsYXUxUjNXcmhRaGEzYjl6VVBUL0Ft?= =?iso-2022-jp?B?OFVCSkFZQUo2UFY4OXNKdFBPK2p0QmNma0hvSVgxeThoZWtZdktLRmRt?= =?iso-2022-jp?B?ekRKcmRsSnNkRW1QeHVHM01WQU03OE9NZnYzWE9JcWVvV0xTZERTb2JO?= =?iso-2022-jp?B?ald6a2NyL01DL3VWZ3RhblZqa2JTa1Myd2x5ak51NkloQUxDekxGUm40?= =?iso-2022-jp?B?WkcyRlp3ejloM3d5eWpSR3BkeURLcERhZjNKOVlNclRoVUdsL2F1R2FF?= =?iso-2022-jp?B?TWlPQkFHWUNRT0o5QXlzbk9ta2VSTVRPZmF3a29YWGdWeEc5aDJWMmNu?= =?iso-2022-jp?B?OWVNcWF6bC9ldDhUc2JXTHAwZURPeTNrUXZqNnp5cjRBVStQWTNtTEkr?= =?iso-2022-jp?B?QUNCd1NidUI2TFRwQ20yVlYwSERncG1jLzc3Y0VlaDJCQlUrYm9XNzQ5?= =?iso-2022-jp?B?djJKbnp3ZTRkdFN1U09pb0lOaXFUZ2swamt6ZzdtUVRJOUtjRkoxblNL?= =?iso-2022-jp?B?bVI1UlovbWVySlMyd3NBa1NweVQ2RzV3cndYL1JiZ1BVdlZLZW1GWVNM?= =?iso-2022-jp?B?NkU1VC92QW1GOEs3WW5pY0VieE8rLytJM2FBSzlzdkZZV2o5bU15blNJ?= =?iso-2022-jp?B?aGwyMXZXQ1NuVGtpRzIzYjBEZ0VOQ1JGcHdBc21xd3pKb0xHSDkyeFhq?= =?iso-2022-jp?B?aHhDRk5yNDZLM1p1Ym01TGRRNDYyRWM2L2RwMGg5MlNxSlV0OFpERXg3?= =?iso-2022-jp?B?ajVyZTZWanNVTDFTR3Z4aDViQkdSaUhzMlRNVU51VVZRTjJkSkRKNnVx?= =?iso-2022-jp?B?M2VTQUxJb1E1aTROY2pHWXY3VXJxdlY2N0hBMTczNWNmRkc3ak1Sc1pJ?= =?iso-2022-jp?B?azc2Y3VzYXlVQWwvc1cvZDBBSHh6YXB5WHdzT2hzd3pTWGVMWHoycHRG?= =?iso-2022-jp?B?WmhSVzVPVFh5ZTU0cWE4Ky9SNDhiYWswNUlGOTA4NVdXc3M1SUJOVzV3?= =?iso-2022-jp?B?ckRQMHNUUmZjQmpqZzQrVVhHMXVzVG0rekZiNzRFTnRFY2NWUXdQR1pE?= =?iso-2022-jp?B?OXlkdTkzMXdCUjJhWkRxaThJazNjbFloRzVrMlZTNlpsU056dkh6OG1W?= =?iso-2022-jp?B?UDR0QllUaGZKQkZRSkI1dHZ1ajBrbzZmcEp5SUNsVEYzNmhwVWxGUHRn?= =?iso-2022-jp?B?M1pQaFdYb3RSOHVIRXRVN3c1VEJWZU00VkRYUGxqZUhkenhQZElIbzZn?= =?iso-2022-jp?B?SHBOVFhzckZwWmhiMDYrRERFUXVOaWJKemJ6ZzRhMGFqblFlQnZ5Q0dx?= =?iso-2022-jp?B?dUdISmNnbGZnVTFEbEJxbzBOMHhOOW45Y0ZPb3pyUmNmRHJhWUtjcmd6?= =?iso-2022-jp?B?WlZrYzRMaURnWUpseTdSVGJERG9KUm94WWl3c0NHZDBUc1Rwa0M0WENO?= =?iso-2022-jp?B?aHJsb0VXckZGYUl5UXpGa3Z0ay9YRWtRcmE2WEJvMkVvdFN6bWJRNWxx?= =?iso-2022-jp?B?T0RLbU55aCs4d3VFVGJtRXo3K0ZadkJBRWxZQ09uNVNJeVIzaHhDYU1z?= =?iso-2022-jp?B?YlBzOFpxTkdnaFgwVkFYTUJtVDVVTllOeU9ITnJWQlBVVUd3RTlTOEFa?= =?iso-2022-jp?B?OC9acTQydGFvTnZUTjBSUm5YOGFVK3FjUGZKdFB1Wk56ZTVDd3pVbWdP?= =?iso-2022-jp?B?SlNXNDdJTU1xOU1hYTlLcEFjUWZkN0VabFFXWm9pc0RWOUZMVVptdDFx?= =?iso-2022-jp?B?NDRxYjdFQ0o5RzFGYUg0QjZIYlVidWlRTmlHbGpEZEJ2REYwVTFZQ05o?= =?iso-2022-jp?B?UmQzUkxrTWtkUkx6OEg0Z0JXcTJFUT09?= 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:(13230031)(41320700004)(366007)(376005)(1800799015)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-2022-jp?B?NEo1S0thbnZ5VzlHNnFObU1tVjNDUGgvV0RwZHRkWTc3blBTTHF0bUZj?= =?iso-2022-jp?B?d0FHR2xXdnQ3RFE0RG4ydUExSU5vZGUrTnpUMkwwRXZOd01xT056Unpo?= =?iso-2022-jp?B?eWdQRXFhTmw5UVowcE9lTFFDZ241NGdoN3R3WldYZGpodWgwTmRtWm9R?= =?iso-2022-jp?B?RTZXMG5IeG9zMEJEZzZTK25obklYaFlRWVJCVVc2dFE2TzJyVXNkbXA3?= =?iso-2022-jp?B?cEZ1TUtTb2o0UGx6YndQenJuTGhEeG5sT2UyNHNVait6bUpWWGhGSEkz?= =?iso-2022-jp?B?dlBNSXg4amRiSVB0T1JMNEUzODVNdE5XWlBuaGVnbXdBUTBjVlY2c2FF?= =?iso-2022-jp?B?NXpZTWx6UVRnYzhrWnkrZzBsOWNKN0czR1hKb0dJdHE2SS9OUHNrK2JY?= =?iso-2022-jp?B?cFNPNmprQVgyTzNPVVdqRmFVUnZTY2cya1BZMUd1TVZURUYwMUUzSW1W?= =?iso-2022-jp?B?T2licGpzQzRoTzhLTzJhd21nZWVWNjkrVUpibERUaVRTbWxOSjhZNm5n?= =?iso-2022-jp?B?TzZBNzlZSHBXSW9KWFhvZGhzVWdYR2RLTzFIRU5EdGM1TjF4Vjgyak01?= =?iso-2022-jp?B?VGpmYURHQTBpZzAyK2RTMGxnWEluanJhZC9mRjZndkZqQ2hHZE1XYll1?= =?iso-2022-jp?B?dUVFRWp1Tnc0QkxqdDBmd3dzc0crOUM0a2VDekJkZ3k5OGphRFEzVWdJ?= =?iso-2022-jp?B?UitBMkNQY2FGSkZYV2k5SkpqaEkvK2pFTjRSeXNZMThzMzBkcGVab3hz?= =?iso-2022-jp?B?NmcvNnk3VDdGZkNOZUtwN241QkQwWmJsTlRocnpQM1BBaVBtTWRtSktX?= =?iso-2022-jp?B?NVp2OWpXRjdac1MyV3ZDNWRwWjlITVpSKys3ajlGKzBZc2Vrb29Xa0M3?= =?iso-2022-jp?B?dzA4blk4Y0EzelgyekdnMXFIaUpuMDdVY2syMS9BMkVIbng3SnIyQmZ5?= =?iso-2022-jp?B?eXF1bW9naDUxbm03b1BnWGN4ZnRIQnpMR0Y5TjRFNU51WEdUUEROcytE?= =?iso-2022-jp?B?WUw4WWVJSDdHSk03WU1ybURNZjNhbFJFazQ2T0kyc0dZOTlDV1FzU09W?= =?iso-2022-jp?B?am5HVktkc2MwSkJoNldNcFdYNjY0YlpZMlpXa1dlRjgrQXZvdXZlNFpG?= =?iso-2022-jp?B?QXQ1MEtiTFgzSXpTMEdyVGtrWHJWdDFlQ05NMVpGak5aNFV3amdwc0lQ?= =?iso-2022-jp?B?V29ZQ0NTL0dnR1hNWktodmVoZ1o0REx6eXNNSzBmLy9zRHF5QUVsNkJ2?= =?iso-2022-jp?B?cWVjdnNNRXV3YWgxQmZORVoyMUNDWnNaWTVsK3RqZjA0bHdmOVh0aEVH?= =?iso-2022-jp?B?WXFLLzUwSFdSNVg1a1NRRk1DMlNJTHp3bjR3bCtJNkxNQmxoZTN3YkJj?= =?iso-2022-jp?B?ajJ0RVQ2M1k5M0x3aHcrQmE5UDZGSWNGSmtiL2FlQ0Vpbll2YUEvcXRm?= =?iso-2022-jp?B?SnppWmZ1N050aDZUNHZBVldtTXoyMzR2RUZ1cmtTc1ZuUW1XcUZzVlU5?= =?iso-2022-jp?B?VzlYcm0zdjRLSXlsQ0ZLOHc5eTRUMElsVzI3bWZSd2NjNHhQcmRjZHN5?= =?iso-2022-jp?B?UjJUS2ZUSDhleE5KRE5ubXNPa2pPOC8wK1VXQ3FHVGdIUE5ScWlLWkhz?= =?iso-2022-jp?B?dksrMklFYTdhWGxBZ0V6d3h3UVI0dHBwTzE4bU8veWlmYWdEZHNXVkJq?= =?iso-2022-jp?B?V1hRQ1hYUWJFQWxaakpINUdkMHRUcXNONVY0a3dEMytobWN2MnZsdUVC?= =?iso-2022-jp?B?dlB2YXI2Z1FJVWVoMk5GYjd6bjFHWGFYSGgrKzhVSHdlM1lkS1FoemJ2?= =?iso-2022-jp?B?L0RHT3FFNHpBYklFekVCK1JMWFEvN3EvUkdNK28yTHVxcEVkUUZIYjcv?= =?iso-2022-jp?B?Y3R3SjIwRnBMMnRYTm5QNlpoeUp3b2RDZS8xRzB2ZEE5b2RKWnBWaG1S?= =?iso-2022-jp?B?MGxQbCtYc1V4NzNQeGh1QTdQZnFNMStURTZ6T1hUMVpSdDBzRnZkZWsy?= =?iso-2022-jp?B?aHBBT3JEQlZzdUpqQi9jNnVRdThTWjdmdEJTOS9sb0xBTE1WdWpnUVYw?= =?iso-2022-jp?B?cUxxNTVWSmNLS1NDYmd0WXFWY2xmanQ3dmNZVHRlMW5TcUZjb3ZBaXlj?= =?iso-2022-jp?B?ZHl3Q01FcUE0VE12ZjZwQ2xFMk5TQ2xuM3l6bndiSkVBMEZNRUxGbFZS?= =?iso-2022-jp?B?V1ZzYS91aUV6NzdtdW9jOFMvYmNWditKaVg2MHBweHFtbGJTU3A2RHhW?= =?iso-2022-jp?B?ZXRQTlY3aTZMNWs5MzJSVThMak5rNWNxcGNPc05mdDViUVhnWStORFdZ?= =?iso-2022-jp?B?SHdrMTRHdi8yTDc2bHJ1clYxOGFSV09pdXRsSklYSzVIamlZZmJrazl5?= =?iso-2022-jp?B?YXlQaCtuamJhQTBpUTJoOGFyWWk2czlXTzJWM05uZVJpeER3VEUvcnVn?= =?iso-2022-jp?B?U3licDBha1VTdjdRbWJrU05qYTEvdFI4ZFo0PQ==?= Content-ID: <69D0443695E1F042930DE54695289283@jpnprd01.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: es.takushoku-u.ac.jp X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: OS0PR01MB6001.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25eec5b1-d622-43ec-16f9-08dc76aa6520 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 May 2024 19:48:59.2700 (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: ulcnz5WSEqCr19RezghDEfBBjtpVYcSbI3sHqwlh4zf/04WS0+0wRt8v1bLsQbfhlEwMEV7nDJb/K8nZpryH5JPiB145Z7HoElJy9hqVuDk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9462 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/jpeg2000dec: fix HT block decoder issue #10905 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: Pierre-Anthony Lemieux 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: Signed-off-by: Pierre-Anthony Lemieux --- libavcodec/jpeg2000htdec.c | 122 +++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 60 deletions(-) diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c index fa704b665e..62f70c32a8 100644 --- a/libavcodec/jpeg2000htdec.c +++ b/libavcodec/jpeg2000htdec.c @@ -196,7 +196,7 @@ static void jpeg2000_bitbuf_refill_forward(StateVars *buffer, const uint8_t *arr while (buffer->bits_left < 32) { buffer->tmp = 0xFF; buffer->bits = (buffer->last == 0xFF) ? 7 : 8; - if (buffer->pos <= length) { + if (buffer->pos < length) { buffer->tmp = array[buffer->pos]; buffer->pos += 1; buffer->last = buffer->tmp; @@ -508,17 +508,17 @@ static int jpeg2000_decode_sig_emb(const Jpeg2000DecoderContext *s, MelDecoderSt } av_always_inline -static int jpeg2000_get_state(int x1, int x2, int width, int shift_by, +static int jpeg2000_get_state(int x1, int x2, int stride, int shift_by, const uint8_t *block_states) { - return (block_states[(x1 + 1) * (width + 2) + (x2 + 1)] >> shift_by) & 1; + return (block_states[(x1 + 1) * stride + (x2 + 1)] >> shift_by) & 1; } av_always_inline -static void jpeg2000_modify_state(int x1, int x2, int width, - int value, uint8_t *block_states) +static void jpeg2000_modify_state(int x1, int x2, int stride, + int value, uint8_t *block_states) { - block_states[(x1 + 1) * (width + 2) + (x2 + 1)] |= value; + block_states[(x1 + 1) * stride + (x2 + 1)] |= value; } av_always_inline @@ -528,8 +528,8 @@ static int jpeg2000_decode_ht_cleanup_segment(const Jpeg2000DecoderContext *s, StateVars *mel_stream, StateVars *vlc_stream, StateVars *mag_sgn_stream, const uint8_t *Dcup, uint32_t Lcup, uint32_t Pcup, uint8_t pLSB, - int width, int height, int32_t *sample_buf, - uint8_t *block_states) + int width, int height, const int stride, + int32_t *sample_buf, uint8_t *block_states) { uint16_t q = 0; // Represents current quad position uint16_t q1, q2; @@ -958,32 +958,32 @@ static int jpeg2000_decode_ht_cleanup_segment(const Jpeg2000DecoderContext *s, j1 = 2 * y; j2 = 2 * x; - sample_buf[j2 + (j1 * width)] = (int32_t)*mu; - jpeg2000_modify_state(j1, j2, width, *sigma, block_states); + sample_buf[j2 + (j1 * stride)] = (int32_t)*mu; + jpeg2000_modify_state(j1, j2, stride, *sigma, block_states); sigma += 1; mu += 1; x1 = y != quad_height - 1 || is_border_y == 0; - sample_buf[j2 + ((j1 + 1) * width)] = ((int32_t)*mu) * x1; - jpeg2000_modify_state(j1 + 1, j2, width, (*sigma) * x1, block_states); + sample_buf[j2 + ((j1 + 1) * stride)] = ((int32_t)*mu) * x1; + jpeg2000_modify_state(j1 + 1, j2, stride, (*sigma) * x1, block_states); sigma += 1; mu += 1; x2 = x != quad_width - 1 || is_border_x == 0; - sample_buf[(j2 + 1) + (j1 * width)] = ((int32_t)*mu) * x2; - jpeg2000_modify_state(j1, j2 + 1, width, (*sigma) * x2, block_states); + sample_buf[(j2 + 1) + (j1 * stride)] = ((int32_t)*mu) * x2; + jpeg2000_modify_state(j1, j2 + 1, stride, (*sigma) * x2, block_states); sigma += 1; mu += 1; x3 = x1 | x2; - sample_buf[(j2 + 1) + (j1 + 1) * width] = ((int32_t)*mu) * x3; - jpeg2000_modify_state(j1 + 1, j2 + 1, width, (*sigma) * x3, block_states); + sample_buf[(j2 + 1) + (j1 + 1) * stride] = ((int32_t)*mu) * x3; + jpeg2000_modify_state(j1 + 1, j2 + 1, stride, (*sigma) * x3, block_states); sigma += 1; mu += 1; } } ret = 1; -free: + free: av_freep(&sigma_n); av_freep(&E); av_freep(&mu_n); @@ -992,39 +992,39 @@ free: 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 width) + uint8_t *block_states, int stride) { int local_mbr = 0; - local_mbr |= jpeg2000_get_state(i - 1, j - 1, width, HT_SHIFT_SIGMA, block_states); - local_mbr |= jpeg2000_get_state(i - 1, j + 0, width, HT_SHIFT_SIGMA, block_states); - local_mbr |= jpeg2000_get_state(i - 1, j + 1, width, 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 - 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, width, HT_SHIFT_SIGMA, block_states); - local_mbr |= jpeg2000_get_state(i + 0, j + 1, width, 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, width, HT_SHIFT_SIGMA, block_states) * causal_cond; - local_mbr |= jpeg2000_get_state(i + 1, j + 0, width, HT_SHIFT_SIGMA, block_states) * causal_cond; - local_mbr |= jpeg2000_get_state(i + 1, j + 1, width, 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 + 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, width, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i - 1, j - 1, width, HT_SHIFT_SCAN, block_states); - local_mbr |= jpeg2000_get_state(i - 1, j + 0, width, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i - 1, j - 1, width, HT_SHIFT_SCAN, block_states); - local_mbr |= jpeg2000_get_state(i - 1, j + 1, width, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i - 1, j + 1, width, 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 - 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, width, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i + 0, j - 1, width, HT_SHIFT_SCAN, block_states); - local_mbr |= jpeg2000_get_state(i + 0, j + 1, width, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i + 0, j + 1, width, 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, width, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i + 1, j - 1, width, HT_SHIFT_SCAN, block_states) * causal_cond; - local_mbr |= jpeg2000_get_state(i + 1, j + 0, width, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i + 1, j + 0, width, HT_SHIFT_SCAN, block_states) * causal_cond; - local_mbr |= jpeg2000_get_state(i + 1, j + 1, width, HT_SHIFT_REF, block_states) * - jpeg2000_get_state(i + 1, j + 1, width, 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; + 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; } @@ -1040,18 +1040,18 @@ static void jpeg2000_process_stripes_block(StateVars *sig_prop, int i_s, int j_s int modify_state, cond; uint8_t bit; uint8_t causal_cond = i != (i_s + height - 1); - int32_t *sp = &sample_buf[j + (i * (stride - 2))]; + 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) - jpeg2000_calc_mbr(&mbr, i, j, mbr_info & 0x1EF, causal_cond, block_states, stride - 2); + 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; - jpeg2000_modify_state(i, j, stride - 2, modify_state, block_states); + jpeg2000_modify_state(i, j, stride, modify_state, block_states); } } } @@ -1060,8 +1060,8 @@ static void jpeg2000_process_stripes_block(StateVars *sig_prop, int i_s, int j_s * See procedure decodeSigPropMag at Rec. ITU-T T.814, 7.4. */ av_noinline -static void jpeg2000_decode_sigprop_segment(Jpeg2000Cblk *cblk, uint16_t width, - uint16_t height, uint8_t *magref_segment, +static void jpeg2000_decode_sigprop_segment(Jpeg2000Cblk *cblk, uint16_t width, uint16_t height, + const int stride, uint8_t *magref_segment, uint32_t magref_length, uint8_t pLSB, int32_t *sample_buf, uint8_t *block_states) { @@ -1071,7 +1071,6 @@ static void jpeg2000_decode_sigprop_segment(Jpeg2000Cblk *cblk, uint16_t width, const uint16_t num_h_stripe = width / 4; int b_width = 4; int b_height = 4; - int stride = width + 2; int last_width; uint16_t i = 0, j = 0; @@ -1114,7 +1113,7 @@ static void jpeg2000_decode_sigprop_segment(Jpeg2000Cblk *cblk, uint16_t width, * See procedure decodeSigPropMag at Rec. ITU-T T.814, 7.5. */ static int -jpeg2000_decode_magref_segment( uint16_t width, uint16_t block_height, +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) { @@ -1134,7 +1133,7 @@ jpeg2000_decode_magref_segment( uint16_t width, uint16_t block_height, * We move column wise, going from one quad to another. See * Rec. ITU-T T.814, Figure 7. */ - sp = &sample_buf[j + i * width]; + 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; @@ -1146,7 +1145,7 @@ jpeg2000_decode_magref_segment( uint16_t width, uint16_t block_height, height = block_height % 4; for (int j = 0; j < width; j++) { for (int i = i_start; i < i_start + height; i++) { - sp = &sample_buf[j + i * width]; + 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; @@ -1194,6 +1193,9 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c int32_t M_b = magp; + const int quad_buf_width = width + 4; + const int quad_buf_height = height + 4; + /* codeblock size as constrained by Rec. ITU-T T.800, Table A.18 */ av_assert0(width <= 1024U && height <= 1024U); av_assert0(width * height <= 4096); @@ -1261,23 +1263,23 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c jpeg2000_init_mel_decoder(&mel_state); - sample_buf = av_calloc((width + 4) * (height + 4), sizeof(int32_t)); - block_states = av_calloc((width + 4) * (height + 4), sizeof(uint8_t)); + sample_buf = av_calloc(quad_buf_width * quad_buf_height, sizeof(int32_t)); + block_states = av_calloc(quad_buf_width * quad_buf_height, sizeof(uint8_t)); if (!sample_buf || !block_states) { ret = AVERROR(ENOMEM); goto free; } if ((ret = jpeg2000_decode_ht_cleanup_segment(s, cblk, t1, &mel_state, &mel, &vlc, - &mag_sgn, Dcup, Lcup, Pcup, pLSB, width, - height, sample_buf, block_states)) < 0) { + &mag_sgn, Dcup, Lcup, Pcup, pLSB, width, + height, quad_buf_width, sample_buf, block_states)) < 0) { av_log(s->avctx, AV_LOG_ERROR, "Bad HT cleanup segment\n"); goto free; } if (cblk->npasses > 1) - jpeg2000_decode_sigprop_segment(cblk, width, height, Dref, Lref, - pLSB - 1, sample_buf, block_states); + jpeg2000_decode_sigprop_segment(cblk, width, height, quad_buf_width, Dref, Lref, + pLSB - 1, sample_buf, block_states); if (cblk->npasses > 2) { @@ -1286,7 +1288,7 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c ret = AVERROR_INVALIDDATA; goto free; } - if ((ret = jpeg2000_decode_magref_segment(width, height, Dref, Lref, + if ((ret = jpeg2000_decode_magref_segment(width, height, quad_buf_width, Dref, Lref, pLSB - 1, sample_buf, block_states)) < 0) goto free; } @@ -1297,14 +1299,14 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { n = x + (y * t1->stride); - val = sample_buf[x + (y * width)]; + val = sample_buf[x + (y * quad_buf_width)]; /* Convert sign-magnitude to two's complement. */ val = val >> 31 ? 0x80000000 - val : val; val >>= (pLSB - 1); t1->data[n] = val; } } -free: + free: av_freep(&sample_buf); av_freep(&block_states); return ret; -- 2.25.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".