From patchwork Mon Apr 29 00:35:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48358 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp1702852pzb; Sun, 28 Apr 2024 17:51:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjX1xBEAQVKuRUAoNuFxcqESqqiC4In7KjkTiEuiezS6LYAaomVpKG8D60nlaYwK9xvSl4LH2fb0EO6NRiE8UFpSUxrUU8vb6Bhg== X-Google-Smtp-Source: AGHT+IGpHb1GCV8oAyGLip1GGHfBlBB1eGmJMqSyH1YOSYZLKz53AF5d5wsfQrTsJ8FEHGvAaQCc X-Received: by 2002:a17:906:7f03:b0:a52:6435:ef09 with SMTP id d3-20020a1709067f0300b00a526435ef09mr5825430ejr.76.1714351884164; Sun, 28 Apr 2024 17:51:24 -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 c27-20020a170906171b00b00a55b708ba3esi8665266eje.867.2024.04.28.17.51.23; Sun, 28 Apr 2024 17:51:24 -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=ZBFQBi6X; 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 0D08668D449; Mon, 29 Apr 2024 03:51:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2054.outbound.protection.outlook.com [40.92.59.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E80568D41A for ; Mon, 29 Apr 2024 03:51:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QEmHl/QhcCw9TiNclimFvoV135l2E3mqBvD5QuARKHlOCWMEz17TTm+revNkIWX8cMebPx8NP58s9jEyUXFUlQGjfy6aBXYk0609Fk7fbJ9uOOnMRYzx1BnYHYored8RhXFt6zmlwvHiRnAcKOS+hbiZY2NwcR/z3zjk/ehHqH0tYefdxoHKqI6byLq+ALyDEBH9vEULLCfE4vrTbwTPY1/5g6d3MM2UlMTARtoCeHV1rVMXzuphKNkrsUzVm9L8/tXiVr1FK4FOjtYSxeLZ25IxlUVyAvd1h8ZIknDAwGKf9c2guz+mxeJ8s37tqf1vymDJJ6kRv65YqERM1d7zdQ== 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=EPHfvsmo1QWX1ay4MwmFi1w0uOqr9QNDQPEOsKul4Sk=; b=aUIaDRpZNrGzZfCT1sh95QTedu4bjHGAJL0upyzlgIgfPRcTTG69ojqjmfB/vSJ3Z+rJ2LusdlplF4UnJEP3WQe1EwSRM1TlqAa0ekKtO22fmaetJpytFtySqMu7oCSnzrfoM9YJxq2//X5gToAjI6quPX6r269WYnv8XB82fiQXqTysjwJSDrba/RBNTQC7YQPBFSIQMzCHvdiPF30FnezRciYhbHUKrYo2DEYeCCc0Tn7k5y72Jh3Q15JrOekmbsQYy4Br3wzzdZVea1Wh2CwKGrjvspmBE6CRXXIwrlQGU713/fd1GQmnxJvNNa/hHu5cZJU7wXV0Ko77JBLMHw== 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=EPHfvsmo1QWX1ay4MwmFi1w0uOqr9QNDQPEOsKul4Sk=; b=ZBFQBi6Xn/S6+BPOL5JacIODCdvHavOAwNHvwz0qkK1//QojTdvM6t7SMbCFhqXA9rVjAroW/n41C7Si5pFcH54Mn9RHI+nD+3RVM2vZhQNKEfJriXp849Ir7NuutRfAECTOZ9e9d7hpo3orvf2rEJDCBRO2iarOln335uyh6a6xzKQ74O/vHOWqblEi006lNE6Xv4V/ThTSrpuoGwJGxkS37arAMGlPu6by2Qxsn88ucNAuubiKkpF5L1Nr6WdA62am3W5ChJeZH9ayuJk1Zl8aRLyxnvaEf+UyDeM0iaA/nsAEgwUzI94ZVC3KOEDHgtNaiajb/BJMWhIJ9Q6Xtw== Received: from GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:60::6) by DU2P250MB0077.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 00:36:00 +0000 Received: from GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM ([fe80::4eb:f54f:b451:34fd]) by GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM ([fe80::4eb:f54f:b451:34fd%4]) with mapi id 15.20.7519.021; Mon, 29 Apr 2024 00:35:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 02:35:34 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [cbPJ03ZKxW6uoh2eyvAy28KOknCpKHV9qwELmYSucLQ=] X-ClientProxiedBy: FR2P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::13) To GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:60::6) X-Microsoft-Original-Message-ID: <20240429003535.1516058-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0021:EE_|DU2P250MB0077:EE_ X-MS-Office365-Filtering-Correlation-Id: 44c9d087-d99d-41bf-1d72-08dc67e45744 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 5TuXW012+N5ECteIfP2DoJGRAmgu6VHwyCeR3AzXpxbhrrDjANTNLZ6sQg0xX41RwgGvzQIXFGUfFN0F4qJVm/xUiUUHwDTA06yaJrn+SlDDi21FEHnbE3gSK9azTrGPYZcJyBxkXWFKWdUrAwpAC/uYCXeW1xEhsI/E/yzzfuHdJWj+sXmLlsr4alpU7tAl0eSNnoygXa+ETwuZAFSyiFkvtN8NWJFv1Zv00PUntFr6QB2bVBxtHqRvDRGpR9TB1ahz02mMnWn8OTiudyUPJxo0hwq9EdVCoTwceJKMkH2EUEWzCpSBGhmVpKlVCPwcOTwtvhz+0AhoIYWV+lUrYyrGwMMUtoXEPcXP9A5lsg04Z4mTnXQCFzfNiOeNMQV/lcFU6tbRnnFnTcWBB5jubC0FMFsYB7nsttv6dzhxpOaeaLYtmBMvsQXEJgsRkSCsW6an8f4EctcoQm4OVTYeJxYTsDINpdMWFLtTDFPt/zN3kQiPsVlAWq7EPR4JE/W9fiWMq2r0ZWljC7ppLXhxs3OMZPhHUnkKmdACTAV/GtOL/xKPUG4UE+nArdoXocws+bu2Wa+2akB+rITRXvLWWLcW7NAcilVZYQFt6xevFlbfzLrmL615bIU2PuO9wJQz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wUa8jGlyZPiJRVGXWfAJYYfOzC/LqFIXpE6Dau3rDdxeLFQ207e+uaGp4n/yRdVGDXi3/KJdAvdfI+kbbn8hzYGge74Ry/bljuCbOUSgtL2gVub40cxQXaO7+KJ+P8HW2BcFQsywI9LkR3eNd6Nz1B30cCZT+N+IV1jyxc2yDiCJBtX9QHL1K0iZZAY8cJ2nwl/+UjtNgFIIhm+gSUvGpZq1r9FshB0rN9GZgo80QGamjS8zLoxBP2zxAgw2v63k5DiMSh0njx268IDAuUD4W5mqGDDvRHAd58K5j75c7DL6+2YC3kUOY52jDc0a+7pXbR7yIUUHKo5yYYBDHy0YorU+WvFgUTBXVqsR6icKwFZLN/tjgOwgZIa5ve1sWX4GaCwL81HOfWDQWJs310ZFVz9YMiVVpFflRO4V8/GntIONPGRhlEm0/CqdlvIdeFfAGw555bvewiHMxX4ApIIE4CskDfRZTk7aluyaOYlMvEyNPdKoYQBNsujdc1+h8MjGw5IphIU7lFkRP5IHNfe4pCLhC2b6c33Vsd5zwVjoOnsUfcFI5d6/I+V9n8RZzKyOxtk4z3fRlzoIMmI7SeCPB2iAAT98eWlrmhjecRUj6VGF9pKIdgAPBOI4OcLq6wMTbnO8OyEknBfCSV/VS2fvqNQJzqtbQT5NB1kuJNUj66+s8I3EyNlV0qfWinvZZNuvWz+Z9cPvoCxRlZDh0fScOFhkde3ry8k/ELwqkQT4ALzS39lopGQXNqCfzXeX+DIMutiQhTFyrKBgEAMa82IfY6gNEgtGa/CD5NsimVWZIxyYhV6m25csNrtm8UaZOTMBdGdKGZlFU//SPFSJB8UK/WtMAiqgVOJS7tfotTW5K4nAzc0QdztuNACYRA+g4/h2jABB9yXMp0++Jng2PNz8bb/be9MesC5OkOuVM0Gw0DwFVh52L5OXZi9Bf4Uc76s6y9YpAhWUepOUf/eNB5HKR3mvzL8Vf4W+MCxfhvhjVeCra8Nvw3uutJDjRYvVyQFAXIi0LXInEfQxyizICed2p3bWtz77pf2jmgyv1XZIG3qZzVojtcpjufz7lNLlODpe4xwGcB7vK0gv2Bmz0BOhuCv3jclWKRKUCwkjsqUtF2n06OaFHt2w56kuIMRTRewdmW3G4QeSSxeLRUw982UCiwDleBuhct1ZNezAUNjlF/jhwNYZWg3y0GY5IivnnWEyrL2OdJYsKniZCdhJM2DVnhA7XuiygfuhDpEBKh8C4aSprXDNbJKFlESuhDFbgIcxRZR+5QtyoA2a6Z/06G1bJQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44c9d087-d99d-41bf-1d72-08dc67e45744 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 00:35:59.5993 (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: DU2P250MB0077 Subject: [FFmpeg-devel] [PATCH 13/14] avcodec/mpegvideo: Don't reset coded_block unnecessarily 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: XV6qqE+RYsXY coded_block is only used for I-frames, so it is unnecessary to reset it in ff_clean_intra_table_entries() (which cleans certain tables for a non-intra MB). Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 74be22346d..ca6e637920 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -808,7 +808,7 @@ void ff_mpv_common_end(MpegEncContext *s) /** - * Clean dc, ac, coded_block for the current non-intra MB. + * Clean dc, ac for the current non-intra MB. */ void ff_clean_intra_table_entries(MpegEncContext *s) { @@ -822,12 +822,6 @@ void ff_clean_intra_table_entries(MpegEncContext *s) /* ac pred */ memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t)); memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t)); - if (s->msmpeg4_version>=3) { - s->coded_block[xy ] = - s->coded_block[xy + 1 ] = - s->coded_block[xy + wrap] = - s->coded_block[xy + 1 + wrap] = 0; - } /* chroma */ wrap = s->mb_stride; xy = s->mb_x + s->mb_y * wrap;