From patchwork Thu Oct 20 08:45:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38853 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp46255pzb; Thu, 20 Oct 2022 01:48:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5IaE0TFDiG2rTwRRq81GXD9EiuK4KuFTKzRX3r+Q78fWuG7Cg+FQwvQVjTGaqecCyQmtIp X-Received: by 2002:aa7:d357:0:b0:45b:dab5:9789 with SMTP id m23-20020aa7d357000000b0045bdab59789mr11501665edr.222.1666255700512; Thu, 20 Oct 2022 01:48:20 -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 y6-20020a50e606000000b004573c1ae3fasi14297609edm.285.2022.10.20.01.48.20; Thu, 20 Oct 2022 01:48:20 -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=B1Su4pnq; 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 6D34F68BEBE; Thu, 20 Oct 2022 11:47:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2070.outbound.protection.outlook.com [40.92.91.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F353B68BEA2 for ; Thu, 20 Oct 2022 11:47:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jL/ZsSYS+LNg0o5Jeg9bUbsOKrv5LwgXSINTEDyr42SIIA1FjXudv9lD0OOET21Joe8ZW7kNQHotsgYrOTgzJ4xaQ8jJeqAztlyS3XUP9LresbjQxiNabCMqrVMs+Q2Q2n5mmLjXAoW9aQI2lGI0N5oNFxAWy72vynjSd/jyYVQC5L23UWuKqKVWZ53vtfY3NoW9vcrRkViW7zLei0pNXyEvXYZ7u0S7+0OkhAnrnxtwLjF5inSAaWbDr+UZblcZ4h2fCcouiBbo0rLKO5OzwncmFcwQswaVWTYUv3fUbrXHx8ivQntX2j9+LaArz5Ew8w6DjOoPRAKmaklPBsrRUA== 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=LBRnfgjb2VIGiKPLcjMXcWPShU6GTDU2KppIb+htypU=; b=QdkPW4jwfttHYNmnMXnNiCLKuHq+HimvSSDU/lDG8j7s9RrbiVWYFY2R5vUTaJIBKFSWl4j2EoKuB0VChR2K+zl+7cOvfgSAwcKJg706UPFm4kxEiWIS1jVit77REJaSZxuTid+kMqX5g16Epa+cocV0h3r2EpbkZV32mP1fYiGVqHcHYsKPXTO0xQx8DRgpUb85vlTS88eQjRcuweb+EhyoHlApCcvH8K8njKiNry5B4QyNpZJHTm5jTPmtwOycnlSr8IGmHExim6UdjeRmcTWAbfTfDZEFt7AvqyThCzT9u6ukSksFSjMi39WKBg23lcazYVBCFG4XHYaKOkmh+g== 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=LBRnfgjb2VIGiKPLcjMXcWPShU6GTDU2KppIb+htypU=; b=B1Su4pnqt0Wm9dhVC7RMKHb86ToRzyfEfB8U+QHF/tlbCy+IpBAzWNSv5Y0qBDUPsIzXE6c0JMgqSv5pP+CJmL3e1vMkaOP0iMlRBjqxfO4OpyUnqBpEdoy4Ye2d/745h+rlFevgmjh3aQmLhoZbDQGbBxuyvDtaLFsgbeeYtHOiemY/QPnTEECp/Oqx6HNkmnXnW0mDbo44y6I5OO4/nIfi3ZtAS3ZkqeFBrQNsoVhQXRTKS3S15SmgfX9Ycq7fVUFSYj3Fl7Rdjb5WJMMxEufgazVQo/2mUBuc7GTgM2Unhmlv1gZfx8mv+WcDL3AjyGm0KbKYr1FK8m1RWpUTKQ== 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:47:07 +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:47:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [sqcf3xK8UDQFWqXeN8DtEw/10lnNW1VaJBxkW9S7mj0=] 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-18-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: dbc26880-9f18-4a7d-1d7c-08dab277ab3a X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqqpqVHbY8r+ej275oS7ZbBXkpbG90q71hrVuVhHNAIodpVBj89iDya3VyE5YkSRrfS2tvpSQGF4uhs+ZDkhJd18LFI05rA0qkmlroxofoFpPxd60y+dq35w0Hjyp9BiBoWD95Li2pXj7nzC0NuZWofQlOieMU/ggKu+Yg6BXSHG5/LI3PosjomGJKAKh9K4wUP5HxQEAw+R5deDD1LCL2t++FYSInNsXUTF2n9KYcxp+rr/PXlWj3MK9wwMOlKEIW3vQfWgdQmn5JX3qgPgJudUCrB+GteJ/I2TRn5xhkrF0GnnbFqVawhd1qCZfgGi5GSi3CyQGCz/uoNQ3Ny5K1Y9hZw0tfuQjbSqgdY5YTyEAW1e2USFC38ZpSsg5JsqBhR5am94B0ur1Lyk86YYYX07afdeKSi9DtwD7Tov8/38+3MXLfkynoXzmtxDFP5uM9CHJl2717o39mWXV248JdT3GBSxHRkM1g/yuwhedEadZyEpPya4+pSlDY7pyhAxN04Qgo+0R6B7qPCZSIKnxyNkfOEQOsSaYo0SG6zyakxXZhooo3FQ+uFU2o7GaqNcfXlluWtJg3RYsh0pBo3UeEeGAO3VXsCAd1kAw2UyLyPinMSfEeRp6pamBQ0r2tTzRgCB052RvLc/iYNCZCBCnU254mUBULuvk3mj7WbTD7DZMYDM7adoR+Vmn7oOst/gYJCBA/dJLGTDZAzR/7C5XffA/rfeRFTlc8SnQy7yFAwwLPHo+XDcMGcvTuZZXczgSw= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1g9pLmUnXReOQamuD7fiyFzarBlYq6UjLZP7w5LXyFKbRsP1EesXlKDIdV4IKiReuoLlorsNbDTSoi0FbzIJuTrjwACb/0kltndhSeZx0IZMissGwID9z1bDbgcazwaE45wXfwWqH0PNAJwsu65mUXStlj95Pwp1K3LBMPJ3rm1gaTRJdqaGk3QcqclhLxM4Jnw+1ka+uI9u6NYWr2N3ockTB6MDcvPx7DlpWvWUU4A8Teec0pLp05Yh6A02HqG82zkujOfKL2/5TDHo7XdsysjDlBPah5b/SvT9E770C/Tb4nxuHNwpNpvWbCd5pKZUbk4lSvZwYSOcW2a68lXFNNOf54r2yahkVnPAkOwtgM+oL+YGlx7gmhJouldHp9U+KnncuV7knwsf3f6LjjDpL0FPd4/Z6QrtqDdbFZZNXqryhL5uhwlrXQURImpekBmt3F1dGhXY29m4s0wKZa/9DTOJr5/cYAehZdfyRb+gz0PS0dMe3cUg2+HEnur2+bIuxaZvqMLOcXOJNLu8AAZurPAIHQiTXUFpGFloul1B2cmcQeeNZdj4lfhMtY2DzNNxrowiKccM6ScG1Udi4UdIgrhXI/kLhSQGPdAbq7OVHlTH1Z2pEywC4RF+xOX7u1eqhT9h1CD2cDcK7AUvzQK6iSSUm+V95dFV/mAfw1jqHsYbFF8+Tuq7VO7hN+E4x/Ms X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TOWogyk6KKhoB90+5LqUmmwEdrfusQ1ekmA52b+z40YyncWVYYU1/fjU9nIyNhrRvgA7GDoFeYdvwHGMSwXhpSAR2YbO8ak7LO1nIsVBkoaC4WlpASz6BHUe7gx71uRLT9wmCvM8/4hzfaWua6lK/zx4jPAu8t6E74KFxBwuHERAB5Q+p/7edaJ9wvIKkosrWNz8lQw7LSnIPq1bepIs8fH4RZgCyM+Z/pWnCKL81UXz7gHXu7Y6Y2CbzyFDzPuG+OAq70ptpGUEaWT9iPMIq2Ik04eFq/kyhYSFh+hY4j2CSVPyCM47tdxg7OeAjK+WNlIC7820D9qHfZYyiVPSgdRcDhvIi4KpFVVsBW/d4nksCHd8KVQs6SiBGwaLmfw/HWWuq3IijgJyNdKkyf6jC48d5++1ZCEAfn9NLhgQP8lLtyWICJRQ6GtAMAsgUOUQ5fPkuxo5iehJ2pRJPTF8vM+CfbcMK6ItToUz6iR+6QTJ/5jbLuuNjDbDT0BfA82UrBKvLV71taNcnFKiuGApT/wqJf2QQG744eRFChQG6J6oVjWHPx1T/Gb7Bcg5GQdR4YiFvc2xYE/rwlk0TCpiQeDWRv93c8b1gDL7PAKKDhaHzXdkroPrJaAfzTYyBfJKB/w1b4yrFx0h+bSjlaucYWXI8UP+pxvBjVK2vLa3awNjVLkkJceUf34gI37FIHsgLKcY2y0cNP7h8Gh5yIJw+tq00Bb+jI8FOoANQf6a/njtYFSgg5RIzanXLU/XTK54Wnj2jxHSb2tJ+TX7/IyF9vTzTehMwjfk1O+s7WUqRblHmLKRANM8xnCknQIOdjDwzCXg+JXMdYNDukU/pCcFrTbBY33d9igZqPof13KaB0BlcwxV99Gexssh0nbah5TnGjyOawHRu3cJlmEtWebziEN6PnkK+Gx7T5dY/qXghN+RNcB0AUrRE/WCkfbZhR69hamVg//Cq7BiJdqZUS9P6Tp593jTfMAYbE5Y5wlE4fb+y0558tZ0AY1lHQAGrRbn4Q2iJi/Dxt/GFM9AjhOz4MAW87qdYHhONRALDme72ujub5kSZMKNO6diNrqi5BvdF4m92yqSXGAYfWpvp4vecrTwYTc070QyKHylKgLY3CJJhoBv3kwE809GRcLlpeL4zK4Q/rciAZEyN/9UVmdsarn7XSduSH8bvpPJs05PnPTwm3l8YlxiNPExJUk/fcV25lLkRZag6WSIBrBpXwj6FeihGTjvutxuF7Cn/MuWncbL/vJA0IvGjMUp5OLqneHduuIEqVSrJwQcb0I1YVSbk5DAFWFAEeKohBP+sGsgCO4= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbc26880-9f18-4a7d-1d7c-08dab277ab3a 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:47:07.1786 (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 19/22] avcodec/speedhq: 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: Jf2uRXNv4sDX Namely ScanTable.permutated. Signed-off-by: Andreas Rheinhardt --- libavcodec/speedhq.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 6dbba02776..c9bb2e8418 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -54,7 +54,7 @@ typedef struct SHQContext { AVCodecContext *avctx; BlockDSPContext bdsp; IDCTDSPContext idsp; - ScanTable intra_scantable; + uint8_t intra_scantable[64]; int quant_matrix[64]; enum { SHQ_SUBSAMPLING_420, SHQ_SUBSAMPLING_422, SHQ_SUBSAMPLING_444 } subsampling; @@ -223,7 +223,7 @@ static inline int decode_alpha_block(const SHQContext *s, GetBitContext *gb, uin static inline int decode_dct_block(const SHQContext *s, GetBitContext *gb, int last_dc[4], int component, uint8_t *dest, int linesize) { const int *quant_matrix = s->quant_matrix; - const uint8_t *scantable = s->intra_scantable.permutated; + const uint8_t *scantable = s->intra_scantable; LOCAL_ALIGNED_32(int16_t, block, [64]); int dc_offset; @@ -667,7 +667,8 @@ static av_cold int speedhq_decode_init(AVCodecContext *avctx) ff_blockdsp_init(&s->bdsp); ff_idctdsp_init(&s->idsp, avctx); - ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_zigzag_direct); + ff_permute_scantable(s->intra_scantable, ff_zigzag_direct, + s->idsp.idct_permutation); switch (avctx->codec_tag) { case MKTAG('S', 'H', 'Q', '0'):