From patchwork Fri Oct 21 20:12:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38879 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp955950pzb; Fri, 21 Oct 2022 13:13:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5rvQHTHkc2MvFfl1NWsdIyCSdI1On9DjG1uvkCKiIBIvMCQjZb2ksuxzkD70HL93/WOddT X-Received: by 2002:a05:6402:42c6:b0:45c:fc58:bd0f with SMTP id i6-20020a05640242c600b0045cfc58bd0fmr19329210edc.19.1666383186033; Fri, 21 Oct 2022 13:13:06 -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 4-20020a508e04000000b0045a22a21abesi18374189edw.299.2022.10.21.13.13.05; Fri, 21 Oct 2022 13:13:06 -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=WnFDzjci; 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 AA67468BEE0; Fri, 21 Oct 2022 23:13:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067050.outbound.protection.outlook.com [40.92.67.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DC6668BEC8 for ; Fri, 21 Oct 2022 23:12:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WjYcbUIpJ0UGKbuost9fmC2lN2ckoSJAusUZzCtQzWIx13e61qEatg9L5jAwsX35x1R+4DeO05JTb5As0xL84XN5TLeG9XsFOGxlcId25tF6bTVHUie26vwYyGtNqxo9whBEzIIPYWyyIPDnAt7uiocz48y+9lN4MC4HSRoWOTlhoZkq1nbYu+RvFqHRnFBOfx1W8jNtx2mYkSY7ou6BOpK80QFTbrxKXK+4ubzIXiGjr75Z+Xi4+VYpmXAuBE+bBMyJUqkRtsz8ZLm10jgWwDK5aqwfkOzAh/pVhTRfQfheAU9ODFAHpj9WB3tqGoMjpgww8TYqvdUNsdvwc7U/Mw== 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=nVd+L9zY6vTgKMNIwwWTgANfgI+BWaZITBh7PAGnZGg=; b=S++sZvkuKFB9FPJaxUjnW8LGySyPlia5HW3p0I03OyU9Vm+HIQlFSn/qK+fu43W5wZheso4BsxNTYJaHvm0sRZbMneUQ+kSiBWsse9u1QkRWngpaodv8xPXr64iI5xyTDUr+5SOKzircSNPqYN2gItOfGvvAn87Urz9lr9MzpxKiuwYaqED0JCPkIFUfzSVz89fwmIBl3Jvz2Yu4t3CYlBpLo38IkkbJ4CQThwJoulMGN7aNs0LcwydKSTRtinKvoZQn9HZ7hGtO5+devYl2+mqzPex+5ssORLa6QXOLZdiF/lkqY0ocbDxfIDUJNschFy4Lv+AptKKeUD8LuGJSgQ== 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=nVd+L9zY6vTgKMNIwwWTgANfgI+BWaZITBh7PAGnZGg=; b=WnFDzjcijXmq7/mhx/RKCoVavNSCF4RcKX4xaHDVcwndeaJOSEzso+TQNFd3MWsxM3TWkBD3SEPiSSvYTMpfEr3rWxayni136d6Ez0VsMY+4b0BkkEm7h1wXMb5rfVSr8DYcw6MipMVOUbHFfQpVMu6v4evQRQ3gEPq7q5FnSJ5mdAy05fFek4GxHctcXlJU/moYutjLZxTaFf/OflMK9ZbuqjUbqjGG8vmQfNCEzY+kk3gmLbu8CSruOUflYZ70IXHUMPTlcUSAENKMvAiDXTjMSBFM5MoH6zCMlrx3Cp24nzaSYo0wW1ZdIOgjyUJ4Ar0Pa3elGjBoMqiQN7fOXA== 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:12:55 +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:12:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 22:12:38 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [eQC1E6RvBcGSvri/7Mq49U3lHHtLTwCqCnbmMFR7wC4=] 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-1-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: cbfddea5-e97e-421e-9e93-08dab3a0a414 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nnHDnbJ910YUAai4EXr732TC01HJGeHn6AOz+Ixy9TzrxEGKWOiblZlM1qRIRsoMoycxD8929gCuwqrZYCEm4ZistJv7nOELg1qSycBZ1ekppAUxjbInJjmHtAYw4tYI4wBPF4z7XKwgfbCpqvta9+TfYxmeGcZhpH+feQUbtD9VxraA8IyzzsE6hR6R8TuPbR+qiQ2fCwHchTv+8IjHXpqW4sH4anP7DyxblGeBYSWs6pIbjD9kmmaADxmxdy/Jq/HLJOhzwNGei0lh0XLSC79Wq8w1i1QVgKDCH0LN/B5qyEe0PGY5aH1y7GKmgI3Igk++eL/1Ok8HrRAVsBF5EtyDq4ZTJ10+xZQVrMIGZ+pkdocxq+tPkJJS/VHWbkxkCR19ASca2yRruJ1RSAEgSd0RtnxlMVjNCVYvcrSpBLoH+ochtLAmLWLVg+bTc0DQS3iaP0E47aRwNYKVA27GGdzicruKWMMZxhyEYc4CKO2VGVSw8mbArQP80ILa42buXjstXfAhG5pVHSzZ/50sxOigQSPz4obmRav1AqIG3ZVnW/rqXXFl8MZWRk0HL/ZI2sZ97FKFEdMEZgnppPvVF161Gan55TaTSDZqa53LLQ44dFNsE8jr16Pu4DxNddpxBig9UYrK7Oh+NPMK4Q5UG+G1ckPR3uil/yOg6M9SQ50VTBYFvojhg3gw9i1WvljhzZfBsrVqEaoBU+hGJAu/Tt9SmuMpYy4Yuj7ihwXdf+o90IOWLXRkZ7DCz5Q/fKrsALQ2/TWRHilVYcKwgVRY2c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Hwd6wb4iknIm8AVnID/D9t+XCEZ5d5Z2K1CFDfFn26pxfwyIBwK1QiWR6DDjopy6rT5pH5xkU1oWsY7L/rDr0fmlGIGRuqA0qchyFoNByl5/jkStIF4zzNDQ342OhZBVDyqm1cP86rVbzen+LDWg9wfqNNqOVIAj9B6BLdWsFwXwktiMHD00Lej2jQjZEGty1B5xhBrzR3BuCXz0GKYfxqQ0jvBm0uUkx7IBVobswD10o7199L+vCxzJaRpG4B3jo0KME7wgL2odANUbbySZJtAdamSaH9OIZuiM0iZP3eztZQLltZDIBmDHQz6l4pm+RVAxkCtnCrnrpeliTaXws+Z8NATmGqekExZ3FMgHXtAkubWmmM5w+SuG5rA8YYmWzfoQjUt3jA4DFIp4cjEBRJDpVcWe+zpl1AW1ZILsGNiZHAISOesJemqO45nuFRfVukc//QUWS8clXc06aQ9tUBgwdvq49VWRAcHgylkc3FDQh3owQWd4KxXjpI3YFnxEHK2/LkpKbvPY0nD8VuVoAbA19M5q/ho3p7ynZex7d385GEn3dvpQF1tdO0KysM27puW7Sf/bL3UngpeMW5dJ1y2g2Ihs1spIUEhPFh/FD/X+rZMsrg20PUpUxs4q6Fi7Lvttjo4CCMMZhnM3ZYO9Mb64DRFTn5cKQpduX76Ozj0c/KYNgntaVtkyXWgkkHS4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uCxP51PxUoAPkK8Qv0NZqmIzpMUJCyzw9ys6MOfdODB/Q1dSa7OTe+cmKWZK8tk0It5jg7hUG9aDZvWApd3ow8bbQJF6gEfLn6Gr7zi9Rm0dQ1ovihWmZb6uQKnZCAUEGqgxhC2xPo7yRkdJjnHY7shoS0qjsD3YB6Ka3eL3+YIBaYia74dIRDrIz5VzN4azkJdGp3KmmueVBSMaeOnHH+Ci+h6bkPp3grs3TNbuXVyWEpGwWr4QRDOZ2jtIxZx9mtRaIcvv0MXeG9qZ1Qx9Qtp1RO4Oidd3nsiGgmtZ3Udioa72yOLdrIV3YPEv26qs2xYq3nA/UzRTq+lItM4yAgHfSyAQIh6DyAwZIwsjiVffEkzaMojvg1ch1RPtEcnjOXNeM6QRhg2gicvNKn8c3Txo7dbqCptQLGQ+nxOsyndOwJFcyD/BR7OqUMNNiDktn5ip1PlAJycX0/xZWbdzQ4InItSbR7Uk6r4sC1/a2SqJDrXX+vWEhMUOM7y1Nfp3YWepAFM2Zs17V8y9BTaFSYZmKqtQWGSgveB7tVFy/DTAE+CS4cb4cBs7usN+WJPuJccB+/MkfqWOYqKyWMnoYnzRe/Nfd3mGDxtxPu9NTnxbbHy+VMqx/hSCWgP/hGRGS7krhSV5p1vOsMKn6f6DXMstDwmmSdtVljxVo+GW069O6RDZc7u350/OMN/NNIViGNg6dbGmwVoRE8TJzESWP0r9WKFOLRqmo/A+UnJV4QKGqNNil5Dvw8xgHIZTx8Icyx57PwoJmkM/G3eY7rnYXfECNsseuFqwkdoMIM+uJT4/IDo8Ee4hDY67xmRLVbJz3cBh7wB8OHWYaDiz+oJbgQklSnNzFy8YCVk4cgwoIdRRgUQ9JpvbNJ0EpfO6HxapIY7KpMk65r7tboAkLGwU6xTYQJJVPvERcMXLoqxVejtWXJeZQ/Gax4hG36d3HyytGy069UvyGSkLFYVKoUbnb08bXL/4HNDWPboQSi5+AmJ/uwEK8Nt4N4NWWIjv0v+QpvgHPNo4Ok3iGElVlBRrGk7a6yFIvHctjLxaDSNQx2NGQe7gK576XCcN3SvTq+aEo61KvZC1q5eL1pf2AcjhbQ04GSWRERm4uKqY4PzsKBtJfRRVruZ4260vOqx1rIZdXt40tPWaJLRm9krVytJNG0hwF20hs/3/ZnVKSXiZtlgBgK+u55470HsTpZtr7oCOFiCMd2BtyywnUWmRMOzgJw/2q8oF01kRUA6RMe2izibb1P99LvduxyG/uUeiUl9FzKb4Pt+G9W1CrS+et3NrXNsTeDaOB369hEVN3MIYPpjNGoXdffPhvrWmTBiMnRPn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cbfddea5-e97e-421e-9e93-08dab3a0a414 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:12:55.7018 (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 02/24] avcodec/eamad: 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: gnLF5okIaJFJ The eamad 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/eamad.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/configure b/configure index bb61e9a0b8..16b2084945 100755 --- a/configure +++ b/configure @@ -2820,7 +2820,7 @@ dxa_decoder_deps="zlib" dxv_decoder_select="lzf texturedsp" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" -eamad_decoder_select="aandcttables blockdsp bswapdsp idctdsp" +eamad_decoder_select="aandcttables blockdsp bswapdsp" eatgq_decoder_select="aandcttables idctdsp" eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp" exr_decoder_deps="zlib" diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 2a5aac912d..de8f488f65 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -39,7 +39,6 @@ #include "get_bits.h" #include "aandcttab.h" #include "eaidct.h" -#include "idctdsp.h" #include "mpeg12data.h" #include "mpeg12vlc.h" @@ -52,13 +51,11 @@ typedef struct MadContext { AVCodecContext *avctx; BlockDSPContext bdsp; BswapDSPContext bbdsp; - IDCTDSPContext idsp; AVFrame *last_frame; GetBitContext gb; void *bitstream_buf; unsigned int bitstream_buf_size; DECLARE_ALIGNED(32, int16_t, block)[64]; - ScanTable scantable; uint16_t quant_matrix[64]; int mb_x; int mb_y; @@ -71,9 +68,6 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV420P; ff_blockdsp_init(&s->bdsp); ff_bswapdsp_init(&s->bbdsp); - ff_idctdsp_init(&s->idsp, avctx); - ff_init_scantable_permutation(s->idsp.idct_permutation, FF_IDCT_PERM_NONE); - ff_init_scantable(s->idsp.idct_permutation, &s->scantable, ff_zigzag_direct); ff_mpeg12_init_vlcs(); s->last_frame = av_frame_alloc(); @@ -135,7 +129,7 @@ static inline int decode_block_intra(MadContext *s, int16_t * block) { int level, i, j, run; RLTable *rl = &ff_rl_mpeg1; - const uint8_t *scantable = s->scantable.permutated; + const uint8_t *scantable = ff_zigzag_direct; int16_t *quant_matrix = s->quant_matrix; block[0] = (128 + get_sbits(&s->gb, 8)) * quant_matrix[0];