From patchwork Fri Oct 21 20:12:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38896 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp957308pzb; Fri, 21 Oct 2022 13:16:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5G+gdSbSTZGURiK3Lwa6VmlamgKyKZZlSnta6M0HFpz8FF3jUrlKBD4GDHZc9HtUlQi/+S X-Received: by 2002:a17:906:cc56:b0:78d:98c3:8714 with SMTP id mm22-20020a170906cc5600b0078d98c38714mr17707815ejb.445.1666383361655; Fri, 21 Oct 2022 13:16:01 -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 gs7-20020a1709072d0700b0078c5f3569aesi25213828ejc.69.2022.10.21.13.16.01; Fri, 21 Oct 2022 13:16:01 -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=jve60LIo; 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 A2F4568BF6A; Fri, 21 Oct 2022 23:14:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075084.outbound.protection.outlook.com [40.92.75.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EDC368BF60 for ; Fri, 21 Oct 2022 23:14:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MmQhpnKL9sFFUA9AAScx/U8vIN2ByMP0eqItrgJ2I3eV9Be0UvZ9Phwz/Oq/TGHdOxDKUDJHQiIfuejCvI/yxW+RjzOXVDedndG2XgOvvP07iBti34FqCJxKeAUWQ+VRjx62vXFd3CcdCYfZCXrK9ykocnjS9uBL2TIcMrojQrRapi+AoTdDKTBixsFVV+usvXBbreF4Fs97YucAw5e9Zua41J+hersQ3MbddROwnSOlBO4hceQbUT/euTFNGqGoCae+hkVrZ4Nk0Gy/wtnQo7kQLqhF1Z381lvo+AfwRcoFhLrsxtbo9nrLG8lyY+O89Ce/RcWY0h1vWFLzJe3KDA== 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=M4gyE2st57cp4NiU6ChezSt0gXOz93NDTaipJznPRO0=; b=a6qbI3nmKvx3cmHExBJE95yOAYuqhPsojXY3MhPJlJTot/puDGnpMePhQ8L/jDl2n/NqnlKAXJxiQ4b4fLDwXwr6RHzDHTEjZegSLtKeDFHrSc1H9BIxz9hCSJZiv1qu4JxutTujfywE8TkeHvNdequxrZqajdZaJKHJk3rB7WotLE9kVlGo7czFgZTSgaZMRcGZSo7ptLchrXLCdEyQabAGGhBWEvkRh+IK32EdSmQp4FlKKf0A0WXYCj91N3oyuLJ9L9aT411IE1P1mANIzS600w1grsQA3Ugt0GmQJUbC4oVyq54EHmbUk6T9xVeIx0a+hvbk33iZSAadagGJ8Q== 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=M4gyE2st57cp4NiU6ChezSt0gXOz93NDTaipJznPRO0=; b=jve60LIoNwbcH/yWIYBtrv+xNLqyg1tMUHJLk6/ZaG2sK109R/WmzBm2nRjS2k1OR4kfw40hwmj+DUWIVqX6UazaN0BArZWdyp7E+L4uGU5sKgKaBRgXagMSD0+5eQs+CXM8cZ65sgwJ0cyuWXh36tGocKk7mrdMfZu1RWe85v/L6qZ1+KkNA6/7BdPWmourPt/VlmjfCwOaFpT5y+IP1VsYjEixrP3bPmTgQTmvosA3DqPWg4qelPBR+5c1wJn7YZ5zau+4lu7ZGVPAQ5wEK+nt+zjDjzr3qGo/5Ozv2uHU7K9uC/kmtRWswjx9dlk6K7ZVyyA93KTWVfIWEogV/w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB4P250MB1007.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3f1::16) 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 20:14:01 +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 20:14:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 22:12:56 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rkNUN98vCbZMBKi+gQ1W4LBeNxXN8MPXwXRmDE3I0ao=] X-ClientProxiedBy: AM5PR0101CA0027.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::40) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221021201300.3565913-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB4P250MB1007:EE_ X-MS-Office365-Filtering-Correlation-Id: f4421b74-761d-41d2-5294-08dab3a0cb1c X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nnHDnbJ910YUAai4EXr7321FNakGoo0KWuupXDloS8P0F3bEm7ACZ7LBOterq6BWGRi80UbvIqnTWQK/f6JO93Binoy8MzafcxxDQYonnmSMTsC92p8ELj4/apbEf0xw7k4WqDXWwJWpKsfuimEc4dMRHnx8DhJWqMVGzSr7M/Sgst9koPyRCY+Whx88b7k5qSH3g+0vDhpwudq1Na9PRR4Omf58W15cDYA4SbxRJNj2hHc+rwkuMBByKH4B76dS82YIzQJl9Oimm3LM8PisS/1QCLm+DQsy0Qc1hrl8PfoQCLUAv6deI996BWcILJnOT6CQONOxyga335RGPqgKxhYgLmwOPBC6CaQkPxU0OPAYLqxRliEyNb/1HUzK4w1lbeEKRkS0n1ex+slI0p4gKTGTjhLyoa77S0YXA05ETM5UxCn5AASelfmGlBSbN233S65UCrFU7i0BtFILvxD1rGHMBT6smdL1UaCSUE97V2lgcWqr+DErm3d+LFc3vr32dn8G/4i36YO9Q9BGNgL+UEcFvwyCBVH4s+utubJz3+0zjngl0j2a7zfzWTBC635dNaXbb1QHOCak+kEHoNPmOUJCvDLcuXbriaEqHoxPKwCHIpZ8M3YmLtXvsr0OshvnYWr9/0b9pZbnVhDY1YLCY+tgkPii5Kp8pdvO9Xp3nPBGt4+iZoS4vzbMXo38lp8gfaW1q+UbCQYcwefQd4TMmkriC06veCwW0gMdRk/8KdbEeSbx2Z/1tkhs40dPLNgws3OxIU/HuALmiPlR/sbVQw X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s/tsUY1tXVUw7+YaZPKSYPoxu4CAuPUnrYclDdzxDp9H0WJX/iGF+iRFcfiJ1KTkr8LJLSV5cJr759AZo+LZAiHUZVcKB7biBHV7cjSNI1RLnlZZ59rthdzSY6UdueCQEQqQFZTqHhiVFmxpK4J53SXjg25zpWG82QP0LLnSy3I3OyFqQfcT4sfonVyiF/a+n336TjsL13NyWDH6Dt91kB9WDAkXj/bR5dzG9NGOy8HAfd0UBwQ5Sa4NyRtaKHD6whtU+2Q3tn36C8arX2xpgYPiWJgRJ8U9YZ7PjRFs/TQ5LDuZN4KSVvWeTDMD+wtTHdas4jHbVvv1o69xg8Rt8pVPsjfY8z57+q05vC/L0IeH1zQvw64oXNE5hnxhGHdydbZoJJrd1qt4u83iU0W9+cDInMFGmGGpr9wZmpXTDupBbpxOkz7XZJg3SlEy2yvRbQWu6pC5VLclT0PZfWm7wvT+vgzDWfMQ6rq1zYX6OFh7JpEaB0StF8ylUZ5HWee7PFkA2gDwrtfjvEWFolBnqt9qXTApaxGZ1NRBsx8LMcmIDOZ/YtuqZSoXBGq+2IpmKK7EFTYawUZi5kkHQM1k9pSJxcdCLxjmIOWumW1KXlw5kCkJx1zNgmzsm3cl0m06uSO4BVxJZ3QzkJXWsHz4Krla7m0DFx+FLD17BRzcp9ujjUQiu7qAuapOtqLgvi1U X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PLp+EvSY+F573aGNJoYOBPQjlFhzOENm8wZTmbwSVNqQRL1Wznaf4i0CNl1RXitPDyAJ7mmW3xKZkrxvBCO6wFTgTAzpDpxw7T1wElBQFVS3Om+6SxXYktzWOBJBzdmVjl7UNQQFpq5anEE+Kpsjs8aX3svMPquWfayoH4uG1g24ZctRuHWYcLZOH1Bmo7rC+f4ANmgnVShUNFRkBQLFv3wpD5a1OmTGdwOL4r3WuogMDw4LVufGzkJMGubyogJ4AeoA4fjwEt31wmoGOEOYbD7swPx0q5yKTM0uiNDNBWedz00oCOOBnN0RWwa+JpRCGB6r0p2tPSiO7OAhmW9vV+WclrMfmG37FIexXl1FzzY0O25osg6M8nB/6JMM6uqN3iKdINlpvr8UibEGfezhbOZDtahOcLvQAz1uPfaAM4cjfS6KYH9A5hhs3nUvTnE3hUCs7fnAtESyp/5CxprIg5xs/zEqPlqIcZ6JLuITxPLHyKgUPFhMQIIZw9JFcQVMbhvISxyTiGJS6FyQUbHwfvWAZIqiY/v+jDp2ftd/H7ewTKOx2tqjiZs81uNB7cfqsGZa3wAjaaz0rppd0Ylkr8bm4z9RY+6SDSKEnOlqDtHfn3DJbIz79EV7xR3UBWKjJIyylfS9sCafoxJNd3VOz+4WGTlGN86mfTARy9qofWFvdKwDUJh6Svb7rEpat7RDtp7SLvXpflZQR2ssedLsVqo1Nzmi2SoGa9cXYgwFZjxsGbcvJ33o/7BlXZtApLBmxRVS1ImgmRI0j23V5m3LAJKOZZzYOMlSwjg9O7khvJoQVRdjcSO4VaBcJjikdYAmgg2/n6Q/zd+n+R7NrYJrBC1rNp3zYTHSBWQCxnYcGZFW9yl4okeu22unWrEDkhBIhtz7EVigaUB79gdTMat+0gdqG2hL5fIsAWMB1V1FJnmkUK1D9J6o1wzjXzrRF64MSGdfL1fGMDiOce7VfLAnR7b2P5Qc3E76EfJQRWneB1A+F+54Iv1cTvlo42XNgVNmhIFnaZYyI3YmpuqNlVo00CX3bTk1+/R664CyC86PEtIbP7XdKJGQfy+jrZNdEkxnn5rgCtIOAhzWLjVmUYwNMqiBClGD1OWB47mvMYX3YEM0wasPaSXb5Ij4DwOrevNZRGgkg4kizQPTzZHyXFHku/eIHqS0IJoLckcw29PwpVLi7ha0O40gxFcdKTp+THcLAGwQwb+CX3yglzpJSx/Qdc/+2Yp86WPuRssQ0PVmcS1sHyvNyr7BFIJKWbKMEC5E8vpR1L7HwPsgujHIthVKEhGzYbWEoxHn/9IY9ugzn+PmR/LoCLyxGbZlkP6p+vGi X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4421b74-761d-41d2-5294-08dab3a0cb1c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 20:14:01.1834 (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: DB4P250MB1007 Subject: [FFmpeg-devel] [PATCH v2 20/24] avcodec/wmv2dec: Remove unnecessary ScanTables 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: aFVZ2LCXgj2Q Only ScanTable.scantable is used for the abt_scantables. Signed-off-by: Andreas Rheinhardt --- libavcodec/wmv2dec.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index f638b31cec..a70913134c 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -52,7 +52,6 @@ typedef struct WMV2DecContext { int per_mb_rl_bit; int skip_type; - ScanTable abt_scantable[2]; DECLARE_ALIGNED(32, int16_t, abt_block2)[6][64]; } WMV2DecContext; @@ -425,9 +424,7 @@ static inline int wmv2_decode_inter_block(WMV2DecContext *w, int16_t *block, w->abt_type_table[n] = w->abt_type; if (w->abt_type) { -// const uint8_t *scantable = w->abt_scantable[w->abt_type - 1].permutated; - const uint8_t *scantable = w->abt_scantable[w->abt_type - 1].scantable; -// const uint8_t *scantable = w->abt_type - 1 ? w->abt_scantable[1].permutated : w->abt_scantable[0].scantable; + const uint8_t *scantable = w->abt_type == 1 ? ff_wmv2_scantableA : ff_wmv2_scantableB; sub_cbp = sub_cbp_table[decode012(&s->gb)]; @@ -577,10 +574,6 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) return ret; ff_wmv2_common_init(s); - ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[0], - ff_wmv2_scantableA); - ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[1], - ff_wmv2_scantableB); return ff_intrax8_common_init(avctx, &w->x8, w->s.block, w->s.block_last_index,