From patchwork Thu Oct 20 08:45:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp46034pzb; Thu, 20 Oct 2022 01:47:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7No5LiciqtGWRARAqEl9GaY75nYK2rQ0Zgm4+tKarDuMbkAIUYGGK/WUpu/mDYOcNanTpA X-Received: by 2002:a17:907:d93:b0:78d:fe7a:f1fe with SMTP id go19-20020a1709070d9300b0078dfe7af1femr10372385ejc.721.1666255666673; Thu, 20 Oct 2022 01:47:46 -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 l6-20020a056402254600b0045d189ac612si17956560edb.402.2022.10.20.01.47.46; Thu, 20 Oct 2022 01:47:46 -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=eeyIiTiC; 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 81AE468BE8C; Thu, 20 Oct 2022 11:46:53 +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-db8eur05olkn2093.outbound.protection.outlook.com [40.92.89.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56CAD68BE90 for ; Thu, 20 Oct 2022 11:46:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BtufkyvruVQ5XMvrM2vReUwlSPFFnYASdxGtj4b0oIKMQ/nI7aPBcRxuZ/WMwuGNaOniWw1cp82kXv1TAbySJj2mJfBqTOL7qm3ULnUI7aD9b49AbytK5SL3CHrK+jZLvpugeuv4AkFUcXF3bPRfxK9ZWofuwfaznhWdHGerK4avklOcTO+Pz7rf3ckIffcBcRoBAGckKf20cnbGmJKkSGVefBmk0fBBLTAqpo1wAqN0uxkwxMYcsIa9S05M00a5Aj5xeDpjd+mXti22boTOaZ8HP7yCTXnBdvhEDJYLDc6iF+af0CmDn82m3OfjLeC8/AXFdQ5V4GSROaOZoRBxug== 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=rF44QRlK0ucf0qGHlen7EUhjx1IXTKGdQYCu0AWT6k4=; b=CfoIbtNiM/XAHXN3rJDg6FxmCw5yQBfZvXkfzem4vXSe+sRbHJGaTwIR6p0zANAbIDEDVTqXXsWnyvTy0GEgZNHzBdVGpgDY5VhbWASx76Jipr1oWYq7+RSSBAZxfPw0WnSve+BQra8iwAUWduWP/wdqVf6V67itJK04EoPcqrAaZis/1ptqeULQt2UUHomUkPSb5fiT88sE081aa7Y9YMLgV7qiQ15gE58Z4olmtwV9HH2ylDXLLBvr6JXCi3acuqStkjXHXFC09NSy5n9iqg8J9eURCDC688GGKGA7NdhO3NrhwpGW5GsmrXcjEo5Zxzork65ZSaq9C2mUu3LLTg== 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=rF44QRlK0ucf0qGHlen7EUhjx1IXTKGdQYCu0AWT6k4=; b=eeyIiTiCQxkQDR/bsII/VxH6Njr/uj7rKRCnf29LNYhqmF9NxqCDK84Lf/83BHgEeRcXG0sPw1MoqTnq1w1QSDvdw7PqEL50rcqYgKQ5i7bmZHLK/Kt2CBnCqAGSqvHkWCnTfnS7wiK4D6VcdY3m/Sxt/7hehzyPDCHigsSfPkK/lEMsXa/9lxjC8MOUXCOXSlQwc1SCjok9+bjmo+EBsfurXuNz5LmD5+ybJ6mr3T/NCdO3AN5fYAq4luMDETa3kWQ9MB7zB/YogqTVkl+ekDCf5aSegyQ+d4gmlZBL38os8GYpiOpt2qwzoTFacKgZFa+JFCaTH/vTTirDIJNKQA== 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: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; Thu, 20 Oct 2022 08:46:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:33 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [wIENIC+ea38SwW4wspf5ccR2jpysEccEKri5e4HSkqc=] 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-14-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: a1461d25-3f9a-4d50-f719-08dab277a111 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqqpqVHbY8r+ej275oS7ZbBXkpbG90q71hrVuVhHNAIoYHH/X7UkrJldaiYYQ2+2yPKNzjud592gCjDv7WeXercpmu/nXH2dAr+XRzFsHAn9XquHrNcgHkmhj1UYlV90zt8jgqy/pMjhUsPdaMy6BQ/Bx4EtoYJdYqOV0rMLcPGSa5G410miwoyP94Ml/wk4ei2/fnNdTG7HElnJlGGwE0+11UmXod2iKIu2gEpueoHkr3UzexxPxNQnJR/Qeqs3YM9TLBjZVKgXTibQLxjJLykhZq60guR05062JSGtItaGIqZXTQ7dBBclP4/fDOfjLBfQNBz3fydNXiarZISVudisQCKLRGvZgFTMFpfNqhz4OTG0ywtvMO2Bs4ZuPiZOZJhsI8dKzWvsU5U7L0K2zj6muuUd/ziuH9nmmbLDagxIB3QvcSlJRcUlksB3D1WvBQrvwS6cayXofg+V8NGQZBeuIqMMw0/nQmpaCSiM2+P6zW7kG62EztEsTcntPTmH99Ow1mIUbkRlzGed8zhMBrf5CnJSgijq0ISQ+IEFk0vF/8KRmNJSvuXCTiDaPE0iNtuSFvc707k6okeNxVUrB0UuvQJIkzOyFir6SuStRRGONIj9EYixfd2s5MV1iLmFdiM3FprdkZrgLiNG45pbhE9td3iH7N33pyormW9LD8aDw/gXXpxzpw/mR4lc2OICtLQhMkyvfEjOlaKaQ9EhAKUK4KDn54418SAfyVF3uTMGgyrpB1474R8QuvFpjy1Doc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pmEZqzss0eK5m+byYdJAMo7U14yqo2sq6ysU9dwgieVYG6MgdQgAK/+dihUF2qTPgUIM9U9TglHqKaYe8jUwT3bmT176bzLRBoKQkd3iNQxIMmiAw/weuj9u7O+N2U8qSl4Q2uo+Q+XlzWlErexF0mNUDXIxyDuJCnKoEkPgpcovCixI5N7cKY59i11J3qobecuENGL3RGc9u/+EaaweTQshlrjq0oLuMFSKrjKKnGo40K6MlwO+FlknJCwSE2g8ZanPHV6Kh+bb1tB/K1xMTmx3hXoj9CDKGVbhY0vBUtu+AITIWCxzuDz/Vet9sFKS5gSrwyPENwf7p1mNb+Zw+XXng9j4CVFefZoqR/wsaDce/ajgfSKcmfHQmR+dDxDYo8k9BvsBNVjowuP8ZzOQxMgRwZCONVNVBALPHcfRL5c7HvrY3PLa8fcHR1WpVedxSyZolZUsW7RjO/6a1SbrPjcVE6dsMFrBw6XKkqd0Uple2kSfDkq1rIr1509J8aAiw7U0l02Ynr9TQER3nFj1b/KhldDqz5fQ3L5vZgZUHMktu8KmNt0OiJ/lTerevpS5n1FBNenqK7aStFhbkNCA1vaty0haF2sJ3kuiavIpmwCoGT7VqnzU2HZSz5PJ6kR70Lf7KrG9PK77IBmU2+iTjIywfgOEGv7lx81u31eTjJTEcFuAAA4iMwl6yZX9ZdQy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AtUjZ4QYsNe8aGECZQ76QDz068+aQKw/7uCf4xmQP1IMQzvuCGxJns5OkXIPKFF/BjwCX1ubal3iFFyF6RqhmprPk7GiX64RHHDT6EnMOk0Xct/l0F1m40OgX+VCLpwtfRUMSLl7xaTxFqJYeg+2TMqoekXJMjmkTaD8LLtgGMHOcX2Yk/OltvdCG2H1Pa71IWC+WLPfW5FLC3xWNum8JifKXtvziAeSDwKJPsOhhpdllvSztcjDhPRP+P4JUiccgZmyoZsRK2vRlOPFRM5aatNqhQOxJO0j3cDabx2wQ3L5sHVX/RApPbBliZ1AwmGzaPMTgedXmt8QuQq4jlxcfpaUF1zdwXSQqNIP9OgeFfixKVcdgrk8JcHtg2E6o4mZcWwU+H3WPEMFU/6V9x1PcpAHJlMcC5Ytn78jAEU8pWx96ped+EuD/2EaUkkQcHgWcNyiSuiZqNHAvpPBG8R1f0+vIiOtBb4T4pG/jU5Z0UkdVB91Ecsf4fDuGmST9S6ThkXp/NG2DsvaefIn5U+8g4xwfcKTvWD4xh46WZWYbET07sEP0V1A315YGJg+z5uH5N5BmFnscircqdIXDzADLHZhPMlZwR+Jf68xN4dFBfPRpM4E0qv3X6I9bfYLusFv3CfXTi1k85ybtJXNCWjaKpknnNyqzDDRdnjGBskC4YwjjNSDHYiGqH8j6vQN+5zOugKuAcMXnrX/bcWvi0tlnUkQBxGS6F2ZqPA4h6V7B5bV0XIZ6NhjVFAWE1HDNGdxc7QSpMDl0MmvfRElDjyfdzXDj3/ZPrth2xeDviHTnFsWBMrjGmlr7AXnWVdvzM87aU6B91w5BLs2Qy8FeSQ7/NYuuLqhRseIj4kIc84Bbn4Wid5wkkhljx2Nwxzzy9e55Wbo4DlIrmylREi1NE2sfX4poU9Q0PE78QfT/PrsuBd5knK6P+Wmf+LxNclXWJSrxyQ+PGX3Ede1IxSwd7RAn6bfTNs4EptQ84QfyEzDsNIv21DLEkhoGFuVCuxopYZSzaD8AUawGIAW2LSE7CsE9tZgOXULL5wkjla59iv0/ve1SLy/9nO2WBCjpl6jVTpzr7Ki43w/0epzlquArq+HzKjg9EXj/cTgwMThPAs1bcHgHpcw9FjTRF0Bja+qOnlSboMUJDoEr/MlbJ3hE3S6CUPvGvBhSYGyE7sQ6gNlimc5glQ7FwfHtaCqMbD2kPonZORfHhuzXddSOquTFNN1HQZKflG4m6ZgtSR+wmmsRFpbllWF5PtlZhwLm6W/f0SvbmHIyGZdKv+vTB9PNDBGeNW1EgeKIqXUCP+IBKuUzJC9hrRKDxcsZq7D20aCgSkK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1461d25-3f9a-4d50-f719-08dab277a111 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:50.2035 (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 15/22] 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: ugmdfiaPwdOM 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..f3f1387d59 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 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->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->scantable, ff_zigzag_direct, + a->idsp.idct_permutation); avctx->pix_fmt = AV_PIX_FMT_YUVJ420P; avctx->color_range = AVCOL_RANGE_JPEG;