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 C44BB4390F for ; Sun, 2 Oct 2022 16:26:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD63A68BBA3; Sun, 2 Oct 2022 19:26:55 +0300 (EEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066037.outbound.protection.outlook.com [40.92.66.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC29568B4DC for ; Sun, 2 Oct 2022 19:26:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UcWy1qylYPL6pGeRLpKuU0XM+619/8P+vjxgxJkEwoJHLInls3GAbUKHy5Ju8jBylat41uxtYaic/Z87ILedcrsRbV+iRDU0BIFjo29QdZhcTJfyDO4M+fdE3p8bq7RYHQZdf/hK1au9RWjwiJXZVeglPYfqCGc4COdbJDNp1P57kHbtsrqEZ/lZemsA5zCKr2EqP/Q2VN1dXyqUk6oVWXH0wAqSOVMZunpYMjCVLfytpoG1/0cZNSQDo/AsOsK/wnToL6QZdGA+3DNc5MrP9dpDXlQhS9R71xLe/X31+KF9IUQz0infVKHznl2OXewmELHFJOlKvuFFv6Ka5Su39A== 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=ZhvdP6GgUpAc7te7PGmw2suCtMfGhw8MYwfM80GdJdo=; b=fEH0Y4A8mn34sk045p/iJZXYCWYeM58w4yGPSYJ+1Le3MLOdnR3vRWI9WYh5n4xqq6SOJCQE/P5MPelC8RjlEsdL3z9GRf9XfoAXx5pvTtBvRgCiqmUSr9zEXTaUwyc5w5ufiFHzrQvSKo6M/ozXQvJwsI5jrot0OWQiZHOKwodYXAXvfk/Zvr2t+HxdtG300vd/n9pAAoLQZjDkGcSYv9zFZjeNV3e/k+k+eJrAWQTwTB2CJKHtm15tW1sAo/iLZcfEy33EvULHwofWvQLYFleHuNGLnFWytrvLIT8g67CWq8AH+EjwNGnd3uslhwMUHJBSO7YPyf0ryZC6Vbm+dg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZhvdP6GgUpAc7te7PGmw2suCtMfGhw8MYwfM80GdJdo=; b=r98uqbcGxF7e9xX/3mP7o3ccC94Yd0qgw7fDDKxIXjQKWPD0v/8sSpoZtiEfAWC1KLPLcnldcfuQNg/l4I91zYrBbGJr/SxHdGK9LKBD0T0Tgh6/guGzPgvwmcB2S9bzQnZFuSDxRkBD4PUb2RhmyuxMrwe7qkvfMhTSW5WU7IgWpT3tR/AozBnwiTs336kEVNq5ZQBPmKgmru3aYxXdB1PlpNxRdqnlc3StClWrPoRRc7Arr+2TTPJpEXLbYqFOWpeYBsUQi2/uFIiMsnoGHrEOqDUSEcInfBbH/pANroM4JWS/pbWSsWJARmawCGz/4l4gtKBYeCNlEDcNHvw5Fg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0299.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24; Sun, 2 Oct 2022 16:26:48 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Sun, 2 Oct 2022 16:26:48 +0000 Message-ID: Date: Sun, 2 Oct 2022 18:26:54 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [6CSQA0tOYYlqPGCTamCaT7E2wrCpadq0+mLcABi8R5A=] X-ClientProxiedBy: ZR0P278CA0017.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::27) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0299:EE_ X-MS-Office365-Filtering-Correlation-Id: b3318066-7650-4770-b143-08daa492e77a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pU+f+GJg4el97bA+ojhSiUn41IQo7M7hdlFjAffzvHhiLWXtP0tA/aALXcX56qDgkiTW4ftkzyhn6kUgFy0EUzFS+XgLYzTPUfYnSHZJiddYS4/uXUdMS4e2+A5yUYov9yk4rN3CYOXFeAHBdbl19aj7ar7E/fP5PKvxBChzxtX43BkEZUwzNybvn1RPA/wFpUf6/a0Qdgznha5XACxmNG4IuWLxAQM+5vPN16vU7mW1MsyKBSZD2muqMX69hRoySKj+CVR0USwW2MvOfCP1pRDJtiANayXeNA95c4BFMe9Xld1lPlmwXp9FzGb4qs98pQGv+lzJO9oYAgnTILTn8CrP3BCXEBOp72VTtbs7T0QwwAcWnBmjr4BCySZuumaCtCimtWBMBInRjf1AykdXvgneMQYmYpUxPfP6qVpPMDEeOjad0/xK8dGvBif+JwgJPgWHOz852BuzmgGYkz+ASy1tb7IWUk7LzwbJbIbYAJ/sbE7FuQA6aVpuaE+3DtQMKDRzcHtHBE80+nl4a+ckm+4bV8ncNS6MYRzgpwwEzfKB1x2+xlOwSCNSMtINGVaq+eDzXnCZ87+nejYFJCtaG8IqhYRGR4Hu8mIXn9wcApjiit6UiBV5gDVWldUT2yNTbs/GpkJ6QiscIel/c2SzXV0Nc3qX/arw477TIj59a7oVCvz8uaZNXpnv1goUm9cd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WkhjN1NjWHF2c1hQSzQ1eFV4ZlVrNFdFQ0NheG9GZmM3ajdhbEFmSFdNME5w?= =?utf-8?B?TGc0S2ZiVFUrSkF0RDEvTGVKRnhaK3hIV3RGcU9MVElZc2ZqWHMxcDNPd3JV?= =?utf-8?B?ZUVxbFZmY3JaQ1RZT2ExOFFxYlNoWlM1aWg1S0cxSEl5SlRYYUQveWg3ZFpJ?= =?utf-8?B?aHBESlJxaEtnZ3ZscG5Hby9qM3ZITk4vd2FBblFDL0FEaUdBN2MzSDRRaGM4?= =?utf-8?B?RHZCcTlsTC9zZnZCMWxFTE9rMEFqdUJwbUpqbDdtTnFoNjdkTUV3WUF6RjVq?= =?utf-8?B?U3QrYXVseUNKeFhBNTlJZFJWZ3dldEt2QTBPZkx3YnF6QjZwVVlmSTJ4b2FG?= =?utf-8?B?YnNWTXd1RUhpL1Fhd1lsSzZzeVdKeFdxeXlHK0RkdXFwZ0k0UFBJOTJZekgz?= =?utf-8?B?OGllY1Z4OWRnUDMvMDUrcWt4YTVIREkvUUE2QW1sdE1SYnRuL3laVzEycy9N?= =?utf-8?B?ajlDNkcxWDEzS0hjdnVYVHFuaS9KYmhiQjZaOXgrbWwrV01EUGtrdzNnaUpu?= =?utf-8?B?bkVtK01SM2VwVmRDSy9UOTlWVFd6YmRxK1NLNjZHdHdMOTloVmhLN2hzaktI?= =?utf-8?B?M3JuNkQydWRuUkFlVnI1RnkwOW81MzBVazVMRXc2cnBRMEtPakorSSs3U3dk?= =?utf-8?B?RXQrdkhQSFpwcjlvLytHV2tHNDNtcktmRjloaENVVXNic21xaFZsSUd0SzJS?= =?utf-8?B?WUVqZmUrVVV4MFhkU204RnI3b1dtc2FPU2NpeGd1YkJPN0dFSU9WcGc3TUpH?= =?utf-8?B?ek1xb0NqYXFFRXU4MHdXZHNXU1BYQU5hYlhvVlRuZExISzFLbGZGLzB4aEVJ?= =?utf-8?B?ditEbVd6NmowYjZxTjQycXdpb2U1dlVNemhFQ0NybWhGdW4zOTE5VEFDOVRr?= =?utf-8?B?QmhDOFJwREVKYm5IZy9qdmU5MjhlWWZpQks0dVZaeXBRUkhueW9TS2N2K1FH?= =?utf-8?B?UzVaWFZJVEtheXkyK1A0WG1pRzJtRml5MjRJVjlidHlOb3ZJK3Z1ZGs4cVJM?= =?utf-8?B?VnJYUHVOUXNkYzN3cDd2RU9HdjBhUC9Td1QwdFN2Q0gwRldtdHV2MUdKdEFo?= =?utf-8?B?dUFnNTRkRnNSVldMaXlaQVpZTUdzOFg3U1JsWlBxTVhtWllSRjh3Yit0V1Bv?= =?utf-8?B?OXpqMTZ2Tk92RHkwRzFWOEJsZGdzYlZGczhJdm9BUkdrRXVjTm42LzVUZEJM?= =?utf-8?B?WE1oaEJSMzI3bUdaYXI4QXcwV3RRU3VKd25oQXVhV3ZFeFlTclRrQVNwTG5u?= =?utf-8?B?Mnp1aG9TOEtKVGh3cW9ReDI1bFpETmZRdTF5NEtvbEFmbEZlbzkxY0RraGNO?= =?utf-8?B?YVVrNDJoQ2pTWU4xU1BvT1MyQ0ptbW14ZnlFVnZORFoyVlFKQTM3N0s3N1dW?= =?utf-8?B?VFJUT1FTUWZSOWp5eUFRN3liVE94YlZ2U0lTbVRlK1h2NzBPaXlDSnVnSkJN?= =?utf-8?B?UjQvYWZuczZrODNFTzBFKzJnODBHaWMySHRncmgzaDk0aW1HUU9OL0txbklS?= =?utf-8?B?M0tJZ2ZnZkQ3YmxNN2piT3p1S005eXJRQWtiMlRjR2dha3IyWS9Kb09rWnJx?= =?utf-8?B?dUFvaEkxMzF4UEFLcjNCWmVnMWJEaU1zMGxmOXRkVkxOUW90Tm9XQUFkcDRs?= =?utf-8?B?VjQ4KzhEZzQ2MVdSNDdaWC84aHhUbkY5OFFTTkdLWmFuQldFa1hBbVlzcHg0?= =?utf-8?B?c0k3VlVQRmNVYWk5QjB3bWdndm9jdk9Vb3BBdHBoTFhxMWprMHIwaG1vZXdM?= =?utf-8?Q?fe6O+fzd3V2AA/z9RygYCZhX7WXEYwxsU6An0KF?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3318066-7650-4770-b143-08daa492e77a X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2022 16:26:48.3978 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0299 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/vc2enc_dwt: Fix left shifts of negative numbers 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: Andreas Rheinhardt: > Fixes the vsynth(1|2|_lena)-vc2-(thaar|t5_3) FATE tests. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/vc2enc_dwt.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/vc2enc_dwt.c b/libavcodec/vc2enc_dwt.c > index 441af040ec..809f938e1b 100644 > --- a/libavcodec/vc2enc_dwt.c > +++ b/libavcodec/vc2enc_dwt.c > @@ -151,7 +151,7 @@ static void vc2_subband_dwt_53(VC2TransformContext *t, dwtcoef *data, > */ > for (y = 0; y < synth_height; y++) { > for (x = 0; x < synth_width; x++) > - synthl[x] = datal[x] << 1; > + synthl[x] = datal[x] * 2; > synthl += synth_width; > datal += stride; > } > @@ -223,9 +223,8 @@ static av_always_inline void dwt_haar(VC2TransformContext *t, dwtcoef *data, > /* Horizontal synthesis. */ > for (y = 0; y < synth_height; y++) { > for (x = 0; x < synth_width; x += 2) { > - synthl[y*synth_width + x + 1] = (datal[y*stride + x + 1] << s) - > - (datal[y*stride + x] << s); > - synthl[y*synth_width + x] = (datal[y*stride + x + 0] << s) + > + synthl[y*synth_width + x + 1] = (datal[y*stride + x + 1] - datal[y*stride + x]) * (1 << s); > + synthl[y*synth_width + x] = datal[y*stride + x + 0] * (1 << s) + > ((synthl[y*synth_width + x + 1] + 1) >> 1); > } > } Will apply this patch tomorrow unless there are objections. - Andreas _______________________________________________ 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".