From patchwork Thu Apr 4 02:00:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47784 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp46933pzd; Wed, 3 Apr 2024 19:00:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWaobtq5X1I1g4Yy5ybXo9F4qhllc6yT5BnyFRWAbw9SzMuxg8iM3I36mJC6CGkN1dgBHMNR+NOL8SYLTtmco5BlzNbUJuO7sIY4w== X-Google-Smtp-Source: AGHT+IFi9bmcJ3BXQrSbxXD9RtjOx0bYmTxpJ5mutbiX2tMqxOGw8cCvRReAF3z8dc7FFb5r9Qp9 X-Received: by 2002:a50:9313:0:b0:568:180a:284b with SMTP id m19-20020a509313000000b00568180a284bmr474808eda.37.1712196043331; Wed, 03 Apr 2024 19:00:43 -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 c7-20020a50d647000000b0056c38035fbbsi7217452edj.15.2024.04.03.19.00.38; Wed, 03 Apr 2024 19:00:43 -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=V51kWM22; 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 AA6F268C4F1; Thu, 4 Apr 2024 05:00:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2092.outbound.protection.outlook.com [40.92.58.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 377AB68C4F1 for ; Thu, 4 Apr 2024 05:00:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rs3ebzOd6vJkGgrahsDlzI61LXe7e5SHY+YvS23Zie6p2DCsn8NubpMAEC7l12PG4XoQ2X0uK1LUxt1XJfKJPoepShf5h+pjOzV20QSMsG5tCN6UFNPHR+paaGrMAZVaAFsmKxBB0NfQJEcZPugU2yYhdjDVSO2rqBdkhOhL4yihVWkWGSEZBrYOa1zMoHjg8tRckjcTCZwlLwE1u6u2bpmPw+5hapWhpfTFPPj8O0lzNOe7E/eqD9TTSCleyFslWS80MGHzxCULzFiMdM9BSLONgg+/a56fSfZZNXEsQFz8ZO9Jx58or3jrQeIgcuCTbJ2vBpsDTClgV7ctISh7/g== 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=TpVk16d1m+bMjSVF/KAwfL2sXcIV+jT8cG/lVFn+990=; b=YPmf5ImPB9AzX3zr1qdbHVBsvFu+w7IEWDTQfZVl43FyKRBLfYCbggaR7kEa446/k4WUR+pkOzygQZvnX03BOfDX67T6csQmM6BhHbSLHOBw6mjym/Qb2ECg0R+/39ibSVh7RwaJAVnxCpz7d0h0EamE+D5oSsaB8f4HSOijQh5QgXgCxeoHKxRV8mOLsRlwVrBNXTH4m7ztjB2WQY8sNKQgfXwir4vhCe96x1c2A2333kl5L88yyFxjdepqu3EXzedkuhMSuL5f1Cs9ylQ1j9U7kqYrSmk1rkT1hJdLknaw3E5YWyVFiPLVMZl157y0Ptr6I+Uh59DORftksQ6G+Q== 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=TpVk16d1m+bMjSVF/KAwfL2sXcIV+jT8cG/lVFn+990=; b=V51kWM228wBOmBDrQeb/sHwpuMKQgMR/eSIzzLMXAJxixYs7MCXw9gk7eW1lu2scSIBMh6poHAeOCsmE7kppDhifozgTu+7CdHbbg0BGlmHfTZwmSPkrn2Str/X+i8ZSDV7hsko6vp0e595KKU2suYi/8rxJRCz1+uhb5Mn6h5Xx3uldVAzMdTrpe/SaM5k1mTLGMMWqc/bbFHnxa6ELkeQVw2X/VZjJetWUMgC4eUUHHGbuoKBW1CiQlOJRZAc2ta/pCZJIxjDdGY+PDe/QDxV3QfDuw+wYOMTqBejAvH1xnNIfLWDyMLO2Bmq/6xY4xh2C3lQgM7kKsAr5cgXCAA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0600.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:275::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 02:00:28 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Thu, 4 Apr 2024 02:00:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 04:00:20 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [+ij5mGM3BUij4hRjSNohLU4OHkj4Uft6] X-ClientProxiedBy: ZR2P278CA0008.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240404020020.3050261-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0600:EE_ X-MS-Office365-Filtering-Correlation-Id: a35d14c2-136c-4144-c4d6-08dc544afffd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +pleYRNnKpnJsL2sfpvOCp1SE8b2I2y8NST16Azb/MYRUKj/SWTMVJOL+59kafeSlLCAUCKpVIFpAi94lEhsGoDqH3OPhPxxzwhDRHrtqfTkiWE7IMcPv1RH0OW3Zpiiej3R+ku2sjENgbTr+eP9h8KuiFVBpH4f/hyrXDpYJ3NYqHdYGskHAognxY8VSSAkLLF8xCa9CdIyWcCgLqvoqfrNtHI2/l7Cll2iuV5FGSqgCa9vM+gNs6LIE8e0IuFV7pEZg5QCDXKUOoI8ouLB/zPCQFhQZ4f3Ngd4IIuSxImPNIzVt9QA5lmfq8ikFkfmXhTXuaLHct1xe8LTU5NR2Bgftm+pOodPijsgvJQhOV8f07vZYwl1OvEWS6VAl6F15lr55SzeWW70wDnOMTeWjgLhoJiF2JTO7ZwNJRmqQCvwzHbEb66F4mDBSs4OFSoiBKETfiYh4VMMObuATuSqQ2RhyjuRZce2SUlNCdHmLoMjsSZ53QZc80Kz+lrsFU23EdmZpZcRKlmwz/LdTSnSyFMAbk7NZSNlxOqERoevJglwwjqVyEzr/P+jplObC6CUDxn18fZzBg0fr/2Jwb8GtvzYX4Ez0tymD4VuXaXpjnGradPa/pioK1S3g+PY3Wlf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oYoXa5BNuwBHoYnlW1mVUmRB15lkC7C/TV3QPlLoSz2mwva0ttPhSO/kuxaumfEfwJSAYXBVN2YLwT8rNlEw6LMQNuaL1LTPToqYIoBH7WEi0drGJmpjIREOdzhWH0/1PZ6Mvv2JCtHiGqzpOZ6X7RBLdsIlbvBjWRyDbkLMqDqANRD4BC7qmKlKMO50K6VZ8OgDQrCkBxXq4JwEAXk2eK0ucFa6QSPfFCAULcrINUoKAGBrScj58bj75Sc+K4fQwrcD/iyiKbeaV0/JyqfqDl1jvfUmojScD3YmPmjzYExTBannB9HaALZ/1u9Vd3B9cIfwXLDFfMllJyzk+stzJFBUAyW1XlNI589ZFmhJRKeYSk4DAqxvuPedXVQVrzJW4sVtFch5j2IRpGBCiM2AsV0OS5Qlq41jUgx46Lj3MELXemG3GqOiatAcO6hJde0zyxPagYU7JEUZeQYuBI07SmZ10Z5iPdIyixF06/uje5dxakXQfP8fyd0zHDQzr9IH2B4Edz/gDyOACbem/vA64obXSmngSBkbQAr4ux9XE2hZYHjU/Yju/FECjTkiAp1KHskz1ojk7KiMpheJUw3TvoGWqauJYfkeYc/UWloXjQlPuTSVm5CC2zLibE/qrgpSJiTGo+UWjTv6LQJglZEhAP4WtLRh50yrhUvDLfbA8AgVq1BSrormc52t+T/DCtv5lfVSBXpEJ/jrPvfQBMFAHTS8R9/GmkDl0vJYSZQkCvmabhg8LJBCWvYi8ZUG0YhHGwq6QF/2M2PdzmhUSB5Oud96LZXz+qLpneEkHSBHJ7paRKQ9q7ylkyAb9xkoQm49WWWF9dHxkaJPiG5nNpBIG7gZZc7jI2ifb7EJ9QSX+dpvNPGK1pgmPA1zrUFCboZG+15eWJmEPJhj0Lyq9Thjf59Q+aAcWZOYOdoU/FD9EZdKKMB5Vm0N8MRviw+bcKtH0U1GnjHQfJwu+v5Uvwqo/3rd7a8Jsuif9EsZE8BF9OBPsUw0A69LVIpEeX8YhtKCyXf7RzmYApp9XXMEhPoItIs4CoG+1fTceVJamsL03WC2JQSvtzo5Bgw2VHyzeqKZ5VfKCFexrpPVhkGwShEd38DpGYVQbKbE5KlTimkmnqJkYK5huNsgtDT5QHFr3pkBpDP6qx4DbaAylOu0FUnormiDH+oLX6xYNLJ/dr3Msl0sdr8M1fkmy0vK0I2CN93GVcPEJgdpgp/nKQxzwdizqVgOUlsnLpvyDvTNyybqkneey5laKHjuKcJa1GfVanG7YXNSv+grKvAcHShA4QADTQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a35d14c2-136c-4144-c4d6-08dc544afffd X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 02:00:28.1124 (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: PAXP250MB0600 Subject: [FFmpeg-devel] [PATCH] avcodec/vvc/vvc_inter_template: Fix left shift of negative number 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: GcAaIxvuy69M Affected the vvc-conformance-WP_A_3 FATE test. Signed-off-by: Andreas Rheinhardt --- libavcodec/vvc/vvc_inter_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vvc/vvc_inter_template.c b/libavcodec/vvc/vvc_inter_template.c index e5cff079fb..e2fbfd4fc0 100644 --- a/libavcodec/vvc/vvc_inter_template.c +++ b/libavcodec/vvc/vvc_inter_template.c @@ -46,7 +46,7 @@ static void FUNC(w_avg)(uint8_t *_dst, const ptrdiff_t _dst_stride, pixel *dst = (pixel*)_dst; const ptrdiff_t dst_stride = _dst_stride / sizeof(pixel); const int shift = denom + FFMAX(3, 15 - BIT_DEPTH); - const int offset = (((o0 + o1) << (BIT_DEPTH - 8)) + 1) << (shift - 1); + const int offset = ((o0 + o1) * (1 << (BIT_DEPTH - 8)) + 1) * (1 << (shift - 1)); for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++)