From patchwork Thu Oct 20 08:45:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38838 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp45411pzb; Thu, 20 Oct 2022 01:46:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5eVTHprzO3lnIWSWWHIKbdgZ8EuGxLHy9b8Idwfzz9KABrqNciEy4m2MzsER9Co7Ui/8wi X-Received: by 2002:a17:907:2e01:b0:78d:f24b:7330 with SMTP id ig1-20020a1709072e0100b0078df24b7330mr9922044ejc.604.1666255570308; Thu, 20 Oct 2022 01:46:10 -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 dz20-20020a0564021d5400b0043dc00e0740si18059300edb.373.2022.10.20.01.46.09; Thu, 20 Oct 2022 01:46:10 -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=RrRysQKM; 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 1710868BE2B; Thu, 20 Oct 2022 11:46:07 +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-db8eur05olkn2028.outbound.protection.outlook.com [40.92.89.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0827968BE2A for ; Thu, 20 Oct 2022 11:46:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fYXlhd57IeGQBshuBlI3qZhrWtxZR5j6GSWrTqxN0g0DrFYF0CkKlV3caGNOUxeksPtHMPy/mzCWWGatEh/JV+Jd8xsOCBEMLhRNXn5WcM4aPxgffUjknf4+VHj4JzRJYCFm6SHWEVXVXekOCU8ML1AdpS5fzEL/1UPCX/Ioe4qkoctuPDwdS1YRzqge90luHD7mN9YKg9iKHaZKo4JitdeKGDRKpGBmSwOg0nn9bNhSEyYSjgvnSjT+wBakKNkmbmjMY/R/rhq1XPKRo2NQahWu57sRA0GKjY8Utk+3slA75jHaZ/rECFcGWvWCwSfAm8+JgkEOu5ByfYbBJbQBfQ== 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=eW8uf6VUdYEMhCpC5sfLMFKsIh0N7Q5uvMzMaHX6CzkRhud9mvP23jAUvuPIVQGg+HNj0BnmxLVRAxElyXu2cj9k6x4zEf4E9/ZthTn1VlddhfVAyWZCFWZbjaA5Bai/8VzTKW/3mtUNVBszV9DxRtf27O9cL6DZglPGJNY43ewMNPS95LPS+WMsZ3aIWbAQXTzQSk6yjoZ2D36DQnXkezSgptioT8cglIiAi3z92RQP8Vu5ql79U+tnS2EG0jqi7C/JIWPiO97eVcPsOC9bC61BoV8/xjzvQJ7UuQvxZdy0cj7m7iDhOYsnkOK+O0szgUJiMLiE1txc0EejZx+O1w== 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=RrRysQKMGLRLec39tptbJchXvUtFq7ggN7v9FC747Y55yANuUjvf6HJqZDDkteNHFDXqhAZUaFH79qx3Xv/i2BlbQ9pNNAY0dm9HY0sANTpGPp5aPQR1zX9edH5VNmDeRztfDlHXJNsNZRx10XP+7Y/VaNc6i59tjwg3CU4pjGk7OudA2hub/MC/z/HukWsU37Sjtu2pPBChdcHXyM5GAvgzHhg80X4m+Ej61oAm+gztfBCn9XRMKqCydiZhux3/rNyojkMidMwSKH5cd+s3tlAmOalouyC74hl/7B0IrIcF8EugG0wY1s5k1Zv0UEgu2li/kBrugQ6jl/E3oUHJrg== 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:45:58 +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:45:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [sgB5dlOZHjiXkKpE+RBvBiimv2tSZll8Qog3RSgAve4=] 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-3-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: 6a0a8c03-b060-41e9-6ab4-08dab27781df X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kEq9VXjGDAyurdVkDmkI7qSY4DrOWVzAF5MuM+TGyc2zpL6r3y8psnrCx3wzlxP1hdSJ7HpArUtB2aoDueVkTLVaqRPyAtIeFEXQSAVphAGF0kB1LgvT/B+fJGnf8OspHt14h2+lhiUWMsn3Qu3178JCOlRmBzGrFGJJmDafx8oN2YOfKJtO9t1SU+Yq1Z+iLQMmSQ1k77v+7AbOYbnoMu/C4hDQuHeSiLFlPMaAVr/+cq4W2gYt0jT/cFLnRmrQqpKc7TSA0S6yLHFH3ObBi6LBx8Tv9yJc1aEJD/Ar/8XXp3BHHEZubJcCvzuR/wEUjZQemONl2sqH9FPkQsshtEYdbaNTjQy5TanGE0u8+EtogC0mBQX/8hi7NHLlylvebsWLUF+LXZZRzqE9JMrV4scRWT5+wvneRESHmMR952jRuz9YaJe9liJhRif+DUnWwgQB7/H65zrflAO5Qcyk2UFWLvL68OdEdAui0jfhgg3/wtsSsazxG6BAjfYShPyvAigC4BcpUFF0yva3DtzkyyTOHvnMdftcciIU2hEZxnql1g50yiGMUjcxuJ9N7ENOdYOqYJuQTDr3lXrpFnRL8eGJ2232nixUaA6kJnlCIVzYjs6DWrfwr4nFu8ZFU4J4cnZ43Rv4xIqrJRuj32dBDx9c8JdRN3AScbxAXUxQ19k15PZ4euHdQjj72q89OJBHHnQt/4zFrPOZdmc/Fts9WKeR7dRds5jIe4ogROptQ4Kh9agMDlKSlpy1rZOe/D+GkOVVnKF+ua1ufrRrtGa9yv X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DdKhA+clG9/VVsOEEW753jZEc1BuxoCAgitL4T8INil8c8NPEi5u+qNJx/VnL8ulBjTLjf5ROgwm6tf+rWU70ITL44w3Nd6YqmOiED8beT+mpleSVe4uUkus/4LfhIwP1B3S8CQqOFtlQyhbl2rJUTbU9va90TgMyg4I5ZjVLYe2JaXJVTMxW4g83UUqC3jff2NEoHJF+bI/DZ6yNXWMwtYj9Frqz0fUrkxn2Ejdcjf9LpheDbc6cqfKWavuf49Pf+WdyeKBqw/ZH6MdEh+oLbbMn3WWWOPRGwitE6YI+4ACyY+Hb8CzGaqEBadLZXl8rDWF8tVzwhHkFJ4YmOU/as1jRCYLhG+8JooN9clTxAbvFLgdNgCXTma6vxZuslFcNFyjBDts4WELvJ0zN6ioTXgXrPDHcCPIy/yfc7hAd4jVcfUT1eQNll+We1abbASk42sR6o4TQAtlt8Y6m8Z3Ya/6S7dow6pF+GvSsHN9F29uruz/39NKAUiH3lfYCyiapD+0FV1qdnZ/c7eLH2ZL0L/OzQjSJRvrSwyEY9f48tBHitTOB2bY8aZQa+zf7No/AUx+JL8/JH+jIwCX2f4PFLULLDLLxHl4SMVFZlMSaY/bFhEbAfrkwLB4R60UXsNi/5tUQF95luzem3WAAYajr2ytFOPZb4JNLGybyabCDbDUglxl3nZ93JaVyRcgxlm+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OAuYbtkKx+aac2yCUFzzJDcQGK98Lx57EqPF0TeEQYY8vDgZbTCvuRkYILDJzKwrytTqxVqQlJWn7UhklQl1Wu8aAKohIvGyVkquVRaQIEb6R8jzxrEBNMHhCTPPTlyTZnGm3u0UCH6XJWSfX9N2wBxrsBOh6syNAqXBJIBdQwNaDbk9yC0qroG7dL0P3cc6zZ5E/MHB42j09huG5aEkidIeH9PQyWie6jcnBU7KAdysUhDx+jCMBMn39Fapy2WGd0/FG2oY3veaDucBCwBjwFvCOE09diug26AKCL6ryfAx5qLTx2yOTNP5UOd/XjdZUzyt+OIve1x4A2C8qPlp6yMK1asEQSBKHnuWE7OOGxgeXV/QoT2jfZUVpjR4RfQNKxpsGa0Fy4HbDwae24gu3D6lv3CpAT43sPW554z3boF6g0wwGJpm7JXAsnlWja4qRnn3EomQwnnLkE45NV39BZLjNElRM9GSuIQ9eL9IOzb7hig5sn7UpX7NXWEJd0XoDBxrkCuPokZAX1E28PSh5ONPt9JNxJ2Fs6ZoqOH0Qway+Ufx725udRGXKq9jEWQTBuqqE0gAbUyfeAPDL2MjlHv2B5n0Paj8/TMYO1eN2prpEYpFIrqSNWT0FfhlWWptGWiDrKLeHCVl02i4gQk+z5rligOLpkKEn1YEJVuzUeAVbOIM5+Qt1g8G6DwJS9GxqMuWPwi9enSLtH3MyZ9QrCStvUcoMa4nNn2Z2gWHPlY+U1yvGejdnDp1unfSEa0zg53/tsnZnhCpvOwWoOZJXHVW5mfFIW6yRItUPCCyDUCNbnvACd6SWpR7szXdlhGBlH/hTBzJEH0WWNsDGJZQSmumxpkubCuNe6J0lFgnM9ruW6mfpCGpA5JjQRGmPPYCRWNUKGH/Y0KHdZwIsNo4RLVAWhHDgtidi39HWE/Ny4x3oMZqCEbqyMJiSJT9SO4/IX09ntDV4FgrBQspuEGsRPEx89FZTDXMsjG8GyKBWZROxFGzy6uGJig2Sa+yt7Q3yqNEbyN2iue29brzpxGhWdzvwqp0sq+1F/hhMNjMS1x2mbCAE3Hf8tgK+1KrH4NzR6z9uzSOfvmgnpxrdJqH3XTqBc853utp7YVDmo2HYiVXw+e6hpcPgNyvGoMQ8r8svMK7+H66D8YSyE1bA3X5vVJr9tFHg+zXpA3m/OrABwZNHFxxXtwXPt3UuMLI+nEPA1QoaVPIOFAjlOsxULlnYhYJQmKcHZu/3NVdpWZCjW6zV0uuRi2yGld/+iMIdAwxWiFgayfO8l88jDsGXIw554xe0cj/VT7IXf8xlc2pbplMB6eKYSuIuWcwA50+/ecy X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a0a8c03-b060-41e9-6ab4-08dab27781df 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:45:57.8132 (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 04/22] 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: iWJgBRS1GKje 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",