From patchwork Mon Apr 29 21:14:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48412 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp2273155pzb; Mon, 29 Apr 2024 14:21:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVcK8033C+y2okur7ut/MVE0s6ZZbaU/MhE84OvxlVWwkRsW3TcxMA2bmtmRpdP31wjJTND6CzWsQPyH6y7f2P4Qw28uacvO93icQ== X-Google-Smtp-Source: AGHT+IGVr2Xn8UJ8DyxZiC1jYb5nMOyjnDN6GW2qslh6FLhh7a/pTArfqY43AXFWuAO4AezFWxve X-Received: by 2002:a2e:9891:0:b0:2df:907e:6da2 with SMTP id b17-20020a2e9891000000b002df907e6da2mr5794485ljj.1.1714425677147; Mon, 29 Apr 2024 14:21:17 -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 h6-20020a056402094600b0056fffddd5c6si14026828edz.261.2024.04.29.14.21.16; Mon, 29 Apr 2024 14:21:17 -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=VlY3Ljxw; 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 93F4C68D658; Tue, 30 Apr 2024 00:19:17 +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-am6eur05olkn2044.outbound.protection.outlook.com [40.92.91.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F55E68D65A for ; Tue, 30 Apr 2024 00:19:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mGbfIStoffs/RRHAjJwyECLNEzbYAjctq+8yHjD4TmCoPVt44u4RijR5RC6IKwm+A1WQVEQGl5CU8FjR2eR8jLMHm8B/R3x4qiiwd43POKoYVh/hveKgB4Lb8evWg4qwaDiCCUYKQXuKMnyMmIIFtvPY0XiemTSNzYYBNVV+WkgjzcQt75+lIarVQraNCQus6GD142ADmxKfqydmzDLiDFtaVZsibAK+MB7vOen6ji7olSmuy+6rCyA089ZuTwwVJ6ljvGc4TTNaP1j201ZdZVVOVR2iHi6iIhB/x5dB8EUXzvgvkP7kfrwuFVJKgV50OrFweUvC+vy7vpl7HgmhAw== 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=RlW1gxCee07aXann0RL5MVJPKN6BXCXWtvGEN6nLWqw=; b=IcC5x16uDpw6KNyQb0i707VYTnSI4yIZ+os9svNNrTyPjuAjS841Ab+EwS1ZXdJ3XxsqSUMY887H26M7O8Gzdn2vZ35XfGG2CmXDdT0iYg3ecvKWQh2PL/bAz6PfCKZJewvhRjkk/R4dY47Hmzirz38opFjjAk9qZ2V2srkXUXAfMqiltYc5fv9HfP/i59sEbGqvGeYBjNjbvMKwoM9n+eYgW/XgM9//LB6r8X7mwjTHW1lYSI3aSNdGf3jPhlQhXmDoBYMZziqIgaC0zJ7V6IR5f+0LqA2Fde9WEmRXI3wOGgdnSvMHAZWUCpFt3PB5L86EmthO+veGc7XsDpoXrg== 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=RlW1gxCee07aXann0RL5MVJPKN6BXCXWtvGEN6nLWqw=; b=VlY3LjxwHKPyuDSHe/RQnjM0g5jXtu6wa8fSkRgHi7Ffhbxrf1lD4RZxA5Lh4Dyi83YY6aFuCBlsYWUQyTt7NdoFcr1e1/0H39wVf7GaxxfwprVanokCrgHd61fCaclOmdlOcaqh2FvZZsmqafExoahrImemgDTzRfd9Chk+Jtebfr81tj7VaL2j2nUjLS/3yedZ8tLH8pEy1+Nsn7PgAZbfdSPObzZGoxrq0Zy7PKVFompB6NR8QnEMbSRevx5dO/rSvL8kx8RDZWGV0rK/A298v0FkFhenWjSkC8NYTfdwX8wxtOs6CUubG06Q6MpLEtAPQY2Wvqccaf5j4MrRnA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0616.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:297::12) 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 21:19:13 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 21:19:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 23:14:35 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [5ZDPYRb3POszdVD++Tmh+Atyq7DvoFhd] X-ClientProxiedBy: ZR0P278CA0199.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240429211438.3274834-40-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0616:EE_ X-MS-Office365-Filtering-Correlation-Id: 446b5168-380e-43d4-3416-08dc6892049b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: T3gq4YAinwUsobLzuQKGogP74T3UHxckFDH1B7Pae0yuaitPvZd41dcr6qeelk1qeWvnnrhb/3pCMJ3xZcv83AtT4cLJ6Rn4pXYDAVUXoYPPFAjUbcgQEUNBAFLFnNgpvxiz9kuaJvz+Y7zEFgDPqgWWJN++Xyjoz7FwFsUiGRbYov9BJa/Zcxt44PA0ooutxwZFJMfWZUIjMUXpDDjfL8lQ3FJ8hwBtnn5GdmTdvYIS5S37Ly3KZwVETb574TQjH98Tejmwu9NQ1fn2aFbPuMz0asRYh49RaR10whJFrdCAMt8N+dm/rncV8/JgYSoBjtx1HxfV/nIWjj8ltiatR0tj5Qhr7BAlyvnrOHUxNn5F9zShpuRvx+du+wN4yWvpVpm+t3unRCUohhcNGHNfDqT9arCY0uj4LlRa/HCARTaJUwCror9tQzS33p8bs3X50gymsku0AV6RqA4e4gJmnJvanIOvXcccBPjLXlvfrwfeHi59EF9JTr+xKSXrJcXobQBJkQYxAKy33QbBqbyPjdceVOXBhEG08f+EFD2xOOIrH+FGEl/wfZhNn+9oVh+YFyQzV4ngnT88liRMghN/JGvxG8Z2KL59NntEOXlejWFgXOmeFmrapw2uJKsyDSxq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IDA8m88tRFlyiFLFYPnoVyX/nx4QwIRh7JkO8gzL0H8yqTRTK63Nhu1epwHundpD17J6NEITXVXOHB+YP2/f9tiIC7S23t63UEciLyyxNbCv0znDXtZIYEJSonZjLUsyKhDG1S7QiTGX+s4g+2JpMhDoOjrKZedyPzwlFiZyLOy7Yn4F5FmRi7fMd4ZDs9eCzL5GbRJ51VREmhHRVJObgi3PZAWQp5ynn6AFCoNtKMz2zc0DxESl3MBumZ8muQndexEhgiSNtA+WrpX9EF7quvm43lMEPrRVyuFFsW3FJf8w8DRpgXqr+fMp6+/4YGXStF4Rby/p6nbCKh9Dtp4oYr1mFSqm/3uL5GPy0VVkgQnbhl2PdSvqzOF55JySIqpFWKRX5ipox/mqCwm7AKwvsp+AaFJankzr/yIsiMc0MzAYfIo5mYCVcPyHfC8aE+bsIZaTk9Fgn4UanE4pJb+zgjgrGLa2OdFGIZNhGnsLoAsDxUoaVQxP6ssm/pW0kWpj9m5YzRKMnQPuqNi1N9s6CGi2RiucGnisH91/f8tQY5dHQ/yX+99DfUXr1UnirDnMds4BQTwEZWv3xQ2tei5MZPnT0uscMaCc+IAByZH5zsiNRA5PjDXkhr55NyXjUVJlc4rysxrTOZ77akaT43TqpCxKsnWNt31aRcH2FF8zVbS7O4FpS39N6iGJ0LsEoJPi3T3mPEyEY4NYFZLI2k16CR14QY6ueDW7VbfxpcLHlMIys69ngsorfhybeLkJJhr+GYvPxRpCaAyMNwal7gqaAT5ydkV7JWT2oo00TEjkfLLpfv7F9VtEM1ucMsGagM5HEaiQPNswQEJsHO6GPxLiqFn+aIv9g+RbOOr/mjK0QtJDkwvnGPxR9WCKGpsBQl5vDujkkFqPNzMu2gWu5tfzUEZixYF4mwfAf8bg2wo9sy1GBLItnNXaiNRdQWn3En2cW/HvpL0EMxs0PHWeVQP0rrx25HPmIEPufY4xlac7IU/mWtTmg77VmaLq+qikW9vjjjVpD1Nweg/FBeP3cbahw+Sk7HV80r+F1dGoGL6ho7wFWkGOpygqj3Ql4tCrz3bUUWKmdGP7f4hNMXQgdRSjdSCWMnglQHHLlV8AsTSCd65CP1tGyOL+1ocHI8d1US8vQyG7Gx5pSP0HfHTW58jsbRF9kpG5l3g6POHwKT4ooNLc/dCFt6X73KVv58CZZow00Vsjp5f8ZJA5q8O6EXgw6eUHF4C1lB/IwImvbrfL8VW4hkUP7Zq4oHUNMgebtufrQGcG3khr2wYtyimGiIikgw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 446b5168-380e-43d4-3416-08dc6892049b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 21:19:13.3420 (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: PRAP250MB0616 Subject: [FFmpeg-devel] [PATCH 54/57] avcodec/mpeg12dec: Don't initialize inter_scantable 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: APt8RREB9EqR MPEG-1/2 only needs one scantable and therefore all code already uses the intra one. So stop initializing the inter one altogether. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 52f98986f6..55e3a31e95 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1256,13 +1256,10 @@ static int mpeg_decode_picture_coding_extension(Mpeg1Context *s1) s->chroma_420_type = get_bits1(&s->gb); s->progressive_frame = get_bits1(&s->gb); - if (s->alternate_scan) { - ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable, ff_alternate_vertical_scan); - ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_alternate_vertical_scan); - } else { - ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable, ff_zigzag_direct); - ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_zigzag_direct); - } + // We only initialize intra_scantable, as both scantables always coincide + // and all code therefore only uses the intra one. + ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, + s->alternate_scan ? ff_alternate_vertical_scan : ff_zigzag_direct); /* composite display not parsed */ ff_dlog(s->avctx, "intra_dc_precision=%d\n", s->intra_dc_precision);