From patchwork Fri Oct 21 20:12:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38882 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp956102pzb; Fri, 21 Oct 2022 13:13:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6M77Ch3oqzK1qZEpGI9mBxueUszftb4zxyc2L+QPL6Uzy3/WNK3zDrImskWvvZED0WIWe5 X-Received: by 2002:a17:907:2bf8:b0:79d:e8e6:d575 with SMTP id gv56-20020a1709072bf800b0079de8e6d575mr2401390ejc.237.1666383213673; Fri, 21 Oct 2022 13:13:33 -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 q19-20020a056402519300b00450e1ffe3edsi22307529edd.382.2022.10.21.13.13.33; Fri, 21 Oct 2022 13:13:33 -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="GOi5/rfd"; 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 CC7FD68BEF9; Fri, 21 Oct 2022 23:13:30 +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 ECAF168BEE1 for ; Fri, 21 Oct 2022 23:13:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EZAr2jhXJJ6r1yfWt/YoylgNGrnX3+MKSBcbUW9u1Wk8kGyREns68is0PoWQu4UFPFe6ljxgdoTBJveJv3BMcBu7n34vzzKVm/y+8JT6qH4a/dyLQZ5w9/xyllPYXFYH+GNjNGmgKjo87/plpEdYiiTMB9K2EOnRDkQNBxJMD63EBvXh5I/BDuXWzhJMv7FBccO7jzYVev9EV/WW7Gr4CifUyhLHj9Udj2txv4VoCMpO8woguj4etHs6XrSh4jgNv7+lExoPFifh6aQLlGSxAM2GuQgzv5BS+lD0ls0T3s4g0h+z3gtgu6tymBAR0VHbY3MBH4wTHYq7CNmasH+6pw== 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=2ptdIwTfwh2v2TS+ekTz9QIMcCvKt9avDHXGxDJPrRA=; b=PkJlF8ggcZInEHSTuE+sX7KCOW0QxncLUtmO98hV3+PyOIzZBMRUrJh77amxdqVT76V6UpZSBA4bABSZj5qmFLpxjK5xUY+JiFOqjn+irQ0a9Z+PkwC9YmDAnOY9oKj+zr1VwAoGGkY0O1nTNV7Xj5NvLLuxHXeReXrQN+1nSlqPUlV4iNlW/VCw8YmTaOucrE+iynx8qLo65FZogHT41/Cdc5EHhWQYCtzriguAE1deY3mW7DCe3U+ONVPEIayHXhdk2rZCP/mXQoK4iFU5qzQbzz4Rtksy+8a0Di0H9TDel7Y7+rxQHbFkEoNRjg+EIGZlm+VZwzs1SeZoDLiPrg== 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=2ptdIwTfwh2v2TS+ekTz9QIMcCvKt9avDHXGxDJPrRA=; b=GOi5/rfdAfbLSQLQDoWuhNdRBygTgGFLJXVc3LzqsAxH/UAxEwQILlbRdBPn/jiDApL7R3pqTmzkUzEp9mzTQOQPfYL7aFT0XbR7DTpLeygrBTErmf7fHGB+wJib56YOpFU5laUgzrecZIw40RWQ+/55Vvj7Duj2nLDp7umHNRmjGkzyKbJklO6vTgIKwGlIftbSmIDDLYeL3ev39IJKpaAOSW9le6pN+YIJ92GBH5RGpm2hEl6sAnTYO35QhbGW0xHry+zmKk/QiL1+82MXq2Me8xFXOq6cb4+7Xqlgjlm2IqB8l/J9OifsUQaKcSZgAq+syBtdByEGTyTC9gQeJg== 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:22 +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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 22:12:40 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [/ozi3bqSqzHRv9nqVBp+rjqfWdJLe0g6AOWlyzWYA2I=] 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-3-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: c5bc60f6-042e-43fc-61ab-08dab3a0b3f4 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nnHDnbJ910YUAai4EXr732TC01HJGeHn4kntSfnFNZlfhNFEc6Y5hr3VCepj3r+irxIjoahkJVETsy8D4TMwLONGR3+0QY+8w+jsKC6hCKf2LvFah4XjgSQmz9iLoFHXDb+s0bhwXggwuBa4UxbHG35L624i2DO3XfF+e5pi6Ql4beN+Y8SFXWXbOVnTiEf88IRGMpeJz4l87fbbVc+8bYvjIbRfj1A/KUSignxSBNWQLMftx8tCS//roG1m5ifjuR9wuOJWcoS+wt62OBq+7yryh73j0qGVtIXv4BCMMNWYUrGLZ48vXprhTgyhNNcisZ+5JOtL911xxIVytelVNavcklrGq0Im+LRaxb1Dto+jzr2sblKtYuTRLiB1EjC4NH5CdYmJIXCPAPOl7xNQ/aYc4B7nAPb/nzUE3pqIbBownahISE3Uwy6mRVxxfEVhHLYOkl18SJ24VvGGVhPWJi1wJoxtvrSKef0VGbsFyyCoZXh0MwUdyjW5Gtkl7hYwqgLYluAvh63xXoYW3LZPdFYWlOVjbyO16WGshBd5dOJxtyjQm6s18jdeYHyZmwHHubG+dTIvkNdTBRdGQVGSZv+cwYyk7jhwXDFQORu0nZK3ALwJSOFp0ASW83/4ilO8iedT5e7h3b5/y2vAMVIX5CFWifl0L7ua21Un0aVdauaDyRaR7IQlo5M8P/khE7jimfdtTF87JPGfFppW/jzwDicsfZDl/k6kCrKDa6BzXEi7E7Nj0jLGPAzELzdFl3ar/fKEFNq8nl3yVMYOUnZWa/ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nYZGTAFljQmzou386x6WvwHlGiDGAHvoa/mPB5Fj5XmBxdFtqNelhd5Bjby0ETsbbflNGG435cD8LCBgSKMEp2rEMmiFD5wN8BxxtNb04XXEd/XQ1C9KMdssIqYTo3uPmqrdfSkX+g+SgoyqZOngB8TR7t4neLBk1i9cZ0KxIDqfkUwbhBI6LruhXTnOPCIwKDZ9jHxBEv6o/XtxUDZVcYWuHaLt/8xmatjZd8nCGWdJ2nKVwKAjVlS/Ku0WU+SJpKv4pwgFuzR+XEVbDkD31GrTuvksAJf0Pj99YB9Niih/4ek5Lv85X51ekWL+aTV6ogSZizLg2VvuVB3/LCcciiryBiFyIJCFe7gZdzqjrv9+f3iORGTN+iJHqp3UHvhNewkxwSxNnylLA5CWE8uwRrG6hySfi5jztBhPNqIQsCdY6ONUPoNuCzIj3CyLhmiJGrmD5uK03WNp1Hl2p5583+sKdmAIFHJmvmIJnip7Xji6804zi07o3Y8DTbbkXDplzzDl5C0cmKHL8jHSe1cgUSsVmfQ86y7r8TWR1oL9ioFTi4fFEuM6OfKOKyHP/ZiyIsSqp7mSEN91KUffPvLzXcMPOoHcKWdIsIAV+Y1eOhqMoeTB27FH44WG47iIgghsF+OJMize6DOfJ5cd1ZHsYMci07cXTB6OcBlRscejLIm57crjmRnm+8wh6qLYetok X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wnNvmQ4ayh4DlmCWDmhJxXh9eXmoFUGxLwyMZovk7HLV0MDN8p/7t9XFVQYO1A+u/qdtjccFRaAYYcgROB/ENgFwhG85SMhs5hhoHR6G+4P07o2PR57dilrUYz3vx/z5K1mt3sMJKZbUbBmht1cyCE2QeGHCgYNBivZRnBihKA1ecRdKlrwfayYAui/vYe9jBkEx21oEuhCVrIzv7Ba3tQpAeHxORJ3VcLX+qY91upcwc87AUYEmHz5fX+2lXASLGcacGaG9mfourM/741TsXEU1milWWxdx23y/rms5VDQrvdx4jCf/FJtu6j+mYNZjIVMuevvI19IAZnPQn3av+Gn3lv7UsavnAZWBFWUOX/aBdxDFc+0MbRIKQUuo44xsToZlbVL9p0Go4VQojHEY1QV4f0a3jOiy90V8frYbZOpAmyvb1cSylLhiVI3LUurd4kyhDYAXpdw4eTa8GopCjH/Bc+watOurRsH1KDFm609KTwkOq59Vy6TwxjMJDWHbAr2HCUXdAIlnM9MHhGJF/bJn9QImrXYf78qjO45BjlM0J2ppvRe0XFCjW3JRJppbp3cIdaH/EZoQYeRiagauaTHoFBvPvUT1ms1BpS9qIeULQRAYEEupZ7FIer0bRB3qp3GhXC+ifMTOHI9/0ffzvITeOZ5j/va/f5vXCt5/GDZAmflaQeI0Wo75TjYZwqRIpLW/5/rqJAMS1YsO/peHceHjjsDIyiHvIvtWmbSfememVN9QuXylf3bHeJtECy+wRsdl/BrargD2Iurd1LNz8PxUw6vUiqUy6ZcKw7f0gEbRQGQX2jnsa1H35sZ5Xu6QwZLTu5piDQJCkIAFTIiB5s9yXilApDbaCnL2b3T9EvG7J0DfZgy08fbstvKqSkYy1Fsdag0KoP1kuR3Zxa2kHrJ2GIAqVCwF2T6C9+0ihOtjrP5Pyd8ZnhFHQkxq8V3VDQobO16G48EbSX5tuWhhvR63xxuyw1ag5ku7WXfbQYLU9LX4wDqeOONQ89WfPzhCRMuTvMSjyt6eDu14040yqzEEMU7fNo/Pg6n1snG/wMGRR2xTxigKVgmE4e0d0KMeiLI3E0wvc7Dg+OqLxg557HN1KZVV5DMPfj4eqP3p17M5riQ9Q4DJiwCa1LMhOkOwKw00Ti9dUpNXsieA3j/VnAKzTZeErrCV90hXJeGxYiaQI7+noqM+XLwowBnd3rkJ/JSuY8cyWXn/y9cyAhX4QgD392Hvf0GYw2WcnrvGw6GOcj0CIY+AmpKVUn3kdMScjt+nvnFS4qEJRojgo/8QdKJIUuZDE/8UF1EXEjRxO/4+a39PxK8AvIRmYZ4jHrIl X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5bc60f6-042e-43fc-61ab-08dab3a0b3f4 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:22.3341 (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 04/24] avcodec/eatqi: Don't use IDCTDSP-API unnecessarily 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: pipHQuEXyG+u The eatqi decoder uses a custom IDCT and actually does not use the IDCTDSP API at all. Somehow it was nevertheless used to simply apply the identity permutation on ff_zigzag_direct. This commit stops doing so. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavcodec/eatqi.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 84d7be8bfe..baaf61271f 100755 --- a/configure +++ b/configure @@ -2822,7 +2822,7 @@ eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" eamad_decoder_select="aandcttables blockdsp bswapdsp" eatgq_decoder_select="aandcttables" -eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp" +eatqi_decoder_select="aandcttables blockdsp bswapdsp" exr_decoder_deps="zlib" exr_encoder_deps="zlib" ffv1_decoder_select="rangecoder" diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 324e6f1ced..e4f12b3db2 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -36,7 +36,6 @@ #include "get_bits.h" #include "aandcttab.h" #include "eaidct.h" -#include "idctdsp.h" #include "mpeg12data.h" #include "mpeg12dec.h" @@ -45,8 +44,6 @@ typedef struct TqiContext { GetBitContext gb; BlockDSPContext bdsp; BswapDSPContext bsdsp; - IDCTDSPContext idsp; - ScanTable intra_scantable; void *bitstream_buf; unsigned int bitstream_buf_size; @@ -64,9 +61,6 @@ static av_cold int tqi_decode_init(AVCodecContext *avctx) ff_blockdsp_init(&t->bdsp); ff_bswapdsp_init(&t->bsdsp); - ff_idctdsp_init(&t->idsp, avctx); - ff_init_scantable_permutation(t->idsp.idct_permutation, FF_IDCT_PERM_NONE); - ff_init_scantable(t->idsp.idct_permutation, &t->intra_scantable, ff_zigzag_direct); avctx->framerate = (AVRational){ 15, 1 }; avctx->pix_fmt = AV_PIX_FMT_YUV420P; @@ -82,7 +76,7 @@ static int tqi_decode_mb(TqiContext *t, int16_t (*block)[64]) for (n = 0; n < 6; n++) { int ret = ff_mpeg1_decode_block_intra(&t->gb, t->intra_matrix, - t->intra_scantable.permutated, + ff_zigzag_direct, t->last_dc, block[n], n, 1); if (ret < 0) { av_log(t->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n",