From patchwork Tue Sep 27 15:17:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38382 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp601828pzh; Tue, 27 Sep 2022 08:18:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5lCrjidrRzgxcsrIYXukxcu7G+72fK9aGMLGTVO9dQBeD+NhZ3ae9/58vYs/bY1qlNuM8J X-Received: by 2002:a17:907:3f90:b0:782:ff26:6e8a with SMTP id hr16-20020a1709073f9000b00782ff266e8amr13994790ejc.192.1664291883116; Tue, 27 Sep 2022 08:18:03 -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 nd8-20020a170907628800b00780e89aecd1si1748271ejc.849.2022.09.27.08.18.02; Tue, 27 Sep 2022 08:18:03 -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=@outlook.com header.s=selector1 header.b=uDBfcshX; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AB3268BA6C; Tue, 27 Sep 2022 18:18:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073030.outbound.protection.outlook.com [40.92.73.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61B6F68ABE3 for ; Tue, 27 Sep 2022 18:17:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RUb1sCfMnhk5ZJaAsh7K/c12Tck0dLCyLwQkosiPcv3fdl1UmOQjQb0uqu+2tT7QtwrN9vaPcNkJE4TdmwzFKzJKDULr9vKrPqcQGmOb20OwgUPrPihrc/3T0soifFsBUdVXZEDV8bpP+p4ZNynazrguWfKyLBEcQpZwRet8NOdK1jcMzJcvk09v40aRqN4sXI98UCI1ap3oA+01BJGm28e5N5Crv3PAnMk8+zjHhP0dbU/UoIzqJ7edaPE8cD7OGrhovvWli4nH3m0r+EB9a26c7T4ACMMqiGTqQSPYHT6ocN4kng+EEUhJlvNZsU5hg0MD8jI2oxSamZ+69UGJ/Q== 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=DKVshS4Y8TjT/Vt9kVMy1la0Y9aaT/8sgnkevhkGebo=; b=ZJaPfzMR5fBrneYr5GoKbUudWYW9INNQz4Qii4iC9PvBi5K/sADD7nsVreNOqTpBPMkjFbZJp1/0fxxUNqeAxOISWfvdlyPgpydaA5QDAnR6p2d+1HdG7yYL648NroRknBY3xUwbs5RAS3AE+1tLaYxRrIzL3LONuijNo4zbIjzxQMA442RsEFEvPVN1EeOdkKZr3XFbLIJlb2/RPuW6xaqAfJ5pqsbA1eVtMUapvTp+gzsDnAckB85HsZmDWpImq3pvdCW3Wf1SAV+D6sG8di+mSdue63Q5eImPO22oSoFgppQ+8c69/VkcpBifrQtswbHq02l5mfb9Vs6BtBGDqg== 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=DKVshS4Y8TjT/Vt9kVMy1la0Y9aaT/8sgnkevhkGebo=; b=uDBfcshX6fvZwf6SRtBXlNfc/2endG7JNs2UAPYcc5gtDLsxE+p2TrJTaEdkJ+ol2jPWPPsWTf1DYUuuJcC4d9DV5H0yBR1Eg639uDHC+DAvUdVlNsw+13jzpBhGNptT8h5uXmT2y1uiv8X06Bj2K2hOW6aWvcD/wckqFs3yI5gqb2UPp+FAObn80kEDOc1goBLTSAiR+eHhrOaJPHiRffqNtjVniRQy74LOiUe76HgLfwA+5XHy6RhdJa/TTeHG/+1cJPTdZvyhLiNXiQ/A+u5g1jB+ioiwswkLUjLJjbnLmi1dfRin6pb+LP9aKzI5YV5AbhnEq83jljPYGKaKMw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0349.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.15; Tue, 27 Sep 2022 15:17:51 +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.5654.025; Tue, 27 Sep 2022 15:17:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Sep 2022 17:17:50 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [gdKr81gBuCzkv2B/tcLnvuVRuGgU44AYf/g8qp8Q024=] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220927151750.148970-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0349:EE_ X-MS-Office365-Filtering-Correlation-Id: 957fac2c-e14c-421d-58e6-08daa09b7138 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHWOi7yGklKOEsVbKfQRSpCpa9+lRNJchkbdaIFVuviBk1LaHUFJKx7I8QGbCzWWcxyU87vZKIsxZLQz4AYWbwvWUJyxWehds5yjgkNXsphDDqLhVsiyiFdCI0AiwcQinP2LDtMdbp/lsIQSymTmxyNs0YghOyGTr3JvirzENA/YcLQxmr6j81/PKEO0EKjjQTbARZKd1lzyqtf/Seouznp1gSfMxjgxpCCLM/DnLJNWeyfWQk2LPpMOi3bsvFVh5jHi+e+NpVSRlKXYUURZ4xjkae9592w1pb+vzTcPXbcKOXNgfj5kUcqYVOJSBlFDM96sQ/pK3gQbR21ApE8asQ1jTt9ncCt2w0tptSvuAPuhIQ0h4MmaT43UGi17o65ar49dwpD8HdqioVLg5p3TE13bSTclUCWYybdEwAalggvnGT3a2yalfEUDhXRpXQ+3c17sPKJrDLBgncwaxlJsU7Nn/YwGolnz888ry6+oYbqtwpWxhcn9l8M9aWm0vPwmg8QPmi/4sAgv7iy3v+Y0Dl6Nr0HLI35109Rygs17AmlKs7CNGaCvsTQfCyOyc226aj9Q6e8/Pt5UkTAQ2LnxzJhqMm5RF2n0HLpbPvvbkHm8I/LEovWA7sUs1swwlKEM/RUG8ugwvBoDRAZJWePqI5SQdEUd8AImfw5cPj1kAFwmGJOHDycrGXotThHgFZn5Np1E/yWm5pJeRA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2kWFgKjBc3UD2EPj90hjMThwl5dbXIc+0aLwBuN39rgJT0/kIeNNJ66zB7TxIUBSoLSnZpDoAyw3hUSEaKpJAyaw/UuGpsh0EReB+0ibJ305rSHjQKDyaolD+9H2JD333nu+um6nJYsVzo7OAiDEbfQ/eHtvKIaw99KDrL5/Hhse3GziPPGbi/u3WSKV0CqChMlDbI49ewJdlCDyZzZwn9GvfRNCGg4u7uptwD6HLAgp0RXXBEFDIevnAwSQkC2YVXdTC6c1LACb7mb0SQ2++ecoVBJbEsvBxuYxx/PMvKOhKI8SMcWg73IBKkltk+SC0LeHzOKDjhJrpRNvFC4atPVMYrRT2uZwFVLeFUsc3I7dF7mbBdH/WlrQNsS3BkbgOUPrs5ow4UHLecDmheH5E5zLiuCrOWY6bWwC9m98GXasl463oo6fGXeOt4/CJB598x0PKw5CJIwiLG7AvIiGQz0DHpRsGucDZqpeysc1bGB1d0Gq40ryu4fDMhm/2oIhdLxjoMEtHcqq0s5DWuWrbwaE8oerh2vihqKS4+23UaPAhBtm5HRrZzfwfnOtiR+gbnpr3K3n7Uoa3cUIj68Pk0Uk9BIXHdc6syOneqAXiueq+obvtuspEC1B9v6Z65eNp4AH1rcJi4qCupjwBmYp9Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0ZX/FbfPW9L4upKfyULwFwuhtSuvZnaSvCgb9DaKaHJBMYCLxBOWHcyfmACVa5sjv8a+rgLWn0rgtWDfo15i3NdzBYylhoQ5cfTgGHHXHr9XobRXVueHe/Riu9ElsB+PIrfa79qipReOLRZcdnwZkpwIhlrzhwFpOtvSjJCH3k4vWxYGSbd/HbCXP99K6n/v8ldltInkVESJeNScTyx9TzRqdEaUrLrh5piVKW2PrCQmngipAp0q6kJLdUbHBPBv9QIg8khZyD2M3DusKI+Tz9Y74a+9NEshsuzcWCfUUGqAJEEnI5mtdX4FRtqCWsvPWeUMPY/1LE4nwNPLuICmEoKs0p3fpz8qEamnzcwZddCbDkxuo765BkdwYrv20O3I5L0edgmQHlWY9J4wBIUjE0QK0VOvasx7BKk678F8sdf1I/vdeJvfeB2ycqq4ykXAzX4U3qy3ryQ5G0KtjWJ3IRNuBATtBTv6ldOSx+FegVunYJ0Tqi4w1jtTUZ7gejAWKbQzVqObY9XPcCjLktyTshKRCyjzZoysXsCAzMyOE/xmlQqYtZ92tPXpwi9g1dH0FvQh4WUj3RhypvV9zDr80XHgyVIe/IWqbRLIoT5in2JK8xKa2/DKQm6gcm2EZmqWf7JTJrpVAoxkBV9Wk/V90Hkb9QyC9VTP7uBY8Kx0jfr9hS05l2IPGL9jb/Hkxr9hlD5CjcvW2dH+bw8kzXmZvIj2BIeaogbxfyajyfrD0PiTQXMX5dARoh6yuQCFuy9H332oKlGz+wlyeOV2HJ2emwxuC0T4Y5o3gK13+9LgnEBX2IEFcJQ41kHmGXnafpAemhial6xzV09JwBghX6h/WLGR5g01iNPOzvIxYlqjfxv/Aij5PAzo5M0PqiIJPvM/hWOdL6arje8C2ixbsecFh6zlrs/OY7lvqfROwuApPw7l9J5VjjnFzKSxuJu8ZSkASu4uzdH9GwR9UIcZVgFdosecQke1QZREg4CFodWwlZ1dS9+0vIiD7raMlIE0p9pXfr3d8hQH7oBOVK4CkPRHTIgHxWW8gFkebdWmxsLqZkuWaC0KnmrOfaJyJ92OeJpI9VN+5eOeRRaWfkhIJqthVOIhXt9CBIHI9QNMrvuepmGhh7QKeSM4FeFea3KLlSvVCODgyf/x/89v06BFvLB49/MctzYlLSmU8L21LqWyOukF4udEKZG/BaR06floPXu2M297ARfPZBGM42j66+3IzOPGnqCZXV4NsNbtcCRqEC0ycMHAbOGXfCUbyVti+lJO9JKE+ONFLnd5qC42qbaduqlyZZsztJ6u0KwH6gXf1s9zuUweB8cvcIWFnFdiAU5w X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 957fac2c-e14c-421d-58e6-08daa09b7138 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 15:17:50.8426 (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: DU2P250MB0349 Subject: [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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VXQDuttVIIRM 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); } }