From patchwork Fri Oct 21 20:12:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38883 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp956142pzb; Fri, 21 Oct 2022 13:13:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ZW3dQM/EGcjRN2m6EoMEjQdMNlIfzgItkroG0l8PSNCUBFRbQlIGeYn/sd8VdfqZ2zkPc X-Received: by 2002:a05:6402:401e:b0:45c:a1ce:94bf with SMTP id d30-20020a056402401e00b0045ca1ce94bfmr18743731eda.177.1666383222186; Fri, 21 Oct 2022 13:13:42 -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 vx3-20020a170907a78300b0078d8dcccfa1si15945108ejc.396.2022.10.21.13.13.41; Fri, 21 Oct 2022 13:13:42 -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=WykKGSiI; 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 B8FDC68BF08; Fri, 21 Oct 2022 23:13:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073097.outbound.protection.outlook.com [40.92.73.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 359DA68BEE1 for ; Fri, 21 Oct 2022 23:13:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=djrOWw4tdXPD6IJOManxnbIV56tL2GXDXiz+mrO/MJiqvsGcNGViyhne97bhgJGye2dreBQI1/MJtvoJLW/sfi4dEj0Tf/Uoyj3Kp1yvc8HkHinQWAtLcYq9rBnnt51KXguzv/4pp3sCSIN/0jFWStzzGEFB/aEGv5L3v3/vRKMNXxACYgAj8ckUrWEzXy6Adj0oPNZEbax63CvZ5yXKJX+sBwElN6zk+4iva3E+IbrY60XrEZrAIz3NX5uiFDHXn/LN97o/40a8/P6ojw7EY8WELRL7Kg3ZEHFonONy2XFUZSKHzFpNvEk5cG/SNoLB52Hew8Vb9jjVrbBDVJFqag== 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=j40k5WaimTpXCRx0+kyu0zxovOC6LEmvvGbIsF/C9m7BkZHLAnlIwqAikNlHYkk6znzKzb6elbPSfMEE/uDRoKa05qM8lJ7LjH6gdtYA0I/auIYiTSWzdNHjmK4n+hNUjBQWF1OfVOK0XqjbQ7oEBnm55vCva9UN+6WHh8bRBZ4QK8SyGFqFRQc3KdkK8c53XBdkouyHzMRap6mXHcw3+iXR2Jo6W2HiHHz3MqvlOswpokC67r7Hq0VLciS8BCRosW+9F3R7tBFCFswbhvEsxAFYc5wD02MWAYsgVfKPGar3TGkEg1V6ZDU+Tj679UfVHtcGU2+CpGw3ftwHkzIP3w== 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=WykKGSiIpyrxjoBWTHHmXHBEF+iy9nBv3jq5LY8+d07MYDV5XCdXNNbSgRXRy+hgSH8KGKqOWWBGJ7t5feTKa5ZcxKr4I4SNtkHaHNWScJ/LdKpJ1QBFlthN/z60Mjtdc0/lrczxdBaZzrP/+6zroEZ4NmKxpfriJBgE8xK6GI2QFdUp0PpmVye/w3dD+9Z+/gSyBN/h6pZGZ+WX0Od6HuTp5q9HzuSulLLgaixLVNHw1oVPxtwGpQBBmZ0dXK/Q0VEIXo2P/VWcM4desZkmbR935UoeQbNAah6PQkhGh6TFs/duYgy9HrwrMdRogsVA5bHWfSoQdmV3KGH9fCE/4w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0818.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3e2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34; Fri, 21 Oct 2022 20:13:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 22:12:41 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Z93PesJ4S/wVzUkm715b5/jvH9BEfkamLHzFjlwxkbc=] 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-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0818:EE_ X-MS-Office365-Filtering-Correlation-Id: 343faf45-9221-411a-a2bf-08dab3a0b4d4 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nnHDnbJ910YUAai4EXr732H20LTu1g8ExL9ioBvFdCJbfPtrsKSGibq1CJppmynYVq0v84RzwA+hDRPqb83mCRQek/M11dpwXwRBP2EcFVAkGKrKi1D01X1uAQwlAqm2ji8eNhw2TyzBSRIMUmToBhphLWSS2zn06C68qAdhxJTHdw4ZLozIVwJL13vPlkIuMq2rp0iLdXruGcIAEr56yICeDWgdx9xR8ZmMyWX+BLyx8O54h5dtXoQQrNkk9+hQd3N9c1ykXY14t15+JIV5m0Vo9jI0mMRqKg6YMl1CBelWuVRPOwz9NAEYAGJSeslN/Z0YP8HJYruQmB1JoqSjpwEL6twrTD65tLSG9J5A/E4FOQ6cunnlOWmHNWfoPGkrw7lPHqwZ6PL+8dwjhd8Rd1KfDDy4QXXlM3VZvpAH6MoQBH86bXdRBXlFoNkCVtURgZAfLZ7lYeyP1ezx8pdGGkkayLJyVHMkI8ake2hIM9eZ/ZbI2Ode0s1DQGbXm7wqgIrrp6xh4tN61vpuDEsfbpkjAEGHggHBXAwh2LlzNZjGPerJf3TwWtR7QwdsxJxREQoPi4IMEqvMJs8QdQXDXHVkIB+KXcsY9MKN1xx6vfX4SX9U1OIcz8khU2HS4WytD99pqN09pSSPU4iAgN54CSLKysR84YdC2Ncb3Hm5LA5g0xi64DldRzlXGw6l8Znlkh9Dr3tZGSMsU9s0SarkUiQoTlI8ShQZ6pz3X7UWK0cAjmyvDm9/8ptuB/qlptScUcW3Y1ro/Y6trMjYOMw5yG X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HGjcg/mgozevaV8yNj/tszOh26FhxMV7oa9OlSWMH+1t1RSSqyM4aM9okzDwuRU609qdb+xavFGy0UAXVwXY9o5vI3GDPQY6yR+Oc5hmnLyBXK+EsLywRHlxGJel2Zpndc59rup/mo5ejItmwl7bTOKAZbbImGwCrxpHHYX3j1Ui0doX4z1+L3Y11fpg0VvFBSpCFS9ofoEbsEtZt3dyn4DMCjrMv/l1PEz+Yyhzr8UgxA5hx6Gqn0CwcM7IKDuAcSBRTpolMwvrNggjTsDewgB+WXk80u/z2f5lpFGF/gEnWNB8nNN+N22cg3+UY14ZSozQjyI0u7i3RRWY6M+gzW+p0eCq3/l7NCIDYrA8BLIytY/eciTli4iSB6OW56lE3/JbR/SZiBrgBSbaXcj+fmzmBJjqgS/dL6hghDVaeLSE+pEJM1ZBvSFBFCJ2XgJVZOLxkumGTPPm0oZ2avs8FzZT70OLXnSaZxqvV0EBjDl7gcIBwOeuhOFFfSXmyk3VxVYxP0flyqOf4Qj3f8s5l9Vaf+nhE5Zq2ldpgohG8oPtDZiWCppRaNRqc2koVXgu81lvhD323w3ruxzywIJHqw0bzWJbx+McjsvRmlFu4Cc56vP3Rnb9whqlrJWJhlVrGiH7K1pK29ZAwkvzgfcspQLiOojul3fNcJyrNvILuTwzepFj1Y2RduxsfGmWptWT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EGYsULYs/TbkkAUIihkDEORQ0ojA49oxrH0iXX0W5OT7CczNNKgSa3zTmbjcmhdcq3zoGkAgY78Kl8HcNyTBhfQCT7UQFyfNDNDemPAUf3D2pjKsdGxanTX+gI4b/ALbSw3b1calSwfPbX+rNnKrgBuXq3ancTcM0D7YauWu2i07RteoCUioQ05K8FhAhSpx5SmfcDbldTCRGiCBKHuHhBbPv+Lc74PIcfDxPGI1pnMCBCJe4GoerP1dr0tqxztxTzcfWfS1CE42m2l1I0c/vQpYVgKvbL54ydntML0O0feK+p9orqKj41ENP1TMLfyIo69q8DwxjTwIVwijGLjDCLpDefj9F8A/wjcUpO9kTyhUtpq9JRx+HW51njgHfmVenPAqnR2hT/jzTnoB0R9PvphAJzqQFGOaCBWtaafeIOc8sTAr/3czidBqiRJPeyGlXFAAMgkK/jqldJ6Jh5vfv7oqRqAbzKyF/T2jydvCpwyPO2Vcl2FCMoKq8XiTUabEp1vrDY5R4Q3zUBRqhKbz7gDTV0ZM2Z24FuGscci+r/qraeT4+Iya23p1D1D2V76tislz9DENsa6Kw5HzpZxtfZf71uVNw6id7GhXNs4uAYAgpzyBFPtIeEyahl/AcMXwsz6mGyadH05VEHGvcXMfyX4t6y7MoY1P6hbeM4ae9xqOYuMPM/67WMZZHpQNUsy1rJrbfu4wYrVzgcVyfQHW3YxiQWiGTufmM43DehALZHTNJ2Muckw3IHp+g/F4WmTOHgONL0BrNXyIfFC9jFZxBPfIS358mU08VTb/IXBMYVoeFVBm35yQRv0MJygL2DcYKSXy24xrkBoCha9tm54XYGU2rjSSYXwnB7TwZxb1NV1SSkEmof24Dx5o2Rx1rSPK/ZXsvVSfHddJDZTq20isc4Ond7s0pJqT6771aljHkTbf+HqcLcH6yLOo5mkvjlEJuQSgScw+RC1VlmW4VX90zRDJuoq/Tfw2dmbs9tt7iKGv5GgFt/lP79o2F76M8wzUHC8z0FiCR8ZaQ6YOGNmWoK+pnXdFTljteFki9VxI1aYNUJeXDTmyAdUyIzIPd21AfuQifU33xmTOBACJqQ5Xb8feaV48EYhyMgTabgFeI2GQkU5fwKUHneu0vTjZxOgJsST4P1NcdzRrKkRgpV58Zmtkb98Fnrw7aZJyrPj7/1k68ztpgvpD1ckA0zzX4XVWlDDzqCTQCExnbrqjGFkoxmqtJS8RS44WvXfraO/WbwQ/TswLVM91i/LWHmnuzm8lpOo0oAcI74sr6AwdQdM3WgIiE/uAvpduGSH55k6gm5RP4isgNHcjHqW9vb14krra X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 343faf45-9221-411a-a2bf-08dab3a0b4d4 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:23.8038 (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: DU0P250MB0818 Subject: [FFmpeg-devel] [PATCH v2 05/24] 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: 7S5FYUJ3oYY2 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];