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 006CA4B04B for ; Mon, 27 May 2024 07:26:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AD3C68D4CF; Mon, 27 May 2024 10:26:08 +0300 (EEST) Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11021010.outbound.protection.outlook.com [52.101.229.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D40F68C296 for ; Mon, 27 May 2024 10:25:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TRLEH1BodryIaEtObMPi/pFXrHBR0Dwq6Ll1Gygc80XuSEoGsr8P/CtK02XeVLxv92Arig7vUWNsCjQtMyfuHHV7dymWHK0jvOBUPopKTb8/X39IdVepnCHZXOOZVmGoPK0t09Ma4BkU9doVcWFLnPO+qMy+Wb3pegbYdnkC1D1TDkcI8ujlMvqw6hpItOD4amqG6GYrZX/oaPZC7MdnlI34zPucuiMLl7Bk3pdqrpn5cV6lhPGUuXGVMU0+S107uf4Aj8jG6cbphLBg2egmrPPnlM+UT+H87LRWZLQtB05Ya3obFU+kVWqHlr0FhV1+80JmdyhWuwjFyAzhTKcvXA== 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=MAjzSc4DhkTr+ArgHIzcgK7jfsoiZE7W130pChfFjnE=; b=YlMpCbOM+1thq1xa7e69CI48U3XhX7o46tNl0Su4eO3FOtDvdfy/dsvFnbCqC+x2xNLfEAShoNeq9OIYf0YrAqyzq8JyUou6ayeQQ3sBW1NFafqxTauucVLNsy5f6hnBwxVumf2RjuJXYqeBm2Sn9o3yrmda42TLopfQYUlAjOsZKMyc3laB9Evbwaq4Hkt9UWVF7O3pssdSn3O/PYueHQ8icqJy14PLSmKzrqSTylGG6Uo/51ecCTxB80YKBRqx6SQuSLcj8+iAL03O0tkDj5kzXAp7YcwjE3CYPnWXn44YjowJQ99yzfjPgGrnLc3FYytaP0DLCzmSbzWV8AhOyg== 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=MAjzSc4DhkTr+ArgHIzcgK7jfsoiZE7W130pChfFjnE=; b=iVtH/WB3r5hY4RX6/Wf6loXWhAGwT86qJ5MYxERWvXq8v7gIxHln7hWSTmmI3cqo4tQ8ZL0Um1so6vCdRpSMYb2beupO2HRLmUWuTC0NUMkrCh7oxIidva4r9k0WGxxgXEBkZAAzAQovalhG0XIQkcvlWCARgkv5RBXlqXcyy4M= Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com (2603:1096:604:b7::12) by OSZPR01MB8911.jpnprd01.prod.outlook.com (2603:1096:604:1c4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.28; Mon, 27 May 2024 07:25:53 +0000 Received: from OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc]) by OS0PR01MB6001.jpnprd01.prod.outlook.com ([fe80::181c:c1f4:9b58:f6cc%7]) with mapi id 15.20.7611.025; Mon, 27 May 2024 07:25:53 +0000 From: WATANABE Osamu To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH] avcodec/jpeg2000dec: fix HT block decoder Thread-Index: AQHaqgKDTnVePY5cV0anw4luflBoQLGet60AgAACIgCADABVAA== Date: Mon, 27 May 2024 07:25:53 +0000 Message-ID: References: <20240519150738.89960-1-pal@sandflow.com> 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: OS0PR01MB6001:EE_|OSZPR01MB8911:EE_ x-ms-office365-filtering-correlation-id: 40fe8579-b2f1-4d49-9ad7-08dc7e1e3dcc x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230031|1800799015|41320700004|376005|366007|38070700009; x-microsoft-antispam-message-info: =?iso-2022-jp?B?bjlGR2YwaTlDY3dXMTQ2NlFlSkRTSFZuSm02MW1sVU9YR1NFTXBwbHkz?= =?iso-2022-jp?B?NUxxa1pTOWdJUzZ1M2I3ZkVxaUp1WTY5MmhzakhqV0FEZ2VlOFR3TEo2?= =?iso-2022-jp?B?WDUrcHNlN0hjQzE5bzZaZ2dOWnF4ajdZcnRBRXljUzdIc20zNUFEMXd1?= =?iso-2022-jp?B?VjBKczhNcDZIQ3ZnNVFFQStTN04yTmQyM2VZR254T0pOaVdkTEFYS1lw?= =?iso-2022-jp?B?SVVXM3RNdklhUE9GcFRKalBwbkNsQWJ3VVIrY3RZcTdFNEFsUzN1UVFD?= =?iso-2022-jp?B?ODI5a3BhREpUWjljOEczdU9wVjdjV3poc3U1UkhXWXJiaFYzWDRObUNP?= =?iso-2022-jp?B?dGNEVklralgvR3VjMzd1YWdJOU9GbmJzQzRZUlpiYnNVaXdacjVRRTlR?= =?iso-2022-jp?B?R0hRcHdJY3kxUVIxTFQ3TzJ4WncvaVgvZEdsY04xM09SRlpERk5GaHFu?= =?iso-2022-jp?B?c1E0U08vM3lGL202Q0lBM1BwNVdmQkpsWUF1M0d5Ni8vT2ZjRkdNSHlG?= =?iso-2022-jp?B?ODhVR3JmVmpsMll5Y1JzTS9MUVRxMzB0dFliVzlOZGF3M2p1SXFUMUF4?= =?iso-2022-jp?B?SnhQZWc0MWdpYytVQVd4eXpKZ3ljNG93aFQ1TWF4bHJHcjJnRUdYYmpy?= =?iso-2022-jp?B?SS9GdmppMTBqMTBlUUh0QW44ZWtaY0Frei9OYkNocDJHdFJsVnJxY1hp?= =?iso-2022-jp?B?WXZONmthTjdER0ZJYThEYnNnSm5IN3ppY0VtUy9ISkg1c1FNUUtPeVlS?= =?iso-2022-jp?B?cEpFS3ZkeGpFZE9HbjVsSW1GcGVJUEF5cWtpdWlNNVJjVWZVRFEybUEw?= =?iso-2022-jp?B?SEE0YXlFSWs5NlEwQytVclBDbGF4ajZ4MVlCMi9TemkvWVl2aElmK0lN?= =?iso-2022-jp?B?ZDZkN0hKdUlMWVF3VVFNckZKWngwRlZOdDkzSG5TSU9YSkpJSjBtRUxP?= =?iso-2022-jp?B?cTZJWDBkZnU5T082M1daLzlwN2JGdzdaeUhGUXJPMmY1YURoNWRmRnd2?= =?iso-2022-jp?B?N3FkSnRzWEhHdkFZRnJ2WHRzNTMzOHlHcURxK2pFT3VsRHVVRlFpTlV4?= =?iso-2022-jp?B?cjRMamVFRFdJSmw1UGRUUFBRcmtHN0pxYzUxZGlvcHhYYlMvM2JaV0p2?= =?iso-2022-jp?B?VEk4b0RMV3R6Zm9zOHIwVnJ5NU5GR0hGWUFTbXhjM0dVSUlrNHZBWXRE?= =?iso-2022-jp?B?ajN0OGNxSnhwYWFHdVYvb2wwZFdkV3FaQkorQ3FEeS9WUW9xVjlIY3ph?= =?iso-2022-jp?B?UnRvdXlNV1FhYXVnOFZMcUFTRzM0TTZwMzEvYjFsVkNIY2tsQzZWTCt5?= =?iso-2022-jp?B?a3h2VzUxQW9rUWltM1NsS0tJWldveFU1cTI0ZDIxbEQ1bDFmSUEzWWJG?= =?iso-2022-jp?B?SGpDcGxhL0RHNXZtSVBrc0RYbkhVWURZVzFUVEVFYmtDMmZxaWUvUisz?= =?iso-2022-jp?B?YlFKS2pZSVZ6ZlE0V2VWOGhnZmRaV0F4bEZXS3FkVjJiMmljRS9CVU5Q?= =?iso-2022-jp?B?UDdZR2NGaGZzSGpKQjVEMWlMcTB5d3F6N3hVVmJ2Mk5HTk1ycWc4RzVS?= =?iso-2022-jp?B?bUlNRXlpbzdrRVA1cWhnTE9oc3RnT09QMDNmWTJaRzVrSTIwSEFDN2Zv?= =?iso-2022-jp?B?TGpKeVZ5ZzZZR2FOYndYWlJxd0VPNGNlTFcxc3QvdFZwTnRsNjd0SnN2?= =?iso-2022-jp?B?TTVVSXhnc2NOR2lJUjNBSDJEM0FwL0ZFVnp0dUpPa1FZNkVlbGs1NEY1?= =?iso-2022-jp?B?NnRQWjVpajUwMU5tVXU5bG0xZ2hLU05wSUZwT3ZRSVRJc0Q5Yk4rMm85?= =?iso-2022-jp?B?VkUrVnRLTjB2ckNVVXpuMnl2dmh1cjN1eVdjZzhmU2dTRzQzZ0lKY0l3?= =?iso-2022-jp?B?PT0=?= 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)(1800799015)(41320700004)(376005)(366007)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-2022-jp?B?U3VGbzlNa3IzT0YvWUMxWWVUeU5Pa0N5R0pFWGpDbjdNaXh1cTMwd0ZW?= =?iso-2022-jp?B?Rm80aGJRNWVlWjMyUkI5VzJDaUwyUnFBL1FqZ2tIWXpLSk1meGJ2SHJG?= =?iso-2022-jp?B?MDVGclc4YXdlaHhqcWtYeU1jZ1piT3UzUS9IUzZtU25vZ01UR0t5VnFG?= =?iso-2022-jp?B?c0JBQk9JS3EyREh1U3pzRjZLRWdRb045RDUvQzBWVCsrUXNFYmpzV3Rj?= =?iso-2022-jp?B?andTVHNjUUxYdVdJcFJobGx2RDlEWExJWVQzeWM0R2tlU2IwT1NCNzNj?= =?iso-2022-jp?B?UmFGYUxqTGN3WVRoSmpIN0pNNWw1QnI5YVNpM3M3bU5tVjZuaHoxcEZj?= =?iso-2022-jp?B?UFpqaGo4N2hKc0pEQXBjMm8rL3ZDRDAxOHRGZmtuLzkxeDNqT0pQTElD?= =?iso-2022-jp?B?NnRnVjNrc0o3U3N1a3lFM0N1SzRBbG5wQnBJcWFkWU5ETEZhem5xb2ZP?= =?iso-2022-jp?B?aWp4R0pYRHpsYVdDQ2NQV3ZwTGs3MXhDYVdhOFozb1BBOWVkVjJMNWtO?= =?iso-2022-jp?B?T1dHTXRENUJWcjh2Mjk2WWg5R095bGxzNjErZFRUYTFhbldDb3FHV1pm?= =?iso-2022-jp?B?UURzNWhSeEtRdEFXNDd2a1NqcVpYTWR4amQ3VWxDOEpMWnRvVm13YmNN?= =?iso-2022-jp?B?Q3BwMWs5OXNrREVCNkNXUnhkdnBvalpocG1tSUZuODU5WU5vWGQ0b0FY?= =?iso-2022-jp?B?WWhNWHlyaDczRkN5dkg2ZEUrWGtJUXgvVWhXWGsveWh1VDdseTlYcit6?= =?iso-2022-jp?B?N1NoY3RZZTFuSmJXb28xeG43K0NLRVdkaUk5QUdGdnBOZWZWWHRzcEN6?= =?iso-2022-jp?B?VitLOUNCb1RSeVBidkVCZHdXUzJPZGdnR2RpcXI5eU5haVdvdStaS1NB?= =?iso-2022-jp?B?OVd0MmZ2d1RzWUFOZndCOC96ZFN0UGM0Mk1xc2FVaHJ5K0YraktHemhv?= =?iso-2022-jp?B?OVF1RmtwdktieUNNSmRuUkduOGlSOE5pbjY4TGR6VFBLQ3ZQemVoNk1G?= =?iso-2022-jp?B?OTZlbDJWc2E4c25NY2R3NXljM0lZOGVMTHR5UUJqN2d0blFSdFRlYXVO?= =?iso-2022-jp?B?a005bGdIY0xzWUovLzJPYnN2eHJwYUNGT1lEbkM2ckZDZGdmR29SMVlF?= =?iso-2022-jp?B?aEtYWVh5UTJHK01lYmxVS1J5R2ROb2RJSDF6UVdyVFRmRVV2VkpJWUJC?= =?iso-2022-jp?B?SnIxZkc1S2hxTDN2cWFRdjBlQkNNZi9UdUg1cDAwRzZCUlhoWWxvS0Ji?= =?iso-2022-jp?B?UDdYd0ZGZ3VxS2NwWmdMaEVqRTh3WDlRb3dBNmloM2UxRStCUit2Rmd0?= =?iso-2022-jp?B?WjBUUzJDVmhZbC9ZbjNKTk4vbDJGUlB1ZFdPdTdzc3U3SWppWHFlc3RH?= =?iso-2022-jp?B?dklhV21JcnpTV3hwSDlRL2tCL2d5bVVFdkErWk0wZlM0dHFaU2RuZHhJ?= =?iso-2022-jp?B?MG4zdThKQjBGeHZ5WDg2a1hWaldwdU1MNU1MbjZGRm94RzdYb3pQMERq?= =?iso-2022-jp?B?czA2RE50U1MrQmJwNXBTL3hYcGh5czA2RUtMRTk0Mk02dFh2UlhhQ2xY?= =?iso-2022-jp?B?R2pvMXRHR0gwN0RmTmQvT20zM2srZ296K0trdXVuVWFwbjNWUXZ5bWRH?= =?iso-2022-jp?B?bEtmVDJiSjZSMTkyNDBhY1d5QVlTcGxScFZkbk5jM2RiYkEwUnJ3TFk0?= =?iso-2022-jp?B?eG45Z2wyM3grLzJ4VEw1UGczNzFwK0xZOEQ1R1poNDROK3hEcVNJdGNw?= =?iso-2022-jp?B?R0N6RGltbTloSjBnandVSkpEbFRyMjZiLzFRSWdNMzNYZHB4MG4wWDdZ?= =?iso-2022-jp?B?N1JQRDVRU0VOVG9ZMVRhdGZkZHBBVkxvanZCeDk5TFlIWllaQVdReGVN?= =?iso-2022-jp?B?VHlDUWFkUHozcmE1bW5zMnpDTVhTNDRSL21Wb05TMElyaWFLaTVySDgw?= =?iso-2022-jp?B?SEt3VkdoNTFLRVA4cWRLOHNKcm93dGdQZmJCVFAxZWh2cVQrbndSQU9y?= =?iso-2022-jp?B?ZzJTUUZJSGt3UGRLb1BmMG1sWWVKSUwrZC9sR3hVYVprenhZMzFTT1ps?= =?iso-2022-jp?B?TVdhMDFkS1VaZm1xUDNGTGpMN3lIU3FqemVxMjJwaytvaHpUc0Q2NUto?= =?iso-2022-jp?B?YUhUU2pFQ0RSemFaanJKUTUzazU5dXppcGFma3RwaFBZblVUcldFRm9i?= =?iso-2022-jp?B?bXFPQ2FpK0RYeGxJeENvTWpla3lSOHJ3a0xJRm5Ubnl5MFBRNHBiWHFi?= =?iso-2022-jp?B?bjMzckFWNDRzcHlRSXNhcmF0RlZXNzhQa2liYVl2YlR2S3hEd3FZRlA3?= =?iso-2022-jp?B?bjNHeEhxNis0cE5CNjhlaXM4ZHkwbHAvbnc9PQ==?= Content-ID: <1948D4ADFCCB3F4FAD4AD50C50A1C7FE@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: 40fe8579-b2f1-4d49-9ad7-08dc7e1e3dcc X-MS-Exchange-CrossTenant-originalarrivaltime: 27 May 2024 07:25:53.0634 (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: jZF8bkDwsuAcqagDB8dMhxcBB277HeszRvT/fTlZgHc+jmWcToPRd/2lOovt7TkF0gSiWOVizUGdoyti27qkK3oscGbcme+ljLfutRDfJMs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB8911 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/jpeg2000dec: fix HT block decoder 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 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: I suggest fixing Line 416 and 430 as follows. > - int cond = stream->pos <= length; > + int cond = stream->pos < length; Those are also related to the issue (ticket 10905.) > On May 20, 2024, at 1:09, Pierre-Anthony Lemieux wrote: > > On Sun, May 19, 2024 at 9:02?AM Andreas Rheinhardt > wrote: >> >> pal@sandflow.com: >>> From: Pierre-Anthony Lemieux >>> >>> Addresses https://trac.ffmpeg.org/ticket/10905 >>> >>> Co-authored-by: Osamu Watanabe >>> Signed-off-by: Pierre-Anthony Lemieux >>> --> @@ -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: >> >> Spurious change. It also seems unintentional and undesirable. > > Yes. Will fix before merging. > >> >>> av_freep(&sample_buf); >>> av_freep(&block_states); >>> return ret; >> >> _______________________________________________ >> 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". > _______________________________________________ > 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". _______________________________________________ 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".