From patchwork Thu Oct 20 08:45:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38850 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp46099pzb; Thu, 20 Oct 2022 01:47:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6BXuqXV7tlZkU5BAGSoFxttXqA1JSXrIC58gnSteeSISEbvu6CmGGTgRDSXWQc9wq4SVxO X-Received: by 2002:a17:907:7250:b0:791:9093:47f7 with SMTP id ds16-20020a170907725000b00791909347f7mr10047954ejc.278.1666255675396; Thu, 20 Oct 2022 01:47:55 -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 m4-20020a1709062b8400b0073155abc1b8si13705697ejg.154.2022.10.20.01.47.54; Thu, 20 Oct 2022 01:47:55 -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=OG4XPO3W; 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 7A74168BEA5; Thu, 20 Oct 2022 11:46:58 +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-db8eur05olkn2073.outbound.protection.outlook.com [40.92.89.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76D0768BE95 for ; Thu, 20 Oct 2022 11:46:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eSE07WwYZv58zllb0UAm7rVj03LfQjWMVEKv/67KlJgYvTXbyZFOGQJdYEy84Nh9lUGcLEfxTCj+ScESHZ4Dx7vCYpBk7AcNZ6LpJvg7n17FhNZwru7SfL8V6027wFg+4nInB/OIxyLgPBckjpdIBnvVdOxEuGyHf3KxMrsd6tjFWZQUCHpfG6iGMNydaZ/I/rZ9U5647yG5VZo+YSn0RZd5ghRal96KQlaSImRtFUDRdwUYcuxMfQQxKKBV6B5+xXTiRULtpIyijzWGyVNftSPHmw+j55dbp8/ndtZdhsHCtCuykkyi00+UbC9IpG5nhiTFNnLK3jwGhidFC4X65g== 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=0azkugzIJX4qYf8vf0aXB7rD3ARzOIJCFmIEwLQGB6Y=; b=Wrr1nYuEQ9KWK5GK3bhGOu3vrdIHqt39+Ksv88C1ha/7FKB46pygLzRmvyUKL8mwQrYt2yGis9P8qBEWbwS4TGUDseWtVGGgx5InO1PVC9xadn9jUuwhN6m8cG2oo0HKIotLjQCuS15zluYxvaSL9gf0HCQoMyOXM8nCvQc8SX3cP2c2pM69dtpa0CKrCDtd2QeyqzHvKTe1Pe1I/IKho6yUM/dbuejYD8Hj3gcCq9ssrW9PFtInGENbZv0fkDKoIN2VFVZfQw2q+8xmB3t50nmtZ2BqKGpM4gMwVG2sRyhqS9tBuTmFZ0mUru/lQLljhvMM1qqxsIDDb42DoUHMDg== 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=0azkugzIJX4qYf8vf0aXB7rD3ARzOIJCFmIEwLQGB6Y=; b=OG4XPO3WZ6J394i4giD9l7uhaZioSd0WGobRWNuc8EsBQQwNbNtLSr/pdR26oysUN9kg5iUwtCpA5czL2/W6Cdzku2kBGLlWSMh7EwLCEyTKT1nDhmqheik1IPFtEcpwnSASGjxiuca5J/v9vpuIR9/PppJdA7+v3unQ0kOr8hx+kaWXSCUH49sCr0FvCRR4y6ZmWSN8CyUdHbh9IEkqVzaDdjb4kkWYVEeyxEEKk0AggO3PnqjNla4I7I1LN02IxfGnOYFUTQ4ApFohefHV+k0rqKZywInV9KrfZwy5Ys+6TpJcL8Ao7itOqHs6BUdTnhL+2RQ66kJ2PhJ3wroMYQ== 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:55 +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:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:34 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [/+6tPCmK91JsVbjnU670mpcv/i/1ASp1UK3d1kvSPUY=] 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-15-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: 1ba59634-9015-487b-9c61-08dab277a3fe X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kEq9VXjGDAyurdVkDmkI7q7DWNiKYGeXDbQ/GFOChYu8uhpH8Y86WVeK3KpuKAR9piXCj2ApmLCex1lYqsrhwGUTVPdvziKnIHanlQRwCmawxfh9jIHpy1EqV/psrbxUrVGUTiCtWUS9kJGYgmnItXFs9z2rbUhTyU61Y0VZULw8wBpgLBreeD072k2D68RjKgxcptCdCFCzepunnoY8QhUnuK0ZL18RA/LU32PNSGP4pxrVWTbcSwsPZ+94zQUAbgtRK5WsAari/pEdyckSFwjEpGcMWpdl8iuwYOGJlM130IOXi7NvyxLGkiCk4xYWVmyHlvEv01vosMM3F/iwWIXZIT6pdxYSvp1hHCZWN7geBM80wKU1nJw2DTtHSSgsDuJtiZKQlZSdv5A9UAbYahlxo1d607HyA8KZrXkLNwPblvfz4arAZlASpvF/J3F6gx05rpmLBJuRj12zgO03P1QF+ka4daL4mbZdwNgzx+eOmLbv4OkwKwhumXA2u0wQ5g5KRG/xCvGs0j9nLlZ1D0cf/q/r2rACuw+iT+USNMl9AIcY0J9DuOAD24ZnGMRpXCZ/sfmcUQFVVLKlNuRY1sM6yrpB5QOwfuBAhMnC/hPzS/smhIKJZfY5HoEXeTNhuC4MWF3CTppuVveYcbj59AjAob1A3k1ZRXF0LLtPL1VCWB0nKhyPYry3SBOT3awxCcKrqtQM5IzKRXtSKFhQmMPK6zgDTCj21Kz4hfiHQDYgwlXNMdis7cYwZAac4WjCpwFFebp34b6Eqi9Mkv0CeZ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xal9wlyqNaQrUrbGT0+fXxhRQcs3a6X3O9PD34R3ok04TUjTLy2T9PHhByAygEomnRgdo2dTyFacrvg+1sfSpq3/m+M4bImkLzohMf/xZIW8yjvdiRltArBg6c7YK1JiEubWY1g2vSxvqJX2ukTL7bTkab3IZXnSG5Y59uV8xnpHf2bvqvWff8ZszRQbPK3ayH9UDaujUT7L0D7hvMLbuZJkru69O76kppr5FEnbJcygUj9OhtiL2Go7OMKUBUI5TnS8hFrgl/e0nDmGgLTlBUedL2sim6KWRhfsp/zZGwZgkmY2RytqsD6hekUhor/IusAFLT/za5Ct8GIt4Gya9zSetxXHsuYrUR/bgvipXUfY8YEjaTSUGcQtm5+rJvjfUfPCRdafSbicCM/uy1okymwmU2qIOaGN4ESRaWUShtkL/qC8C7c6ZiWxT6p5d4W1YteCEBs1nPORVyhY3x/bvRm+XcZd1DnFaLQG1QYiU1vLXoc0yLwyMnQ+tj/2dpGWOnCGw1Q1h1jQe+w+aznPBSspMBqqrHxow+5ZFofoOwlx3O0NmuFFnbilClxhaHuu7alsFXUV63YqLin0HBD5xksoI3+TRdIxOewvvjhZ2Zi8d+nX6ygLuKdNWe6XQLs4pdmufd9PkqKrE+z2O0Z2hFLKkJ+o6v+5HGiW565FU74b4lxL0PNzxn/R5o/D9yKZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vSxCMSR4pFpVI0iaB4XSWWFWFFPrFerjVrA9ytqCgcLbIBarUoruzHDaX9aZ2+wpRAAk16hqm0J0wP39eMO9LPeG/RBjlLlJWq/24FrPtH0AS1AmpJwbB2W+Gb8vQpdVZYdMdMzBGrJIBHMlQ1O6T4vBFVHJJqIjYEkPPNOzMwZ370nLYhRLW+bAFDcbhCOlUH8SxOqHdGwVY5Pkz1+295dU1zjoxc4jDGsAir6Z043gAXRMtHYdVF7EFbdSyccvvsnAsu5de2tUpW8Os+HGHU0PMfEB83Luek3FM60G4KTiblJUhn/TbXhZAqleALRcyFjSGhaI90GbRI1cL8j3xpe/fnJs/+Pz8h/1ILvDeFB5QiTcZWkfJ3+ATWOplXMIf+5g9qw0cnMCxpPl8GF14r+/nDLLt5E7PZQmFWMPWytKr9/H9frspK5NcIZZu+OMLW7MMhUgHdOXBu7FRJ0xv6nAQBA0CGemjzSfHz6V1BIOc14+bcKTk6rqij+nx53y00GDvekY2p36GoeVEvXnbRP9KjfZSV8ZpuBhdkC49FZ7QRRMUjjPvIw5zIxJRfyv876OBN9APuEVlV2HY/nIe5l1Kn2Jg0cap/YRAfpz2svaQF2z8e5E2eF2zxBoipW3O9ylIiMniqhVRogRb+r/T6UoPA+R/tbf7WIMshTc1dmaflCvkuhRnvu1SveAvhrKOBNYFA8fi7KuftPQjZAZyg0xt0G+HULMM/L8FKQ+aQW8sgWYkzXypDegT50E8u/uHAlfGT7ps7t9FhOHyygp7WH3lFcHKMNV0Wh9NlOoos42X4f611T0iSas7wxwqFJ50PPi4L4RAhb6FzI5LXTHvfyWfiDRiBRKTPp0nsdIvzsPiH4pi55Rx1oybq8AQCveykYqj1FEZMUZClG199Hce2Ga8xw7fyvetOoFjwyyraCija2zpDU0eo3QbKHr/0faJ4fswkrr/ug1AzH0IqRb8L8miovy5yP7ykIJYssqbh2jSGFjxb/i6+pIftlfWIlrqF+8+ucn6WX55dZInpJ4ktv6lil8c+/8m/0VvREv1iMXDw+yPTSKKQ20pr/XD1UIaecNQiPJ8qlv9FFEDmpqsuXEre9SZ1fMXFKfwhXcSRUr8DUhNKL3yKGNZ048x4aPytKsClitk1PDp8hpYLd5qiehP8F1pwHYCuTHRSM+Po8S8N2i477duir0qONmu6M1aJtURUaRijTTF1dC38LPCXjkqGrhAM3lqRXZpFp8yJSph7dQ02DSiGr2cC6ma5bqht2mDNp5t4m/qFcdrvYbmKVhraTh66l/oFZkBDRuT6DE/zakkDf1tV6PY9Sdor1H X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ba59634-9015-487b-9c61-08dab277a3fe 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:55.0436 (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 16/22] avcodec/mimic: 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: T3rulQjYvtN9 Namely ScanTable.permutated. Signed-off-by: Andreas Rheinhardt --- libavcodec/mimic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 74eaa7d043..153bd061f5 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -56,7 +56,7 @@ typedef struct MimicContext { DECLARE_ALIGNED(32, int16_t, dct_block)[64]; GetBitContext gb; - ScanTable scantable; + uint8_t scantable[64]; BlockDSPContext bdsp; BswapDSPContext bbdsp; HpelDSPContext hdsp; @@ -137,7 +137,7 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx) ff_bswapdsp_init(&ctx->bbdsp); ff_hpeldsp_init(&ctx->hdsp, avctx->flags); ff_idctdsp_init(&ctx->idsp, avctx); - ff_init_scantable(ctx->idsp.idct_permutation, &ctx->scantable, col_zag); + ff_permute_scantable(ctx->scantable, col_zag, ctx->idsp.idct_permutation); for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) { ctx->frames[i].f = av_frame_alloc(); @@ -250,7 +250,7 @@ static int vlc_decode_block(MimicContext *ctx, int num_coeffs, int qscale) else /* TODO Use >> 10 instead of / 1001 */ coeff = (coeff * qscale) / 1001; - block[ctx->scantable.permutated[pos]] = coeff; + block[ctx->scantable[pos]] = coeff; } return 0;