From patchwork Thu Oct 20 08:45:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38837 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp45349pzb; Thu, 20 Oct 2022 01:45:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4nau7zb5I3b+M5ar0nw7U3tIrlk/QT0GlWfsEOAzqeEDeT3naWnoelatzQZLdpoj6+yU3K X-Received: by 2002:a17:907:918e:b0:78d:b87e:7051 with SMTP id bp14-20020a170907918e00b0078db87e7051mr10196739ejb.227.1666255559406; Thu, 20 Oct 2022 01:45:59 -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 nb21-20020a1709071c9500b0078049ab4bbasi17567418ejc.526.2022.10.20.01.45.58; Thu, 20 Oct 2022 01:45:59 -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=cmVF9wNB; 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 E906B68BD7D; Thu, 20 Oct 2022 11:45:55 +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-oln040092073032.outbound.protection.outlook.com [40.92.73.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7144A68BE13 for ; Thu, 20 Oct 2022 11:45:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MLjRm/7cZLFNGFkHRpb0bQFDrS4Q6hzXcXZJe4fNdYMICz53Hq8Ny/wlp8rYQ4M2FcMWPAl/XKspllzVZbv/RGE4AQFv6CukQGc1fC/neTlFpCWkQR1+A92m5i3BlaaSUWuBugcMeGQlSaYInRN8p3Co3A9yc8Ktsw1TjVHvpNTaukp9QYKyTRTkutKVL30UKpljOMJnEv243C7MfeXwPH+J35PiB7Mrd/k599tIrsZbyMkAToHkqoIqFqNUe1RGsRPom1TbSW1hYuA2ZsnLJ8lnLZWXT6Zg7H5qcf2ajof0nLzu62IXtHXR3clgtm7h47HQOxIiMJ90SljU4HDPZQ== 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=W9rvtmXoGRAygpq+2fCKcfBnl3iV578Kzj4Ne9qswOE=; b=bXU0ShOij8r2DCsrV7WAVch4RdSE+ybKEleIDSNUXIbwad2NXftRMsiGfbpFuyFDH9508NsqKXzfA2Km4tfb5pvPoiFByYZuCgrdlAcutZGuI1Zm6FHVHUunuV/3uK9J902LT7YV4pEf1DQsszwP+m4RcxJ+41RVh2wXbhpwdt3FNv+BLQPxQXUyVxO/6gXN3zCUyZDR2HA98uvwEOjANrUGGHwG993Wt4ANNOKovVbS7i9wpAfNF3FZSIU4jGAaiG7q0brTxSZRknMqVRNmHjrlYoUMtEskOJaJOnHplsxDlxnU/lO5jRV/2uYupAjJwVszydIseTagX2kVvQWlPg== 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=W9rvtmXoGRAygpq+2fCKcfBnl3iV578Kzj4Ne9qswOE=; b=cmVF9wNBMiRwk3KUUd3O/OBjQaFvQ+75lGEVzlcujcCXbjNiBtIMr/pCRJh/BISyARSBabNpVvnkRelj+oKgFFPizWYeE/P8ubgBpZfTLHDD0s9Sl+UXeqUS1dmSE5aQHR1Cup0n1E0zWGHKnuI/AtLAZi59fV3NLiAQQW9wc23NtfKUUpdSs8d1XAD9FanTAGUQ/XcNPlfTXjkDv2xCRM0fNKynjCSG2OcOu3HIVjrTvRN7RCU6i9Vgi47/gGBw8iNwHdHzWg6PGvz4GgTs1WKPU8M7F+pp7DlGJ2T0HHP8FFvLNGE6CM+ZMq78yi0xFMUeMDPv616+ScKsUnt6pw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV1P250MB0810.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:9d::21) 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:47 +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:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7ll3CsDFOJDBQxCvYljkSYFm17av+Kj1jF/MWWiKzgA=] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV1P250MB0810:EE_ X-MS-Office365-Filtering-Correlation-Id: 7bf88fc4-efce-47f6-73f8-08dab2777bd3 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kEq9VXjGDAyurdVkDmkI7qSY4DrOWVzAF5MuM+TGyc2zpL6r3y8psnrCx3wzlxP1hdSJ7HpArUtB2aoDueVkTLVaqRPyAtIeFEXQSAVphAGF0kB1LgvT/B+fJGnf8OspFOuQUBfLpl2iMi5g4Ap9yKC93Og5EoWQYr//j4FHkKstzIoad7Q3AkIQAD+Vtvj8ndXX5xJg0sm+uBB3w8pmbdsa0uZPSSXkl8FI90UuJnXO2ZnUUstqItVUhuR4Usiz75t1Inmx1x+neH7nrX3PgCzWdwjJTQZmhe4/ElA7rdaeOTMguF+FDg6GTNigdnrReyxMQjREYJm3nv0eAXkRfg9XYStODaXTrnsRFAAwwmk7I1o0ZPTlz/XR1BbY+mH226vlvGTS4Rcc2aG7f6bYQzyTBKY5AFTrHYrg2hVOq6VU7Y/0w67NC5Rhddl3v+iRUAQwJ4uE4tniqCu0uo3Z649p0sDqEKYPrMRJ69QctLwP7lWJGyfw9doh6G0XZQasI9lIMTw2zZ7ZV2PMZQegs+tTlrQsE9N05m9UryeQA/U6OFPkkv2hTOBNbwCSYcwUvtbb3i5+aMU5PvEC7o7IVdIivnbeApKFvC1FWMF3uQDMs8xl41wIDcKhsKeX5fRYCLtZrQWrqw2C5AixIv+mQ+4ZOe0k/ci358ANuRY7tBFf4MNKyFDJDNamVXxvJHnkTFisFxzHUXNm99/3krQQRfJUN384PNWnma0BlzngXxdm5xET/k4J8r1tshOu3xAk7KmssoR3qsYIubY7KSRz6b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mRUQirsvARrdZdyvJmpUW0Gz9DDW+QuUIdwA6atOWKCSXdd4xKxoEH+wy//HIwdQiOGxvgJ2hcgrm7wU+GQ2bspHnNIecJzwLhiG2CCmtpijD9CPoyQca2MOkN6nKhC7m94Y/CAs5X5xgbgfItwMDOPKBQ9Og3UCvnAK097K2e6c8SA+eoyxrmcuhXjCI4jAYNkdKoxU/SIAZjDwqbbuZF0v6DVQi6MzjxwspdSlUoUygyWPUTH7RyyIDp3X0d4Yd7MjcmJuAfDZVf5OKIcjJjm12zCf1eutlniCAJ3SWATODn7KynulVEqmhD+HZfcAQHVB3LGLVt5Ru6EmRKVSclbWp6bGVrFOurmAnHFIaKioobboRfzNGp2KFZgs9h9mhQCyrrtd/3jcD9hv2w2nwmv7ClLhywE38QtZBCNm244zUKh6sHNlOLHeMWBSdsx3uyytWGYUkHYN29306Q0Cjv/UJ4jtPaZCY8jkPOwrJEGPb0oAxhO9rTA98BGQsMIkayIJEg9/gJdTEIRyfmdO1xC563KfOeVYs2W5Vh7rOxxJ5hZ75kFiaFYBhJl7APk7BxESFXim6TJw7QJxRKuhz1YNk8NgSWTRo83VeTR/rU282Rd0DkLeC1KKeNC2wTcNlZkNkZwQ30IXinS3YtpoWfJa6HKUOPa5RTFOxEGTWefecXjQp1QPUHkekF2gSOpd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QpTVz34fWBd2aHkho6v+vxhi+nM93z96jqIqbuj1zYD39xd2LjW0k0x6WbMvfUxLzmtDnAN0b9FKvXA+e/w8q/OOP4bfoEraLIoTsaIOIcY//4nF/UhKTISbP+fx/M73TzORpUOZP4yoFfIcN4r+Wp/rCn+lWpLnH67xKK+zkooo6m7RbyBha5bB9D8/AxHKHF7gb7+oEQq2odL3dMW7GsDlMXWz4QeS2OYVvROA3cTvc3HSDe5M3Vr3Uci11AZx8IbFZYpX0aseZrhr4DhGHLnXJ3q8DbTDlbbGxE7S/AcPNdhfvYzJ5FTj1NwOmYigL230HMdQJZVTGDRFooeO4b0FNq27yY285HN34nUBikRpBmcn1vsRP4q2lIXOonLFUgBU/CWDNjQQEDECCk4i4ijnEjLcBM0H+d7yi6gfjAboeUJK6v3R3HfCPdvCiO6o/mV+/DBI9HCNZhCWE5yVHrdabu61ho218bBJm73xOGBw6tbt5cwY+WBKOAi11H4eR7r+Y/aoEXR4fzbgic9C3GW6C9wFeQstHy3FXaPAHa8hzhv78pZJG9vh5tT3KPLn446doWu7O4GXiVCHS9gThcJhg3FB6TwLB0IjtjP9UdW7MQYFzmd9GuvzUdndG9rYTvUpx3lLTb6Qz3XstlQBK2fXVO+JVQFL+cblUm6Ylz/4Ehh7H1u4YlCBE7kuU2GRsIpM4fJ8IbXV9Gb5IsjjqacRklC/Cj3FQqJ7tGLtb9RkGbg75JX+CwHMf4YLFo+1A9maCmM9XVWI+HpwBB+6TOuHjpDpdXx/UUxyLLLtvarlRUkQxoURzs9FL7AWnpf43HDvPMqjNlNMGVgawD710tBXV0aUnaYEoGy1dRUMy/DwPInFTzF7m8mX2ER3kZyW1gmT5/PjdgyRZ15X/MoEGB6CUSIylCDYdFkdspRCvC5QEB9YnWcEm4CzyNXIwU1pUcW1n4W+Z4rZwfs95LD9gr48DghELehtoQSqMVqgAPyVuOXRUibECVpR3gsB3F3KK+4wa57fU2teRdxIzh910PVyWAVkt94Jv6U8aIfAKA+zVPejhiU5oQi43FxgeYtZVzD00hPTrK8h0ceNXrUujwyDV5PtI2JBtFi0InTL9zhkIx2QDOcGg+aQT6eHNXYR6TB6GiIXBRgA8+xeIVuNAIOAHntM/YIdTYm8suVrkueIfIk2pYDM6qfuaKbsO3xaOOzYprvFL4PQoGN4csdmRc8FHull+5NFVBdo6cfa+NItZSyuCQGzi+MKdlmmtnfyX4XZ0hegkOawoOKPQDJqU2BmdaG+sxBDnUQ+5nR0s/2HqCPmHfa0YWA8E4HduPge X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7bf88fc4-efce-47f6-73f8-08dab2777bd3 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:47.6528 (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: GV1P250MB0810 Subject: [FFmpeg-devel] [PATCH 03/22] avcodec/eatgq: 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: sgFBXqbpbVOe The eatgq 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/eatgq.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 16b2084945..84d7be8bfe 100755 --- a/configure +++ b/configure @@ -2821,7 +2821,7 @@ dxv_decoder_select="lzf texturedsp" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" eamad_decoder_select="aandcttables blockdsp bswapdsp" -eatgq_decoder_select="aandcttables idctdsp" +eatgq_decoder_select="aandcttables" eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp" exr_decoder_deps="zlib" exr_encoder_deps="zlib" diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c index a6c3e72f85..e8d66418b9 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -39,12 +39,10 @@ #include "decode.h" #include "eaidct.h" #include "get_bits.h" -#include "idctdsp.h" typedef struct TgqContext { AVCodecContext *avctx; int width, height; - ScanTable scantable; int qtable[64]; DECLARE_ALIGNED(16, int16_t, block)[6][64]; GetByteContext gb; @@ -53,10 +51,7 @@ typedef struct TgqContext { static av_cold int tgq_decode_init(AVCodecContext *avctx) { TgqContext *s = avctx->priv_data; - uint8_t idct_permutation[64]; s->avctx = avctx; - ff_init_scantable_permutation(idct_permutation, FF_IDCT_PERM_NONE); - ff_init_scantable(idct_permutation, &s->scantable, ff_zigzag_direct); avctx->framerate = (AVRational){ 15, 1 }; avctx->pix_fmt = AV_PIX_FMT_YUV420P; return 0; @@ -64,7 +59,7 @@ static av_cold int tgq_decode_init(AVCodecContext *avctx) static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb) { - uint8_t *perm = s->scantable.permutated; + const uint8_t *perm = ff_zigzag_direct; int i, j, value; block[0] = get_sbits(gb, 8) * s->qtable[0]; for (i = 1; i < 64;) {