From patchwork Wed Sep 28 18:58:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38456 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp444413pzh; Wed, 28 Sep 2022 11:58:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Fh3r9GLaSUHM4MAcrR9PZY5P2ko1jhjSnPt5y1+YH6z5cRoQCZZViPVRcHTQ61pA6bpD2 X-Received: by 2002:a05:6402:11c8:b0:451:7220:6343 with SMTP id j8-20020a05640211c800b0045172206343mr34266097edw.184.1664391535198; Wed, 28 Sep 2022 11:58:55 -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 z3-20020a05640240c300b0044615ee1b6fsi7149989edb.218.2022.09.28.11.58.54; Wed, 28 Sep 2022 11:58:55 -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=ey17GdYR; 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 F04A868BBE7; Wed, 28 Sep 2022 21:58:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2096.outbound.protection.outlook.com [40.92.91.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F85C68BBE7 for ; Wed, 28 Sep 2022 21:58:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k2ulq3a2MKaifqKLM2oth4jyVwAZfQjwm3EnjdBc51izzvuxMOT3Eh6gisbwynW1ktks4jXlo6hQWCI7USANQlCo9kGqF+TlePxBdY6OgH7/BJtkm+m7RhZhJTD/pn2COWCnmXrxp2fTIxsioT9IbQW7NhrIyX4gDZACClQulNmRu1css5YfoQmmdh8ZwYSM4+tJ7EgH06dnVEX3UGy8FZx7bOUAQhYqFaa4h//L/Wu8PwWdfWkVyuktjY8LAb1km6qMytvwuuqmpOM2vXu+SXa1WQ4af1VTAhsHQpeBDy5X3x2mCS7u0q7YQvUVCN0yhK3sEJK8cvhSHQjKE0mCiQ== 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=aboKi2jD+xaWRnfNz9ClREDsDscDsj7Q/W3u8Hworco=; b=NXlJipBUgzIst4RLUNZU7kUxICA2cUjlrucs0VX2Bh0hYzTndPsrdFabz1/1UPGCzvu1+6YmaYWKKe7pifhvECaF/spVGICW7YjeChjIXIZreE98UIEmaSzhg0SehqBGoc0MlGR+EDn+Wr/iS1Qn0Vmmo20ajTj2c2LziBG8+9PApevnDOfbsybujN+j74I1JYy+uJ/YpERpij5QsEAz9iDRQrBVDYN5eM+4CYn6yBsvA6qd2LN7QRgbGcOdb269RlOqPoAIuF7jjOHQW7wiV/RYl4sLYgF2ogI2aAcdjEbiJ2VW2CNzm4OxDYQ4XcPAZHF5DvxTLNlGFZ+DzG9qSw== 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=aboKi2jD+xaWRnfNz9ClREDsDscDsj7Q/W3u8Hworco=; b=ey17GdYR4v919aEzUAqHRM4HYu9oSMU/vrFmYUBssbShYVHO4S2JYMJspOcsWgs4Anio0Akvj/Firr1SkntO1tXwvuykswIuAclD9FqHYLWJPjpcrsoBAD2eYhDz3RX3PaRGSqdpP5CVKJBc/xDxy5Mm60taFUWQ6UytnjBxNH+EbQgaTLWqSUJseMWQWHoQx0XMniBvavguoMRbjPNF53ZMTbkq2Jge4OCF4JrMqhXRTMPgYPy8p+p3BHYDulAntovadTlBE47mXscCuTNyOu9fr6UoDJdx7KrbcwKRSADNBc0Q6CwHMDkrC1FG2XiyUlJ6gDwPN2cvTc1OyishSw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Wed, 28 Sep 2022 18:58:27 +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; Wed, 28 Sep 2022 18:58:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 20:58:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [unk0Ga+grwq1s4KXe+9lEXrK5H2y7aJ6iUCTiZ9ASQE=] X-ClientProxiedBy: FR0P281CA0051.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::12) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220928185818.1074689-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0014:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b410672-d5f5-49a0-793f-08daa1836d26 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kh+Zs0i80mamVaMOhNuFW0ItgOLPTsrHB9HeI1UiHAIivQ60n21KrwlFs7ivuKypCZEmAH1atQBoHdjvpV09TT3YFXREa1Tkg5sVAZjzJVcnZOxS58cmIlOlo1DCpoxXvAYjdL5CliAFs/iUkai4H/LKAI0fHl/c+YTFTfLY7YNmV3cdf2ckwV9X+td9z1fzXyOqno2R9vznawLjUgRQ5AmFGfLsP6s4t3UVWM4MRbctMXCXzxCCaIunWUFtjDfqwXmTaO+QvE9YNhB/FKGrGEvnUaxcRpmyYN2YlDWsQCWQFVbwU792GiTDWKGxxp2Ypb6702UWX1LcMq8RKkKdWrSZdVgtGg8uGj4mfSXsVZhVUp0GdLTT4qdBznJHp7Btz6qegrUiELYDzVfNDGivwcdHLZGdDZRcJOwYm2+Ogv/5VyvwhfpMQiAJNouFBHMD7gjA+OFOfWwjSRN567mNwLFXFF44MQ96pSKRhDHSixAirZJJNwIqadXpsJC9MujCp27UgBtZvftbmHhrfmm6c4qCUbnGWoTQyW1YnZFk+Y7fCslIj3W5DHUpRaQDWL1019+kk2D8p2cOWDOmz/9Se0YzVDTfi4g8tdXIyXVs4/k/jRoc9eZGSFNojX88AS9jja8as/udturI1vAz2zks1HJAhETi+Du1oSaiDl4etqVejEYEGcwcrWK0oz7RpKWzSyDtICAQ9PN/o6pT3+AyHAuNoofWEgBjdnUYpa+9Iy3Dcx5pn3qruTIaTDKQ9mm0DY/Z0sTX8jY/KWqxgiRfKK X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NwGYMKnexXCYiTgZ/ciNlAI0fX03AFlHsmYcoDz208NL5zU7ijxZsUT1AXK5OE3EIVLL9A2C2gUzyY5nwfF45zO1EcGcRL5yEfIxECPVQvIVUvGdgURNiH7MHh+k6IutnOl9Jbu4fZ8DgNE1FDqa8b6EgLsrrlzfIRgGuo8e2A7uWYoUabCitCpKCx1IYZiyMEndo4IQXCl4iaGM+pLLEIUsvIdYWk+VqZH/l6DvzqSb0vs2GePuxYjZ54xCLTW5sqCdDPEcKbuq9MQFIbwXfm/BjCvQN6YhAUT+NlW0vPypObLGpQGJ22wGTf2+j1Dv/Y8Vu3FzXsBSfVlUUNCQvL4Zo6BgKI+mmxDuWLzm/nkV/4RNHR9kFElpnw6DxfQqqhZ8WeVPqnTXqtE/3B1W3gj1N86m4+fzUVVzJDsxEQWnuV5RYd0JTXOGZxbVjJPlKcB2p8qEas51mrpOWOnTNCX4TA2xq7eRrwuQAMDEFQJzQ/fJSSgSPjtK1i4sQOkkcMvDv/NeMF37bE8Y392j/WQ+xDVGAbdHxUqCofq8S967ioGvtxz5ri3A6qv+km9SiqfuVY3FKnQe880IBIa4LzCyibdbjERrI4uFnW9cSFXQkMXg7jDyaAM7qzzMdeoAU7BmRQUmquCF/d/8K5wnPA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: T0pwKHW27kFJNEcfb62rvpm3EyoKfS2PLzRQ7jMyAVFwXVTLRhFSf/+dDK3NQ6suoGra90/vI9uh/N5kxU+b8qD7juEYyilHiv9FsnCHGliHoDaQqAyDhwPgXye4Szkkli5i6gZZQezTwXT/QRXEjFfBn+s9inwx7VqxxVYtz53gfZS7eFTRI9uPztyxdNsQ3PmwI4W7F4ZBV+ib9yNm43dEzHaCclpnGH13LZvuxTGijzAeX13BrxBrrHAUrRdMNTrqlIiwTb6fAaUz3uSehFiHSPGf0a7dxn3rDn/PB2Ma+gT6WWF//FCH8zVZFEuO6ppzOX1iIcS73JfF2G6dCnkDF4mqGvDbKbJ3is/nTCRtwItgxxLcoMf5kpgc3VG59x0fCPQl/TluEi7/rnR0TTbWH8PliYWm8CpON/IK6nHbf5rJ+wFokCWZ1VNRkf6M69hHuRrWTfhn/u1hCb1SI/GRJuKUe9FVobMlz/yDBYd5vbESwm+LUPpct4JewrZXbavdbFOTVlHS4JMIOyM35QyQGxgEd2M6bwts9YI7TU4IsAyra3cxJ2H9H5gyryhsPmhoi/gjPnMH5tdYgzuj7Ld7PW/MXacA0TwTc7cf5m/ZXkrN9F6bLPxnj5peOI99tgeOae9CEmv8mgt2RbERBShlvQNArlw93DogAUWC4u3sI5nGXoQZz30LgqAmOpyFA1NfW4AdOkx29UWW/ue3y+y20j+PGJ2eMOkF36VfZxD5/8kZwpGf/m7M0kdku2Q5qtEJGw86lhhTvls4hBakZRMDgg0NVhsXOo4wyvGox8UJY9UZZjPB6ctsHz++f1jbLWOjxdb0Q1XliJzmEn9Ukg6+czOycFH82h+AS1LvtUaO8LifbOMsH72GyckymEdRqsnbYJJSOudsnVAGQEC03EC9Lw3oSKGk7kfTG63fT8PclvDlDPJ94pExbk2CvSxodUEAl8mFbkJvuJockT6FnrdkwQQGV8+MbAdM5w+cFIfqS3pEaHBVRvTgAkwPQVV8tNv7ZszftGDhb0J+qMTgq+NR+DSR/bYFBvuQBFPAN5QNSFiS5oFudBhp5KYptT6Vwls0tODGGEbfsdW+w5HVVi3EvmxMRPODFWF/eNQxOd8mAIlWaB7hMD+JJKG0b5LhQz/dv17SRFWWGuP/Eoi75k7MCEDyEdL4o94mvQkbd0d6G/knBgYbK37AuRTqkrmupgL9+duBiOrDA95TlBN//JcQcTQ+Z5aOxMvKZD8joTVQFXGL7dF5JX1QQGXCPbZJeF74C6r/DPtcCfAYv2+0Sx7mRU2aqTf3JmgI9nk5po5PwlJAkvoAGw7X15HG4m3b X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b410672-d5f5-49a0-793f-08daa1836d26 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 18:58:27.2246 (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: DU2P250MB0014 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/mpegvideo: Fix undefined 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: vbuKuU5I9hNK Fixes the rv20-1239 FATE-test. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index d8c7bc687d..5095149eaa 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -843,7 +843,7 @@ static inline int hpel_motion_lowres(MpegEncContext *s, s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, src, s->linesize, s->linesize, w + 1, (h + 1) << field_based, - src_x, src_y << field_based, + src_x, src_y * (1 << field_based), h_edge_pos, v_edge_pos); src = s->sc.edge_emu_buffer; emu = 1; @@ -945,7 +945,7 @@ static av_always_inline void mpeg_motion_lowres(MpegEncContext *s, s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, ptr_y, linesize >> field_based, linesize >> field_based, 17, 17 + field_based, - src_x, src_y << field_based, h_edge_pos, + src_x, src_y * (1 << field_based), h_edge_pos, v_edge_pos); ptr_y = s->sc.edge_emu_buffer; if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) { @@ -956,12 +956,12 @@ static av_always_inline void mpeg_motion_lowres(MpegEncContext *s, s->vdsp.emulated_edge_mc(ubuf, ptr_cb, uvlinesize >> field_based, uvlinesize >> field_based, 9, 9 + field_based, - uvsrc_x, uvsrc_y << field_based, + uvsrc_x, uvsrc_y * (1 << field_based), h_edge_pos >> 1, v_edge_pos >> 1); s->vdsp.emulated_edge_mc(vbuf, ptr_cr, uvlinesize >> field_based,uvlinesize >> field_based, 9, 9 + field_based, - uvsrc_x, uvsrc_y << field_based, + uvsrc_x, uvsrc_y * (1 << field_based), h_edge_pos >> 1, v_edge_pos >> 1); ptr_cb = ubuf; ptr_cr = vbuf;