From patchwork Fri Oct 21 20:12:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38892 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp957046pzb; Fri, 21 Oct 2022 13:15:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6BL7GQOuhOP6a7xVaQTbhAYSztU2a4w94K577kA9J1wf4Xi5MyFu0xliKo8i7L29bog1+K X-Received: by 2002:a17:906:eec7:b0:733:189f:b07a with SMTP id wu7-20020a170906eec700b00733189fb07amr17307695ejb.230.1666383316019; Fri, 21 Oct 2022 13:15:16 -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 hv19-20020a17090760d300b0078d83fb6672si22456361ejc.118.2022.10.21.13.15.15; Fri, 21 Oct 2022 13:15:16 -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=uCmG4boR; 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 BF6DA68BEEA; Fri, 21 Oct 2022 23:13:58 +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-oln040092075058.outbound.protection.outlook.com [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EAEC68BF31 for ; Fri, 21 Oct 2022 23:13:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KI2wD+EDdJ5Ub06ryuXfEaxU+HjUaQSky7THYlm+l4dTAF2AbmnLAZpwsfvbibSbhlnaSNR8e1tfvdITCYE+3lPgYc+MK8e9rkFDSmCNOXJWjTxrOMUaEqhQRq3b7u2bI5Q/e/cfUZkWgKPo4qFfg8/xlhZdRp/JfYjxrsYUDEMFsMd+Lt00MkKq5/YEzyLznnBBin8LDbEDfcexy/jz/7kpMkDMmEe9v3cs3sSyVGuyDkTaecnZTSl7k540TgvukkC//LUkk5VF/kIWRk8MfF6vkZThRDuH7jTd/IP/My7M6Wxk+LGF0yecXIeyiU1Z6y6iO25s8AIAjJGgQ6GYwg== 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=zOJ7yqF7CfGsSBqKZU3BCoMOQdVqAP56aPdxw4x4xr8=; b=CwE67reWEAMWy29fzrZAogPjSTJbvUS3GVnUDlcKB9P/GNuP4ukTKl4baM4avA9MltqN/g54/BzfsPdncHO3eUlayEEwU0FrG9HQnDFZUKJBHtvtShzYGCKxbuIpC99Vaw3UV2gwG4AcjQCxDxMIW6eaTb6nuJk9WVY63fsQTPqIGS49T1Rpaq9829lHD4xLKg+Y7ZEBO4FU8jKQlPp700ogLCrqk6IISHlMgpj6aTL6SUzhQ94K1XdLbXnqMCSGaxwVgffihI9N2EAkXfJA0C/wilHqrsqBpTW9AkaVEETJE9nDidSDjmFJV3DRs2AmdoxPvwIL6iB3iPynn+XI0w== 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=zOJ7yqF7CfGsSBqKZU3BCoMOQdVqAP56aPdxw4x4xr8=; b=uCmG4boRCV78KMCz8vFEt0vImUwRWePBHEI+7vBbW2fGGYaMULi+wXEqIMTWgLf9yWbhXlhYY+kESmWsUq8VL27Hf6QvCLROa/vn05jtzyULsKlUDUXsY44YbAObm88ODc9PyqDjG2raPL3gLehoZ7QVmdDHg3XSie0eXVrLU8EYwbQxe9YevE2hlVZPu/ZOgq4e+EnSyl9pVDenMbtKKAKPp8y4biue7Xi6Ay0xbPV9q6U701ksB8M/wVdvCuNf6nrRkH5QtP/XljXI23rZoUbLx6IFUZcM3wIyiKvf/bd5RXgdGMoRoMy5/If0OCYPnuA5jnwt3oCUHJs1niuP8w== 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:13:50 +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:13:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 22:12:51 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [02W/FtVUXpJK2l0hZaUxTmS0VRqbaJqSVTpgPChcwww=] 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-14-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: 2f7d9cd7-4291-46c6-e4a0-08dab3a0c446 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nnHDnbJ910YUAai4EXr732ZAE5assxEuU/fNPiASwg/53vo4oZPGaCrlN1k7tw3NY99lCZV4lhK81T1vMP6jfCVco/tPL7xpukgGJ1iHzg/qkLmsSA84teaRz7YXOJWN075G/4MQmEluxf1Wf62g1bFXy0fCNVYEvmP0QqIXznx9e8R1GiV+ia6TAwFnAprJsIo/KIE5r8jvXPDPZbNZ8fcb8xVqWVD5qj95GQamVwPgD3ve4+YMuQaJbSqGDJVE9GzKvQO+owqRm96fO7JnprxmNa0epsXFA9Cdj0WjVtSe3L4EYqX3XRWGVapvuSvKMtFuOkwwBkH9BYT9nVcqSHgLcAgjYCuti5dVRxaoZLvsN0fCfHfUFAo2TDBLPPeuVP0fDCFm0cPniJCnHudhzHEhX+1NXqXlBqaeilkahCgIDe5eOzErpxUcrh6fgXy5guwpHj7tx1OFwx2HZwA0FUHY26rfCvXUIc3FYtJ9e7ytKAvQgGw3tN+/0baOjAK88mmE0NsFH2TCC0fg1MNoAI6XmpVkNgvobIWYUXPVzotWVozw7vvbbW37kck4LwZhPzooY+du1sSMgWG2UAXTmoaU2wOCIO0bTzhTK5RZEWJdCSRp5+n+LJimAbiqrk/vsfi5VsZGqn9aKhHTSStlWSHYEfV+7hebOZNV/lFnDWWgcVlEEGZXqaUQHfuXr5lY+VbHbrFsFBrh70xEDK6yVcmARUw8hYRyAFiqmoC4AHqT0BIT3OEEJAOnEXVBADsTYgwKwEVTkMQNygGzmRs5xo X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KXL64iIzkNCb+6KoDeqL4sFWMc2gPihOzVCzb3Jfgmd3HiP3WTC3RGRqeISB7SzC4oCITs4sru9pjdDZ+TqgHMukbrcTstB+iSEa49IdsClQd9BSW4r+rW4daOwCBwJsc6u0S5/k3zKd+l3crsVliEnGDj9R6E6PnE66254vmMg/uywmZ2Uve61+t60cFN54B4VBiTjeJroOSwze+plOXfx2RJ0VO8U7/IwKv9AbbuucT1OZReMKYpO7HsnpkLd/1OKl8RA+EoxcnGwSgCjNQgqOoYYScKica5+BP/79744zaHQfVUmwrZBjCRUg+JNVFdAP4FoPFq+wIN4c30/CqmLHeoFLv6dTLaJsylN6ZOs4jdDSOJorLRl4qXTkozod/vK96V7LZ2BHtfGohlFSecNuiAwnScwe7nCCo01PTFZ9qm/PemSZSToX8u66USezTXA42n8MTSr4q9QL7h7kRXtD4G/kWlO37vUdBNd7iXGSjtWeNJjdkTIJiY2hwzhGAq3b1ROkX+Cctnefk06wK4b+IpOqcE1lhiVcBSrvpvz/TznyGAuROwRLqGLNt8pQ+tIwSEOFLuJannUqgNJW8PA9uUFXq89oL7EU0C/ZFcHwokaKUWuYgq4kz1PmH2Z5P4hgya2sXgEuboNOdyDkxHTy4n78wOrj+YuwFWrB3A0s+Y12aWEkSua/Y0Awd5aJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IxvmExkhf4pxIuIkocXTBUe3LF6mjA43pOVjxz3oLxNSf9H1KLHFZWPG89XG/KIfMIxHR1FYUPigQ8HWKXJabFPxnuWSkUW64ikUwt/dfIPfPolMKAf5ny6Qxk7eStyB6jE2xcp6lZnXTZhCXLMkKTiHH6UyoxdVd9rns+RjToSxLxi9OJQHRv5RRibXmWRI3duDNbCwy/h68zzilgQbutBjBWLENM7VGF9tSNmmCmy8l4CH52zbnkrUbFcI1BwkPomFE1DpiQHdpSWt8NiLoHokuRumiisgw7z0Psyt6YlW9qR2hwx08pvlZbkcvedC6H41sQ+nBDrYs8kcuGdoah62jxyXEy5KHFRzYwWH3xYRD9XgxSPmnwnRleFoYbK6Mb41GyOonpJEmQLe3i7hE8ntOPDzxmoiX60SHUnEd9pUTRTu9ugJZI7xB9Wqzsyx+P0LpqrIbCWAJ6sOsf2xDYMhaY8fa3bZYRCdO1dHEFoTYVJWRVdElhkwpyvCqrBJPoGVM9ncmQUh8scdq2+mIisK78PECIkBG/q99j/5N2HCaRIZZr7WnORRSGY7ryMVL5yG89qduNM6w9ZIUNW7HFpV4iNpmu3tuTTQdMAOMP2SEtf6JAReoLmzcssLtuZdpP6EUT2YfiehhQD5pFd0jWmVYweukAJobryixuJ886TzaDps8bHQiccBdhYQ1RRUsi7OBeqx3IDxUtGHwZtTqpCeqReJ4ULuNOkO5Y/Aa8BhUw4zhcju9GOqnrCj6DKo5haxWFWELWCq6XeVmXb/JMWgKJ7rWKnB5yXn6raOAM1MheguQQmjiLA5lp2MQW6CNsvZG7QEvDeUPcDeJ2EHhy76LC7TunqFv6QYShOOBdmhNzasYG2PF/F+OMmJd45wyhtGyvNmrcknFtNVgNjxpJiss9+5BY6YA68+vV+YT8MNi9444UNkn4czOyzrKZS25uj2ZSqfVDJzPAAAoifO5EQR7e6YCD+bUqS9d6KRF1eJ/YUM3Eda+hfb3B9hIvXjQj5RA2vfhGy/NTxlm20EsItoKNCstXV1lut/loUutt/ulck7qeRWGg/UO9byj5Ig5T+mguqqFeEGJ9TdkV6qbI5Zeg10BjulN9K6E6lnuTQYKRdeCgBvBTxkJtqxPF8Uq1p/9UnRUWwtWOrL4jWAqb1OlritShJuZdUvth+JRTYsocBK2FcK4e1XtsqryU+f5/JV6bpLFNrU0pxvkXlL8k0ur5Hg1xmZttRvrpobxLaHJCM7ExvYvMGEDV6rr7TE3AmS/54yYiNs7WoYCHiO9AY2pWue5X96Gk2ja2bDaAfTgAYziGDTrXobTDyoSWaK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f7d9cd7-4291-46c6-e4a0-08dab3a0c446 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:13:49.7184 (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 15/24] avcodec/mdec: Only keep what is used from 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: ZhT3khmSV3Qq Namely ScanTable.permutated. Signed-off-by: Andreas Rheinhardt --- libavcodec/mdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index f27cf84122..a1f85aa0cf 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -44,7 +44,7 @@ typedef struct MDECContext { BswapDSPContext bbdsp; IDCTDSPContext idsp; GetBitContext gb; - ScanTable scantable; + uint8_t permutated_scantable[64]; int version; int qscale; int last_dc[3]; @@ -64,7 +64,7 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n) int level, diff, i, j, run; int component; RLTable *rl = &ff_rl_mpeg1; - uint8_t * const scantable = a->scantable.permutated; + const uint8_t *const scantable = a->permutated_scantable; const uint16_t *quant_matrix = a->quant_matrix; const int qscale = a->qscale; @@ -223,8 +223,8 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_bswapdsp_init(&a->bbdsp); ff_idctdsp_init(&a->idsp, avctx); ff_mpeg12_init_vlcs(); - ff_init_scantable(a->idsp.idct_permutation, &a->scantable, - ff_zigzag_direct); + ff_permute_scantable(a->permutated_scantable, ff_zigzag_direct, + a->idsp.idct_permutation); avctx->pix_fmt = AV_PIX_FMT_YUVJ420P; avctx->color_range = AVCOL_RANGE_JPEG;