From patchwork Thu Oct 20 08:45:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38839 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp45515pzb; Thu, 20 Oct 2022 01:46:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Ly9VZ8OuSFIvPgNMaVo++q7EZKx06NtYKBKBI9kjpyTrGM5Qe67jDOxhReqUiIx2KrHMf X-Received: by 2002:a17:906:7944:b0:73c:838:ac3d with SMTP id l4-20020a170906794400b0073c0838ac3dmr10101796ejo.242.1666255588469; Thu, 20 Oct 2022 01:46:28 -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 v1-20020a056402348100b0045483f0426csi17447702edc.10.2022.10.20.01.46.28; Thu, 20 Oct 2022 01:46:28 -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="P/sVH0jy"; 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 A9D3C68BE48; Thu, 20 Oct 2022 11:46:18 +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-db8eur05olkn2047.outbound.protection.outlook.com [40.92.89.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB02C68BE41 for ; Thu, 20 Oct 2022 11:46:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gLBiUpaWeJmkG5kyJI1BEP+JyRrD0YgcVEMb7nMvYzKuWDi/9GlGAfcxMkReyjcSU2oSf+UtkKgJw9hLzEkPrWPQ+GMmeNMAPOM9Rxe/CMSILFIZpLfGTOLI0GTuQFbmW1pec1mVv4F2tg9zimCoL7XvDy3DQuPAuFGcEIq9fiPLoSlnQPpsqN6CSVKmzf7BfmMfzUegEEdLvt7i1EDx/DJPI7Sti7LvpbRYYnkPBM4wf+H5MPRO97OpWYm+tvio+IPbIa+hUZBxuj4fL0T+Gwxa1LwsWQsJNM0N98vgPRWm9YR9ZTxQogM2QH4LsKbP8I7ltnb6jXBVnyTegWk+gQ== 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=EMz47SV63A45LQMeVnNXBwHyGUsJSSUDwy7Hh3s4wKA=; b=hMHHgb2zsCJeBy7t6UDRxzvhWvvxnGgEpFVr1t5YOogwEr5x9h8a2n6npcmoxK9iqbcfHZXfXtZSskgdYeFA0VyaPMRCKJFw48Ly2+LXTwyF/wD9vIQ7tjCjSUyf0bPrxoiSarf5R/YHfg77O+ZRrTSzSjA4VR0CKqrdD1Lpmqd6yUnuV7bkh6i6b1cQ5BnHHPb7GeDL0rEov3RocQZptCckgcDbiVKY1T85GhFlcZuGY/tc++l+050RsZ4NGOa+UXyufRZV038EGEIuSroFwUxtriZoAzhbZzIJinrloHY6/KjBtcUPwHEU9J7g8ETrx9CwnR4EmJJT42cCZ2lOQQ== 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=EMz47SV63A45LQMeVnNXBwHyGUsJSSUDwy7Hh3s4wKA=; b=P/sVH0jyf8J5krGY90NfUhhwvIzf0oLkvBd0Z//s6QGbdhZD47nqD+nTcIma+WSqDo1s+DRp1V8UmkZJIIULY1tYJZz1Ih0q+oBQ8ND/RUpE5eRACctGCz0eii62vv+1fMrBeHfsC+Phb6a7wknKK43oncFo8rCtP9RD5F8Yhxfl0ZblCkF2bYzt6CpDKlUeZlajHmB/QkQnB8+kT39/Kax54wadghgUI1LbIAlfzc5rkceb3uxBcOONqLgZn5zJX1x6iFxDMh0cY7/CENwv/9lwmdNlK0zy8hZCHclSrI+qk/8hyPC/ES9Y1z53gu6Ka2/RXWXtFYP+Hnh0cK/PJw== 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:10 +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:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [iycB60yD9UY1QBRQuMIsr/cEg7NgQDYj2ht13QEAWd0=] 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-5-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: 560821f8-962d-41c1-a7f2-08dab2778966 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kEq9VXjGDAyurdVkDmkI7qyhyVlMClwSvXwgbqgkgnNEKUGBEmY3VoraywaZPSh8T4YzZWe+G3/1zXtkPti9G3S+mXUEfFtoXC9m14sHGI72NxQ4gYaeD9OMz3TbfJFb45YTcxRdraBK05n03ttnqcHacj4uzwgKdj54Jz/wKB5/xWk6kOgnCYDfaUpq0+ohzdjGlTfEa2nM8oZVIJ0rKm8HK8tRiZylKFZj9qoUxK+gLtOar3CYsOnqZvMyqnqtDDL9rXxyzE/uHjU1GS9bz2rMQTTlZXEsjbzbtAqsKJWJSKVFBi61iy9t4y8+99WFPAgZgRZVK5ieRTF6afQXySB2MVYCpOvJWHh6O2hMlvSA4/qqld9eYkob5CMgsrMORHcyjQT+QZqSZZUqN9Vbxlig4kGcPdwa9H3/xZyIUX8YY4psppcfEgDcYmS6K9soLXOOlkylfBHeG2lRK+zix7DyYeul5Ya35HVxMyrQNaJ+E91smWAzwXTih+Qk6KhGRyvn77W9KrwIE5Kab0gbvXdn1k4hf/JghL9zCD48poPYFM/IlNhP+OiVhhodMWoxbHNjPfjIf9dk0WftPPXWC30GcODhrInylbaYsu/cIUoXOyterbOpxG6Vg1hnFyZBU2pMFg9eG5uOoUVXzWb51p7wh7TV3u4US3DMK6MQWufh9SGiPxjMu4bQ8N8x5lDOKiSUZz+Gi8TsNgk7+PQBsdGlsJdLxP7QsqaSN0Ydh7VsUM6GqIFfXEWMPl8zLtOI+IOruqx90asH4B1GiPER/E X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TWqdkgr4Yq+CoMp8T03pHmYNvZOVx7uxuuu1UH/r8Uaaa+McbE6sDudkb5iCBh/2SRmhHD8N5pt6p+r3vL7kanzm6qAWY1kzs7UzJi+yEeg5ih2paH0QKz354v6LciqXfY8P//q46qAXlP9xzLuhtVDRBo+4rwpLnCRfgfRKWX9ByS8pQXYIboQamzt2H9I6bBBWMuQh3jnvAtt7Mfxo1XQhapg79dvRWWeOAhm4IksrJyWoLLsQEiKroJt76UD+13g3snzF9Kntr8W2xHJlgHSnryco/800V1Hr6OeRMMqJT+KwwGlUtvmVR9gBHxz9WB9jducvSpkVQPKjfeJQ+4f/eFwy5/A95INGbds9JMhp8J7ybz3ffhEaG5IE54pq3BqGTBlfw6Y1V/1mxviEKolXyCdbK3+wei9f1wzRBdq6iUVQTEvlOCRzQVpsthyQzxpJ4CqgrF6OdLI7r7vdbmlLnqXBJIbRWoo4Spd94OVBVWPPWhAL9EB6lRe0J+p8KAp1H+ShDnQOE3DQsun3Gh+9nqpF7lQiAUXO7YB1R8SS+fUifg2fVRJ0G4OQtpM+1CyzH9qT5jAYnEPZn1uRQGM8PJ7/t5WQoxUQTp/2i98BG99lFHh5g10aTtncdYdbpMXRGHh2Yqiwsy3wLwoTt0JiJhTbzFoMbuxJVlXBZXGhqWzuv/IxE5e+UIPxWegz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tx/TTjCA1DYL3plPu5KAQj4+wEkIq0SfmQ75R++E6gpf6oCScsTPSX/nwnqLKpdVxuFnLec4eNNMRL291rUpFZ1blCYE8HavmhzPwcUu+H6XS9FxMarJPAA1A+Bp4PCqXpmtgqcNrHV0DeaHuXIq+WcyX3VisE8fEj++3JxQEdFKN+QDTqAKoatoRAc1OtbK7tjJ/hiFjTXaywCFZm7UqabjsBuqHG60SCIC04uVslWeOn6NmInutEFWQaCTgYT8RNESaQJ/e32eGzcxfF6DqGbshwgpqCEJO/kdvOE2ukY21pNBytJdeBcs0PatOithYAfvd0O46hXLj/xKqo4zJjsQwFIKGZGMtAQxclUVyvsOee9oqvqzE37YUSqTL/BnR/kK5xiLA/4MAJ1nh8HuBR52rQa7ZtWvHxxGD0bgslPRmZxOiF5oH0AUQ8UxcOOu9CSlGApL125qmjVKZUwNh3TnpeZ96X0JMBrH3WTbOAK+qAOMkqCteY8v8W4wErQ0zwod1Off78w58sgWklDkD3Nv+X9sxBb80RDxI5uFEDBC8C0JiDN+vRjTGgZCJouYbCCPIN++Mij2KHQH9ozVL23cc6CgQZFJGjdC1RgLw4neWrfN3I98jpKqqKona4lFqt6Tficai+7VA4O0YmL0EdqXdtadzI/+HN3+j13ID9LZt/iilP9r9zxdEBGWUWqKMvJ9WXiHIXSakZ/Mltg2xSsp3nFPYezJvoThQe/65Z7L8AiITc6ZZpbZhodZ3/ESNeDq4Nz60qb67Njd/gtIWBldTnyO81KgOtrYrbKntf8xDO8bFuOeBKg59w2Ksy2KLfS5J5cU78WdbtpVSxMK7XtP1kTmQ5y+Gq1A0mpqh84WYyArpUSGijaRP7Putqetc97WKhbjWNW49M6n7Nw8Jlc7vr9QC92qrpGfUty7Bn7O58L2RhY5Lhc/x/L1LuAEiIWK12CuF3+mStLYE2CWVFPmlKtlOKvPL4Biqd+JftS3/A8FjoQQxMt64/MtkkYCxECC9t3TqEiwpfiKa/22FY0zURNQdSP5f+ccle0NXWhv2Wk01Kr+8/y5tCfZuRCX4Y+SJk2Z5Ywyyx1hLfuX5Kk0onJaCnHnl03qAEiophab7hS30FK8FpObettB+GKMGtWPf5nyojqCKYSJomPIW4LEJk/rs54qLBVsuQrEJ2m8mcWc4tdtE+IDS3aMJH+m+Ra2qIDGhWzXL4yHg79AAEhv0u6fRVi1Zb2XVFjdHEUQy/MszyGg7jx+EataqszkA4ez5+7/dMhLQgUSlghZiwMC6/mg+l/aG+ia/fecGjj78BIvuATTBCELR1nOrgyt X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 560821f8-962d-41c1-a7f2-08dab2778966 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:10.4279 (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 06/22] avcodec/imm4: 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: 6XdL2zDNQMuz Signed-off-by: Andreas Rheinhardt --- libavcodec/imm4.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c index e2aa20813a..f342e6d313 100644 --- a/libavcodec/imm4.c +++ b/libavcodec/imm4.c @@ -51,9 +51,8 @@ typedef struct IMM4Context { unsigned lo; unsigned hi; - ScanTable intra_scantable; - DECLARE_ALIGNED(32, int16_t, block)[6][64]; IDCTDSPContext idsp; + DECLARE_ALIGNED(32, int16_t, block)[6][64]; } IMM4Context; static const uint8_t intra_cb[] = { @@ -129,7 +128,7 @@ static int decode_block(AVCodecContext *avctx, GetBitContext *gb, int block, int factor, int flag, int offset, int flag2) { IMM4Context *s = avctx->priv_data; - const uint8_t *scantable = s->intra_scantable.permutated; + const uint8_t *scantable = s->idsp.idct_permutation; int i, last, len, factor2; for (i = !flag; i < 64; i++) { @@ -172,7 +171,7 @@ static int decode_blocks(AVCodecContext *avctx, GetBitContext *gb, unsigned cbp, int flag, int offset, unsigned flag2) { IMM4Context *s = avctx->priv_data; - const uint8_t *scantable = s->intra_scantable.permutated; + const uint8_t *scantable = s->idsp.idct_permutation; int ret, i; memset(s->block, 0, sizeof(s->block)); @@ -495,14 +494,9 @@ static av_cold int decode_init(AVCodecContext *avctx) { static AVOnce init_static_once = AV_ONCE_INIT; IMM4Context *s = avctx->priv_data; - uint8_t table[64]; - - for (int i = 0; i < 64; i++) - table[i] = i; ff_bswapdsp_init(&s->bdsp); ff_idctdsp_init(&s->idsp, avctx); - ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, table); s->prev_frame = av_frame_alloc(); if (!s->prev_frame)