From patchwork Fri Oct 21 18:59:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38872 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp927097pzb; Fri, 21 Oct 2022 12:00:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6oueD83Ghk7M9ElIw+RdS4aFfINAGJsouHiKbIsjEicj1+4AGsTnNDeay6q1dXPRrRVtiW X-Received: by 2002:a17:906:d54d:b0:78e:2fbf:ca2a with SMTP id cr13-20020a170906d54d00b0078e2fbfca2amr17198544ejc.488.1666378837251; Fri, 21 Oct 2022 12:00:37 -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 v14-20020a056402348e00b004511d552be3si25182813edc.4.2022.10.21.12.00.36; Fri, 21 Oct 2022 12:00:37 -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=cFkegJEk; 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 3851C68BEC8; Fri, 21 Oct 2022 22:00:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074078.outbound.protection.outlook.com [40.92.74.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4D2E68BE9A for ; Fri, 21 Oct 2022 22:00:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TETU60ZffErciL4bw4XDJtOuBFcgsEcQUZW8KbtnSVwRU3pJJ/zNjqRFfwtvJAkuaDrZtCXQUzlBhIfYKA4RSdhF5cscJAtWiOrKwXDQwwEJDxZlZwOVLeNK3syeZ4KUMImni9yenEQvXee825NvHsa0rCGaCR4EQY3eDv/gFshoriQl1xurAXfWP3Sq12gE08qbj7DWCZXXeubmmDUYCZiXNSCeyLyVVskkRFWWGf6Jbb8PJ1ov44HX4o/zIMUE5rRwMi6GUzhue2iTdXzVdrhiCERG0uZsIShW9+JfpDT68jBTO9bjNkV9pFmaukQZ/PF6jg1ikVXGykVd70FvIg== 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=5pG/B+PkrrzwT/VCYog1+30KLJhFt06FFy2IhQEgv+c=; b=dA/n0OACFW9tNm+rP4ya0Un0oMk0Bi7HbUC9sm0p8ZqltxDXcmA2HE65nTPA/lqo++FFuy4UY0Sj0KqsuZZh/q9TAp6+ZnbWpGFog7iYi+sWnwNc72NCYhSbogEcjXhaqIKXBQlGt6S1Cg3v1MgUo8KFyHkstF7lwpFlWh06NPEQC19mc+CMidxjyqVE8i5+IzK1I0Y+jQYFTqE3ZHPyu5z3eLEcwdW9P97LTfb9Vqu7sHuvpsU18pq0UQut23t79rD/oiHhkpKTqQFlrdGSwqBTWgKvq12zS6O4JAs3Fgm5bVYfolifV/fEZ1bV0ZAPIJjfC+hpLs3E8DFk/wSKbg== 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=5pG/B+PkrrzwT/VCYog1+30KLJhFt06FFy2IhQEgv+c=; b=cFkegJEkwVfdcdC06ix4BG6JbGRg5RhnuO2LPfAFYh4FHTyOSHzejPlkrnSj06j8MRg6CeXKEispcjXw7qz3jdpqDg7QXZ244pxdGni1DWBgSBVx30KbIaZzH7Yb2J+HcKh3KC8tLQIObW0LStHtiQXXUcbDsANkA4+p7HMMAX462qbUD12JrVpDx9hntulLl3TIDd9gxBO2ek/6EB0Kdwt5u8D1i9BUPf1xDbE4WI5uGpr8jWBIVz36zXxVx0MP+hI84WMa3zEoXqR3fcKNjnar9yrt/JlzgruRGaf9dzPJMaL1qQp/oS2PIomVIvpquhDrCBEca6jhuVL5LRnfgQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0491.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:291::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Fri, 21 Oct 2022 19:00:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Fri, 21 Oct 2022 19:00:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 20:59:35 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [STF89MNxMUhyJvDWUIIbuEC+XdeSBPADBc+P7/SOlI8=] X-ClientProxiedBy: FR0P281CA0047.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221021185939.3096155-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0491:EE_ X-MS-Office365-Filtering-Correlation-Id: c4398e25-32e4-4eb5-63ee-08dab39683b8 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxlwt21SJ65rVaESusrU4PPl8ZXoOY0RAb9J/x3OEtfLESNhLOm8m1DPwE1yezzSgWy8LPcO1vuWDi0ZUtZqHXjxgWcvYc32GvXgAJW0kvitVNsBXUtrIlvip1ASUMlfiuX5ggYCMfE/41RYcpwsIe50Gpon2DsXU3H0WUJBZov8Nc+8vvRXrEq8/aHyc7660puhSCRu13aqGcpbVYVnCd+CPX2+Zs7JykhmR0ypJNvkPhsEZ9WkMthxaNoX5L9pwaFHekzTsO/RaNlLsqfROhGxopeG2XpaW7ewFhVt5gaGT3WU6u1QeaSQRNzjpwsjo688LwDeV2JiQwuP1b4fv+f0651WPRWb34D+hzdncOlkdt4VNnZ5QU4laAcc6O9KfTUTvJACgSRdc1UsGxwmCMdMOUYJ26weRihoJmZPtibq8UxJDvrk0GlSRyF1UEuEu07FO/yYneMUlpuJ+9cATgHtoPte8gcEnSynZvnZ8R4QIwlr1D9PSLLhMlzOqb+JAzkred3+8c7E/x7qk4i5K2ds8TIJhTGC2T7x3K6SyNUW4WY0jxs6X14rO3Mn53q/O2L3S5OpgS9xRcFu+7ZgUd/VQN5xeRQDYWNWDNe3E90fM5tjiO1QOkcQBYZCJ5MhOlpVUK8GFzhLbD2IKDiIuIhL2xJo3fnBaGDGAd63GD8CX7MiHAD4rkczs4BBZMyR/BMSaI5qfx8Xbs1h/Zty/HukywyDIzWMj8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 63dtAwHQ9y0FKEbMTpSUM97kjlpmU0Rw7BEILi2o6lRsKbyqaUfirR0bI18z/qddbrqvO1kHVb/ZWN4/1G/+VRx40lhX8a0S3w7psyxeI0qgLMZ5rQvaOUskfGmEyzmjFj+0PidtmcqiAnDkB6d9IG2khM/Hz0zEfx5g63AXZRRjI8d3TfwoH2h21Uxsm7wHexuM9Mnkezt1dNXMlOu3gysX99DvmD+vdt4eV2Z1AEg4SCDquFZWXqj68oNxjwVG+oy7DuqLVOIk/kcYI9fTFbCUxgAB1QGrqfCuDuWoMM+exTs7Ax/PlWvXmoVTgc8+kYQUsKomjH+uNVxZ4hk4Eo13jiUAcvSV9SE/b4qT29NErLzFbdhU/a/XE2z4kRgrkxU6Q0ONcg+pPSxclltR9gtvjG+kE49PJsF2+f0znSiDD+/T6XeZvb37/Xy8XhR5+jrl+oX4Sl08lWDpFwbJ9HCEhA7V1Q6Hy5DgIhj9gM2LmrJsZMISkkb4hN8hTrzaUHyvRP8YyNYV7dYTQg5TGGfcUSZ/mbWQNycGnfo5Ff5OSbz70pIijaBRlQg2SqCbZK8iKB/BMAt6ecc+Fjd5EGgNGcViNn9if8X2qOQ3HebljD4CkZsHw7iE4vK23YyoAAmZdkjIg7PZzztK/e6AOoLFPTsnjF7b62z4xcxznkBcAdv3acXejW4WJBJzeeKU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DdJ8A5r8uIzK6ANKEsA2EH5BBpu69u6hb/Oz7BwguS7oVpejoT+yIT9w4S25gBbaF04xmDKBqRX2qmcAy4X+tZFim18qljs34BnF6RZlVFR4avMKN3K+lA6hHdt1eUHhihI25AY25TGy/OX5/71namBt5PGPj9p9ikt9udCst5nEW/19zcQ7N4EnvC2Hx6Ht4Wto4te85s3UHPB6oLhjchf1JVwOzyopa1RbMSPeqLvOS/WjXMo/xNNrI6bjoXXZ5xdany0NikrOspiiSDAxXhSBINJGZkCT607Heyxo6rJq5c9SPaXFGNR7pNLQLxgVBR9LU610KX5DsL06qitEkIYmGLSDbFK0S9LR0/3cDv69by+t3JdQ7McUJyInrc8WCuy5XVUYK4DluflQ9KZf0QVRcrYjHuxIZk0WJemSkzl0KsY4KbvopCSsUO4/S2xRx7bFwsfHispusYSN2RzEq821skdrH8jRtZDm9MCkVbeq6s2dDxVULuCPv/12pd66+DFOScFqkCc3mFBOaGRiXmiu2Ad2DuI15qJpjnZG4b+IW+5YvZYdq2cdytuijRbKQmC/PNVegIQgKSj+lLqFfjwKH+JfQ6tiw8HEUzpJlirm8trsCE5ms6mAWMSzRn5z1KRNBPq1rZpoqxNL/r0xi+tcE1kXZ18DV+gPqOhL+60Uw6VSacBpoTwVW9atSeLStdfwmiXLFPZgDNoxLEqkm0kNfVIhINvFEeFFLWlAnlBqdjPAlNTMIwHx37k9b2poVpgLo2xth27wnYvjrCsxDaaIsZVocs0iHxPe3hsiwwGmnWIgzNh/POIRChURWULaXzfd5Na5cYxDpfnnqE/i+VJYXU/FG8Y1RKt2VCcHBn5KethQMs6msD6XsjuUj9vE5WZAtdmkPAMglSI6gCXfDcIcDHHJKmo1ZoHJ30VEF3GFTZmRLw2YJr2Taa7PT5AtbVxqoXDOmdeKkpV82RfmbTN9NTuEkCAChs7NIbfg0vHuWXE9F9h6ulhJTJKfohGSNHgt8JiBlc08CibKT6sPL1i1qG6Eb8xvHDZwVIwVJpXic+riyZXLdTb7wXlUDch65pIFrerRwQIVdw/WSHO0MeTH6Rvkt3F6pxSCyFq1pa3RhdhZWUCIqGWCHY9gy7diHlfTyvd/6E7/qtzaLku/bQij9sF4nz4u4mq+pbNJm/8AGCU6C8hqOZHW+NRQrOqWy1xRtyGL0hTCHrM8zZTfRBtT8WhT5pCM97q7aDMDww7AnDpn4qiCbf3I6teBGEyZNIihPL4veByguDNPInq84oSZFYG7vo8h2tbLVqtqAF7RJ1yYJjVtAQlFHkDF0vKl X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4398e25-32e4-4eb5-63ee-08dab39683b8 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 19:00:26.5224 (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: PRAP250MB0491 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/snowenc: Fix invalid left shift 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: xqQo3FvspadJ Affected the vsynth(1|2|_lena)-snow(|-hpel) tests. Signed-off-by: Andreas Rheinhardt --- libavcodec/snowenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index ea0d4fc27f..ada24f7895 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -935,7 +935,7 @@ static av_always_inline int check_block_inter(SnowContext *s, int mb_x, int mb_y av_assert2(mb_x < b_stride); index = (p0 + 31 * p1) & (ME_CACHE_SIZE-1); - value = s->me_cache_generation + (p0 >> 10) + (p1 << 6) + (block->ref << 12); + value = s->me_cache_generation + (p0 >> 10) + p1 * (1 << 6) + (block->ref << 12); if (s->me_cache[index] == value) return 0; s->me_cache[index] = value;