From patchwork Thu Oct 20 08:45:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38840 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp45523pzb; Thu, 20 Oct 2022 01:46:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4LvEeyFxoNX++gqWWx8SJRo7YMdHnQyz/YX9n+s8UTe9VCdFyBejSvl2thztbiQz31vE3W X-Received: by 2002:a17:906:ced1:b0:78d:4448:e96f with SMTP id si17-20020a170906ced100b0078d4448e96fmr9622234ejb.490.1666255589627; Thu, 20 Oct 2022 01:46:29 -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 xg14-20020a170907320e00b007781bc042a2si18071689ejb.646.2022.10.20.01.46.18; Thu, 20 Oct 2022 01:46:29 -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=LUpm4ofk; 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 6D1AF68BE3D; Thu, 20 Oct 2022 11:46:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2028.outbound.protection.outlook.com [40.92.89.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37F5868BE3A for ; Thu, 20 Oct 2022 11:46:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EMIYULMXblp7+Rg3AZRWAK8ThVmrp1YyyhypOiRjbtbfKfCQ9ex4N+oMYxrjMz996xpxxpmOwfdH4fm0JKtD6JBq2YIdQVjr0HdfsQn8RarroiGZD3T/nA6diuFjByOcbU3gahh2cTz06yxPS8sDAPRjAPy9lvivnab3hlQ2OwDGjB0RULpDrBUKO5brCPaq0Le/80IHlYnhF6m4g7gWURvZajV8ZMBisUO5tfTOni3jIxqDN3enqgQ0SDad7ofScuVo0iciUcrJ1A3P1rWJot0O4OTu6ifqdg9Y912NrYZcdO+SbsfVqGyMYHW+rpHq7HpYU44nfDfcXs4twXXdJQ== 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=JayIKDJBanXpdGenQMG+7CwNf1ddbaevrwVkAM6mCcw=; b=TfuCc8ZJ+w+jOcxemPM8v0knBpug+by6RJhm2QQl+q97FcQQA4V+iXU+fyIW4RaaEMbePj6MeztdeQkgXdfJEirflULLdvtWZXxpvec2mw6K+ebAZ2glLkMFRhblTU34evqktM673SbtD+Gw063LyPOF+QeQ19ZUPHM2sn8+TQMEpz6Xt542zWXnvH8BntJh2I5re8f9Qq5HFmoDNIkgBYLOIzVJoJ4wn28VlsbaGvu34/bnuN+XO/w9MocP3ozkqrLttrG/x1HhceEHTKG5+nhjiHUckZrDetKSFliibusTadJMjFe3Xz/l8InXX7Pryx4qGQ8VphqkyDHgrIRMPQ== 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=JayIKDJBanXpdGenQMG+7CwNf1ddbaevrwVkAM6mCcw=; b=LUpm4ofk6HO4VolNjs/zbTj2KMXGm1si2FtVfW0h9I7gB82VEcP6vLAnmvhFu6pImHEumozN+NjxdqhC0ThZSZeluftOgmUgQyyGBFox6HXyXHiyeu4D3FsiYjxaXJ/lW7bGp8f9S4Zk6BkU+5cOvbs3oLHf0FvurJBAswsdyVPClwXVAL8avWQ899ncT1KUo1oPzZ5+UInu4L6nkZ8HF9twLYR+/cn/BXeVrUNf0hef6GCM5phSa0cWfgkbViaZS1iyESLLc2mdCT9MyWl8Ih8T/RQRcS/CVILaTxcTCkmh9/mKDNVv3LMU78sOoOruPN/HVEGsGldKx0B5QepFnA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV2P250MB0825.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:aa::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34; Thu, 20 Oct 2022 08:46:03 +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; Thu, 20 Oct 2022 08:46:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:23 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [LKb/6m99FMhn39rmoVB2ywMFQg+vcimkCPckiJDI85Q=] X-ClientProxiedBy: AS9PR06CA0774.eurprd06.prod.outlook.com (2603:10a6:20b:484::29) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221020084540.2378553-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV2P250MB0825:EE_ X-MS-Office365-Filtering-Correlation-Id: 98bcbd65-3b79-40b8-c8d6-08dab2778537 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kEq9VXjGDAyurdVkDmkI7qyhyVlMClwSvXwgbqgkgnNJazCWcHOsy2U8pFF4tMusgTvLXRNhuWT5xmi0c/1pNuATKmt5rtPX6oqnCKz4uUr83rDx81ZIXC9H2pA6SPUnTKVYPHVRwNT9wJeY8/OI9NB27juHYb40muOLrJgTfXj7GJDXELA7X/ywkhV1VESq4GFaxCgqZqMczBUWzbAgArsQgI/G/poPA5cUuvyG3JzSi4y5xzOk8FS2dhJOpS9oOUvpEFxdxAKo9rQHTjU34CnCUJ98aa/WVhP8sM5waJsnKmGcaOCObCaRgMz34J31a3nSR3sfRsIVkPe+MXfYVLFcdB8aRAfY9DWhhBNvFFRKwXjzxGrDi5BxKj0ISkSVjJp+PDMDh3DFtWsU3AuAaoME04yQwfKX6kkRb1HchV+gaYxwo87+kL5Px291bxrKClNfUU8ATfjZVJe9hW4h5TXT5LdF823KVKyH8xl4GB067rV3OvCioHhp4eDo4vnjThSvV4ME70d2PVyyseZwd+3Lp9vB0Z7L3kdXUbeRAmu4f+vr/lrbnEAUq3XZfgRiYxRduLT8iZo44uIUs4vV+PADmE1ROmTFD35nbKeA3uiZ3iMmrV+DXj2Kt/jm48t1/jwB0SwkXd0js8iB2Xkr9fKvPLJ2vgpukyUBdLLreaNPyNFWIyAMrWzJJn1QIQ/to3dXb9KMIJiSbc/2CxUQ7EdINmLBEUQ6+pDBcgjZaFnKhjRytqFzpwPId6TRWdI9sa3qLhXplB0gGfFzffrSZI X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2r+RQFCkZVAL7E7SnfiVtREKeC4/XH4/uW7fdrArbndg6Z9GFe5jvY1vbUkls1mYcjnWHD55l1Om/4a3FcUHtdNG7tIbMsamtNTJjtZ5gEjgUNM4VC3oLCxjxoM0xGf7B484dunYCiAeZVu5GOo/k+Xp8EYW+7RfZKZwn0v/VZE768izYq10APGZYGSR9+eVDCwmukWg+GpvRja5LP+q+wLNhY6H9pAOuNfrS0jY+yqoEjSTq0ez5GPlPu/+nAdkRE9wO5zRGf4oYCeP1xna7UtFkSkCZFMprDMNjqUZ/eezF/YSUeCZA4vLVcf74czstg7CeGoXLH0xSAvOMjzH0RBfNr9W74rGMJ2VK/eW6WPeNzTBntUU2mBztA0/5qyIvUDkvQxE44wV+UyT4ZlB+X619BFgcfzAwJMs7Xe69T4u+Cb4+k8c3EnbWbUQQamCSsZMCVXGSR2QGMJ0Po6CZXkBsGb8lNo7rouSwWJVPgQqc34Y0hKhmyN2tBxJdi5zqwpCM7ljH3nhCh7WNTWyvq/h0dq5mpJ9PQ34B8fF/T0DVyYv00FuUBW/YcZmf0DdPpCIRP3YMZTdvb0qFfxztCWrlN6J7hRTnMQ6ep1qEc3XAjZS9f+ZdkyibJWOq72hl7MqLS0SL+hSOqydM43t6V72H8ESbEEBgfBs/k01VqWSN8wmQziycNu7NJ2vsP11 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nCBcVLKmgO6sZ/WZAAmuDuekH8CofF4o3KVuBDveTrROTrZVmr0UOqZWUxyswFZX9KPXvtXzYJTqA2pqETxL79+hzfQiWp9pep2CUNZYI0v9e8n2ojmuVAKBcxZeQrdQ1Fqxp/EhCSvipmtU5c5mqXalYH3NQC/kxZ6jgdEHbexFtW7n9SvN8ufnI1mZHtaISzAkxe8O77dsZyiCnCRTYRWMGMoBB3aqr4BKEEbtxHNSVJ6F3Hrs7q2L5xA8phmzspyYYIJFLbUFUROLshAmqK+lY8rPiBvg4EpIyIVvsKI55aKPRv4IpRBhK7XLWGwGKPXmN6BjRSOzdIaNwSaLhRNIywgXqVdXLzyYjro7jvaVWbbeWyiTFrGHp2luT7Hyt9AmkcHxCCkIUG1kx/0j0fUoPkqdaT1Qp2pZvNYQHAHQ+AqeVexCVX/1+/RY/0kP1WTG6tvR7XtdgGhr4akqNjgpJnCqLupAGVjv9yLUn5R5dIuOdN5N39RZxDibUY36Dq22UNlm5MkgOUenkiJdLxhV8FowqWxkJj3+0V0rCkFyrHyT63uiWAOsvI+Cb7TKU95o9gqYKgAB3J6tpkIAIpR0KZGUn9xfrAaoQ51KJIKA/QC1f1i4jbshlaQ4nUoaJhzsHid+j2zVnjzxfABXA2Wv3g9sJF5O0uGmnNl+KPJCyaHXDbaQOcA8dlMqPQP3YHdyiUYnwklz2q/KnQwXiHfAeE0a/Vg5b0rRK4Dfs7NAyi+//xkRmXqh/qqhhrfGYMTi6dQceO/dXa23jpyHyb7YcPWsxpzI5UeAUfBTqKNm+T+EXqXdLhC5F04euCawV0FSANv5JZ0p64ZEWyQtvTKLbjAeaCQq9yAq98+IC76MGNiQTi8hjwYusLacvE0PCMGe2LhCWl+BOkncpbKdKNjJx7uzTxGdHxsPMupiP+VHRRZnmgTtgNGR6gm9Z7KRGw6R1Vc5QSpvUev3Jnexaw3oO+0Edqe39+vh5KhEI7Tgr0cJX48ZNDEq9q8Hdt9zUc6N8jflb9BZUrvKnw3aQqBfWLkXtzrcFeit+BZ3O3qms1vlP9W3GA49i5nrrq9P7yN1hQWQd9Rj+l7y9w0lALJXvYqlYbX+tzlSbQJG4GFq08CFBDX3rooVBczpCoU5/xX2cfUMMSu3dFI7qti50z3MifljqvVtVKFsDrbP6aFYrjmhyHuDCMOF4ZNJI5QhQzNfkLiHfpo3/J7bnvqC24UIymYCJGFpZ7l030pQjdtl1q9vdOtnImglOaFh20WDiV6qRIa5GnuoyJ9yeX+wdLkLBlct2mn9J9DzkxlMg5kDtbIc6IfBPoylYzp1Jhhw X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98bcbd65-3b79-40b8-c8d6-08dab2778537 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 08:46:03.3942 (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: GV2P250MB0825 Subject: [FFmpeg-devel] [PATCH 05/22] avcodec/aic: Remove useless 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: 6nRlaXfzUWoo Signed-off-by: Andreas Rheinhardt --- libavcodec/aic.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavcodec/aic.c b/libavcodec/aic.c index 49d08f0556..7ba1c02fdd 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -143,7 +143,6 @@ typedef struct AICContext { AVCodecContext *avctx; AVFrame *frame; IDCTDSPContext idsp; - ScanTable scantable; int num_x_slices; int slice_width; @@ -348,10 +347,10 @@ static int aic_decode_slice(AICContext *ctx, int mb_x, int mb_y, for (mb = 0; mb < slice_width; mb++) { for (blk = 0; blk < 4; blk++) { if (!ctx->interlaced) - recombine_block(ctx->block, ctx->scantable.permutated, + recombine_block(ctx->block, ctx->idsp.idct_permutation, &base_y, &ext_y); else - recombine_block_il(ctx->block, ctx->scantable.permutated, + recombine_block_il(ctx->block, ctx->idsp.idct_permutation, &base_y, &ext_y, blk); unquant_block(ctx->block, ctx->quant, ctx->quant_matrix); ctx->idsp.idct(ctx->block); @@ -368,7 +367,7 @@ static int aic_decode_slice(AICContext *ctx, int mb_x, int mb_y, Y += 16; for (blk = 0; blk < 2; blk++) { - recombine_block(ctx->block, ctx->scantable.permutated, + recombine_block(ctx->block, ctx->idsp.idct_permutation, &base_c, &ext_c); unquant_block(ctx->block, ctx->quant, ctx->quant_matrix); ctx->idsp.idct(ctx->block); @@ -444,7 +443,6 @@ static av_cold int aic_decode_init(AVCodecContext *avctx) { AICContext *ctx = avctx->priv_data; int i; - uint8_t scan[64]; ctx->avctx = avctx; @@ -452,9 +450,6 @@ static av_cold int aic_decode_init(AVCodecContext *avctx) ff_idctdsp_init(&ctx->idsp, avctx); - for (i = 0; i < 64; i++) - scan[i] = i; - ff_init_scantable(ctx->idsp.idct_permutation, &ctx->scantable, scan); for (i = 0; i < 64; i++) ctx->quant_matrix[ctx->idsp.idct_permutation[i]] = aic_quant_matrix[i];