From patchwork Wed Jan 26 21:34:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33866 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1882263iov; Wed, 26 Jan 2022 13:35:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYdynlVN60qBlwhiLM9nb1PmTiD2iQxvCVhSJ2844qG2QEtgxnGaSk6zu3RYXA2YYVzcja X-Received: by 2002:a17:906:58d4:: with SMTP id e20mr459901ejs.769.1643232932408; Wed, 26 Jan 2022 13:35:32 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c15si232790ede.581.2022.01.26.13.35.31; Wed, 26 Jan 2022 13:35:32 -0800 (PST) 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=vSgGIqx2; 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 4686C68B11E; Wed, 26 Jan 2022 23:35:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071048.outbound.protection.outlook.com [40.92.71.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8AE168AF21 for ; Wed, 26 Jan 2022 23:35:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eCcxFFYxQkqdmF87fNGN9jMMbrRMnXbXpw977xGxhby7r4lfJvM1P9nJEL1wdemlYhr22zigJT4hhHGDndY8ABaRZ8kIT+UcdIdAN0WNKDjYldwDm0nIMWaNQ8HU9I7+ElXRhuwVQmKy0LSQQ5zCHPB3H9Utbm3jC/vDpPtMo9egQOdr5m7080nEbYfq7eI0AxymPjMZHSCJtZ82O7S/XpPzrUDFkLgCyUPuaB3wOMFegYbA61lK14GZ7WDlzDCisZEzVaqZZCfHhryolVx8ZNR8nCWijn/o5tS3dBRL/8IdOQvP+XqxFkNaHKdhCojeJQcpSD80pxdedmKJwFJAKQ== 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=Hg0bYB8uEN2W2kH4fKL4QaSoWfG3Ixl/Mv3+iPCEq2U=; b=k06i2TZbsH1Z1hl8ksvux8lQdMFt68FC82FZRu/1SbkRNjS3Nb72TBP+aruGD62mstTlW7o7P7qUfUtdYncPG8Pn4mdsGrNcZF8RRiphCzP+tW2Mwe5BDeXSjnublvl3N1myl1NVHeSlAYbh5bXf9JCCKEcBgg0ywDVCt3CH/1xTZbvJ5HqGm3ztccj6HL8sk0vum6aLxsEZhaWkZtInwYvGZPYqIaQdzRuOKcjji/kOv2WVhOuo9IiliIWxJ+KxYAsSkQSZ3GGiuDmRyWDWPAb8Ybq0S/y6C6gS4VfyFdvCH05gRjSDbpqfMk8eQFOV9Bs+bz9LNnLy/ifO4OZSkw== 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=Hg0bYB8uEN2W2kH4fKL4QaSoWfG3Ixl/Mv3+iPCEq2U=; b=vSgGIqx2FxotjpFphQAAlZkr7NcG6OeeGLlGudUQ1RyUSrB2wy12ZP6oNx9d4vZNyTnCcEid6HwahxSyVmCh1/C76OTpuX1dH3tdgyStHMfOd6IUc34J+z3F1bx4gWp5je47z1xmeF2NgDSp4xB59jR6xCOJe/hEsyAMyeYeG9v8ghRpg/LRucFrPeDvfUYom+O2oGSwJtpOZRA8XylEnz4mMS/spW30bJubyWpKLHG+8Ozb6olc3vP5ulnfwNkQdqKpJYUIk8jr6Wd3VhPxRYpznQid0ZxZI3P89521VhTcxwXGu0CthsU5l66eh2JZLZQsAJGffAoiZr6o9WVFxw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBAPR03MB6406.eurprd03.prod.outlook.com (2603:10a6:10:190::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Wed, 26 Jan 2022 21:35:09 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.017; Wed, 26 Jan 2022 21:35:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jan 2022 22:34:42 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [d/95gDshTBRHkYTcqMKYCYayZJkYQiNM] X-ClientProxiedBy: AM3PR03CA0066.eurprd03.prod.outlook.com (2603:10a6:207:5::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220126213451.1887291-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c51881b2-a736-4410-12e5-08d9e113b9e5 X-MS-TrafficTypeDiagnostic: DBAPR03MB6406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kgE7xVSERnkuPiwQkKN0iIPdsnPRLTS2+6VKU3EHgN4Yaj1I1uXUJ4h3dKnKooLyvwYlwdXPUVIC8zORzgx8lVOm1QkbD6iU6KWaY+QdQLGjs9T4msTgStJWDYYe3v/yILusGd0EuftWMKL0zDPYvSwyyBbnfAdyQkUOEje3lr22ldVnsPqAq7pq5GL3RUdYiXGlhQmHB7bjfOUf/U60m2p2xb4c/LoKaNGZD+74nuDb1McpWXyE8LcRxnUjs5PF3HXcsrHiwFxPeTHSVxcVMnyhQYky/u/btMmkt7xLBdqNN1oUGvSWE5ST7YMaOxKLlsuIFxV64KkkUmPm3k9EhyCebZ/Sf+KpD1Xv1OREL7w6ETw2ifaKyis9pvSSwmDeJvhYKAV4jKwdMzJdeAf8K9+hap7lMPRivF5oQrHQPGJwDfGQrhzBtgtUCHqK6cOiZ/eRfImeOM/Z1BoCkrnPJuvmSndHnhVix634Q1/3WO6dM+Qq1lhLE5qD3/8vEURHPytN6PLq2mtLiBJaZNi9lwICgkrsEasq+whJYz6YCs148VPRiWxtYnA8CXIU7o/azkvH1niosp5uuTVYd8I2cvVWSHBFjqrFaxnmOIVD2Ac= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HySQsp+IQJ5ytb/Bpis0/DVlQwaFmQX/bvZNwyCQba243uGbaQch8HEerzbAlZPhl4S20m6GnOL3p2Q3UYkkTgd2U5XF5fEWiMemxHkGAhGg2Fe+n5zmfSfAs14DqRNSypoCVRG5DA1AB5QJItWooGb/EOF0Gta/eHl+yltuCLYXT4ccNVacesvPYWJAWAG+o7IalEAsG4tncdVOYixoc4nzqx0CBwpQsv+fTcg+SyShG4Ftt1ITZdFDmeQXCAgCAovdPA0AzIVOose54BNSnGLuwDScfLw46vfol79FIxuR9AICGnlaygzXRtXAuQmtRIb6AuIRgqT/XH81cp/vXxFVxVYEXLnCVPjXEk4onMv2mcqSlXW7+97rm+AjGjaTKOpGOAnEQWH0abh5eiaiFn+cr9jqiNqSGZ0I8MSNXsm+U39zacYXqj0OjaeeztUikA1Q4Tpj6ZiGDd8kFgSIWlLFFC9oygWAixIqv+a4FiLcCMjmzrnAsdhWNIDY5ozB0voipcPnGIUOykyZsCxx9+fYyk49cWKN7v1CzgoO3kow4A/mo8fIZqT+A2/KkNNZOWEaEfsmBuynWy1D5swzH0YCNn5Jix6sG16mJD0HDf4KoY3uZ9u/WrJLEh8woWGuMPgFq0B9YbWY9bZgsQN2t+s/UpcCCpr5+QPcpGy1aOQWIuhT9WNQ3q7GbsG9RQYNJaazHrZJ0o7hteuPqAutdCO7z7pxbu7/3DeZx2b0I7n3I4ozsFvJpASV/RmZosGWQSfJUcTGMjLtMznqwsEBWunSxpm7ppnAYB67aq1Vhcs6wg3f389zdWO+pV2QekY7sdnMowlRh7poxOvhIgkP1iq+EIo1TZeWrNMYDnPZvUWJGwtmaU6QhGpgpv/MX51t/FimGUQOvN18xlFvuOu1XZ3cfCuKc0GmCX47W65vwn7HGFRYC/2w9cELVP8Ij287jGdyq5x2vk8brCTSWUKw5Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c51881b2-a736-4410-12e5-08d9e113b9e5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2022 21:35:08.9998 (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: DBAPR03MB6406 Subject: [FFmpeg-devel] [PATCH 24/33] avcodec/mpegvideo: Fix off-by-one error when decoding >8 bit MPEG-4 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: YvUe+GrqfZ6l Fixes visual corruptions on two macroblocks from two frames from https://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket4447/A003C003_SR_422_23.98p.mxf Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index e9f2fb212a..47603c2991 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1648,8 +1648,8 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], int vsub = i ? s->chroma_y_shift : 0; int hsub = i ? s->chroma_x_shift : 0; dest_pcm[i] += (linesize[i] / 2) * ((16 >> vsub) - 1); - for(h = (16 >> vsub)-1; h >= 1; h--){ - for(w = (16 >> hsub)-1; w >= 1; w--) + for (h = (16 >> vsub) - 1; h >= 0; h--) { + for (w = (16 >> hsub) - 1; w >= 0; w--) dest_pcm[i][w] = (*s->dpcm_macroblock)[i][idx++]; dest_pcm[i] -= linesize[i] / 2; }