From patchwork Thu Oct 20 08:45:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38836 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp45315pzb; Thu, 20 Oct 2022 01:45:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM718moDyIMxgm5Dv06cFeAw+x4lGcNNwERvwmnr+DqLHnkQiaZG4PrVZyu6HNCLV72niDp+ X-Received: by 2002:a17:907:2cf5:b0:78d:5d7a:9cde with SMTP id hz21-20020a1709072cf500b0078d5d7a9cdemr10312301ejc.17.1666255553430; Thu, 20 Oct 2022 01:45:53 -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 l15-20020a170906794f00b0078d2a84f2f8si18409016ejo.645.2022.10.20.01.45.49; Thu, 20 Oct 2022 01:45:53 -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=tfP1VL28; 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 BC86068BE0E; Thu, 20 Oct 2022 11:45:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2076.outbound.protection.outlook.com [40.92.90.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 090F068BC9D for ; Thu, 20 Oct 2022 11:45:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IaR1MP/YefmHYD3awwZRx5OJgaPeaNDMp7/X4nS/Ci2tnlFyIw3CqeWHbyPgX4bRMmi31WSAeYqsNmywdY5VN2/aofgj+haIvagvbk8GHqANgvnw5PmJhUM6VQeTXIqTDaz9/j0LvFegu84nzuVqGFx0q7EDZQveUjhY3iqLw/OnI5NbWL2VKbY2NaQffjtvR0MIMGz7hPAQA7QKAw4p+xU03jdZdG0sHnTJ9We+mBmpdfHBZuW0F94hoxvk696OLsrzmPVlwPPtzvGc9cbDhUOZRVU0JGuuUieWuworEQ0l0fhtDGivJYTxQpVERlF+6udKRtn10c9pbuR5dqc4Dg== 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=Pp0/VO1cJsufVOpy9Kt+9sgJ0tqfEB+AQVWFECWQcGiK1LtbhtNgd2bjhxDmNG539xjDZ4znScFabJrzMv8bYJRLEjtRJOf4uGNSAdFw4HvTfY7wujztkG42sPpJb2JhbVFCNGNJ4J8gO8RyYns3+9edHzHV1pC1RYYHA6DBwzxtEJ97sdOmgiFZl1UjIcw2dLl6oUrB9/aTLpKAueGebDoeYppnpnJNbAyO9oCOBaRU6fXwSGLG8J6rbAnG889EgdIAgXJLWQZAaMQufzdH/3Wly1476tJ17N/q8ds7VvvdBwh/gpY7jzLROUTlzanPEo5symwaZ9Evl+DvyyjOtA== 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=tfP1VL28qdZT8E64ubLZogmMawX2md0QANPhdGwPreh/4/s5Au8TeZnpdq8b7I5s8+VeMKr07O7nPVLxzjyjMoE/5BdEA8ckUY+HnnRs615vrHwcpn2hrDko/v8jW8AWw0WSxRH8F8ZfkYlhSwMJH+t44SjpazNFH5YqkeOYPZmwie2X2UBS4/TSKidtYcO730Acu09oFME+6r7uDmpmbOfQTcIn5lxc2TjOb0OgUB2fyBGFTa1FR16VQFa0Kg/OHMG8iZefA6kBgDQAnF/tRX4jkNcJqrcEUHDwjiCcPPbX0nEQqglwPZHjXb9Ls20IM3EEVV6TWIKWZ6p9w4q4gA== 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:38 +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:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:20 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [AMfAHPUnIv0spt/E8NasqJqljB4IFdNGxj64vbMmYtE=] 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-1-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: 04109347-c8a9-4078-8999-08dab2777629 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kEq9VXjGDAyurdVkDmkI7qSY4DrOWVzAF5MuM+TGyc2zpL6r3y8psnrCx3wzlxP1hdSJ7HpArUtPmgG7t7hKB8JvCCXhEy+Xeq7c5MYXyRmIZW3O2jE3Tb7w/eZJobhrvG+tunOdGAWB7CRvcQ8g7L1inh88eKvme5EGG2nefsPWu0r4/CnTY3fgxqL1OmI2r+xvuQHjO//nHTRCP+bAoA16EgSfksGZ6/S6kzlueEvC95Hs1RL4KpC9ru0pOoJZueDaSuYk24lFr7fJSSzgckKiaJQKcMK/CVMnf7Kwuetcz+v4EjOHKUe3ufMx6xd6axnVUGcZNEGXMyP9wMp+tpC5+vXDj6aDOIG0QTWZalB3TuME24X4GFCrje90WaoVF+hJUbynEZVL0k5OOH6SxejAmbsRDslMWuoM+amM48KGyXbALz1mQZoaJHxlAAFALsruIWJtqVdNwpNBe05pciOtMM9wW7idTPpMpgyMomHGsV7Wq1HIPDYh0afzyMH+obvCIu1aoBFWBYifnS1ncWYtpE3r5Ot/snMMLJDkTYNpd29Jw+Rh5C+QyP69aqmedTnBrOdNXMhWsPCiHRlJZb6RsJ8v67flVFhv4B+IiNQ0UyzzrMYpRx8VP09sgtpyd5ETq9RvBWcbyyX4+LCZvcGr+fjkgveIqCT5cfl/Ck0IxJnCPkUZ3k81EN4aOS/tq2HTFVEhT1eYAvDck8suhgziM2rE6sR8DsXVfTehrX7VKXDePJKdK+mBozKVROU2EdTcCNubcOQPtaJyaxJFqi X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sP4PLs3/ol7QoHrixknNdK5TvuZZ53ToihhP5G8nir2KYVmzF4T3GTuzYVABIJOI34dIKmLv6N6+8amN2H8srTDgOS9YQZFLBGQQY7QbYIXn7UvA0rFWxSkOCv6nqwmrJqU4mpIs6j8fo3kORZya3C/qfTVxTHYWt83uR25+v9Qpw9y29Js6HW2KWIImddFB8ktLRRjW2/B0vHjaRA1Tns9FXJgJgvUx3Lv52sQqNe0oEwQNprToVHL3iZ2xCKmYTjE5WDADBewiQZWHTIWH1ZCGhtBp+758aoIsuPCEG+kyzjiFa78Z8Y3RoKWRdFWPKKS4hJ5O0GrOigehx6n1C1xroYn7sopb3gEyYw1Orqsj+sAZXNEjSpyYdMgzmVFItobcIhX3YoO7QcXnLcex/8ueYWSvWfuexzMe/ENDkf9pV/cwWbx2oso+uPswQ4ed1bxJRYgZ/ilIeHd+5II/fdGevN7mBekIenF57uqMma0jADhYqK3SMtGEG8H9exi3VL9MEm3p0BKkocDhazDcsh9zpGLQKq0sg/Ys2MSGR/CisCMeCE5iCuFFH+mNm3y6VJ64kzFlT6Gx49gRf0TzsO/iMVJpiGqWgBR7l95KqN0/Kkx2XTxxYCjYFg7M4NPRyU5CD/ltEXbEUMr1oK7Wz94dCRnVzeuiuoGKWg1YCqLib/zv/bqj320rvFbX2dom X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +0gPXJAenr2rmrCnBi9r4+jMR6kVhYprF1ytrAZY1g0cv9oyNBNkKmCfWsbtMCti+fUf8T4seTLwxsEgKIci1GxDtfSuupm3kY1OPhHF56riMqqgF0o19wpjEH9Z9/d2XbpK4i9xkrUOhCTw4pj+/gcQsX+lBbl3iWFuaEcS0972yp938qxxiI/BuKu6WaoWNDIvr+YMxQxChZSq+eNeAbvzdcacVMcC0MgTVygomXe8ryzpDSs73VrwOsScOlYvf09ZNjgqT8lYkF3/459lnUDnRYrUIzsjDH1cYXSsX1rk2KMd08iROAKzCAbidO1dp0HfqF+MAcmAi6srK+zATBKoHXsUGPEUjEMeRrhrjkaCj4/rhtrekm8THf4jX6RqHMeDupXajcJ5Q0v8bNA2mXFh2trAlgK6R6xi1IXHVqLd42BVFx931V1r88ucdcXVbS4MTz4JoP5ZGi9pe6jhXhQuixZv/5j933YuAywl82t0u5ZPsrlZKbq4fS3I3S6WfODdUh6s+YdyPL+N5npZg5rWi99fkRhHscXilFLnBcnGDS8+dt6xSd6JbVKVNNAm3o4A3DZEKrZqwoRLUsoI3gMFAx2DuHG09/aNsrOnKQX8Wbti/pc5/DX9ap/1F7cbbLYu4rfHEEaHcKFHdCXgANWo4PRtLukOQ081Sd/4VH1J3WbN7l1NZl4KmRHgbz9AOTIPvwpcgYWacaHNM6QIobC/jEK+4yR3/FBXO4EsX/tSVnemPtcCeYV12Px+iBt/jx8L1tFZtp64SIblsGy36v0zdEc2FmXA2xEfodkR0JInSBD85fT6EJox29ThQ5dbcA2VkWolV6fsuQTlPe/xHs7i0w/DyCyjiIOPxexR33r55AiBrYFLEYG380PvPqCIzc6f011FWF1OxjOAGU0ayd+/fDkTypgUoj4aRkwDkP4r4bweZrrJne6czmzVnaJ6GcP1x2OAlfsnJDUx1ep7JhSBVtQrwPuQu+3Mlq/dwXHPdcsZLTwkK0c+MJAevtLDOwCrQPwq/Wg3ESqVZI1n/p1QVGSQblnrHtUHZhPANJIpD1zyNzgT6nPxjtSL1kNh6vTTmOC900OUs9TO76BU6lCb1WrPXR7JGLQHzbwzRXNJGvM/tVAD1s6AIxgC9bNC4fyyYTH4IaOvGUZSq+2M1r6CDAhonuHq6gjCt1KsnjQ47IVxszwMD360s7iFF+fptesDj93efXqVwEPM3MSiu/V1pHdU789G6k/++YnFVJlzV/ICEL8ohK6lMuuL+kEYG8jnoYZ0AkGSZbOsuPn4JHt1AsCbnHu1hes3O7m5wRRuLbGFrzhKt3AHHchTf5yZ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04109347-c8a9-4078-8999-08dab2777629 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:38.2132 (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 02/22] 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: UiQyLkH2XpRH 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];