From patchwork Thu Oct 6 00:57:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38569 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp885038pzd; Wed, 5 Oct 2022 17:57:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ivGqjtpxthOiqw7Y/8dEqrKilg12J7z2zWYtee2+J8p87NTBFxcHisQ+vvPee2DpDGBU4 X-Received: by 2002:a17:906:9be9:b0:78d:2f63:10dd with SMTP id de41-20020a1709069be900b0078d2f6310ddmr1856479ejc.479.1665017855296; Wed, 05 Oct 2022 17:57:35 -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 b8-20020aa7c6c8000000b00458adad589asi11616989eds.80.2022.10.05.17.57.34; Wed, 05 Oct 2022 17:57:35 -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=G75zMcX1; 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 9014068BB5A; Thu, 6 Oct 2022 03:57:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064095.outbound.protection.outlook.com [40.92.64.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C86F668BB5A for ; Thu, 6 Oct 2022 03:57:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kKAjCDA55+f8x6Ss6ApeMJusr144ieiC60YgAeNwwwmV/7DTEqwqYfcn+e3DTud1yDm5IbAe0KzQmmQrWnI+Nt7jD9Tl5+liXl+KIfyfM1rHG+xrscqmpBBIFeSGPgX6oQS8XgOaR216RDRUpEswyMnv0ZqMlOZLmnn0hVHzKuDJFmr+JeD6X01NAhROmPLq71nHT11IbvfYL+T2aKWJ5ZxzxL3BHF6u0oG5t2zgOdAQYbRzyXdlmZyriXa2m3qGV90/O0Id09bGuHv9BCk64UNHvCk3dg3Tr8tOFecSPFVkABCI5qr8//+5hfHu7cVIL9LX1zE9NImZgO4xWMvb7A== 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=PeMPvstg6rX1Zn+RbZO1hcgNFDDVlCflwdKoaxdMHnc=; b=AIjDCtdnYWgHG/g6SsVBlXBk4m6HTAdaLyYOE0AMFXhbcVfz4CAisuMdBnCI5D5mc2X+CiSVvvu1EnyfYi57/Z2ilQPbr4DzhhjVyG09J8o5x6SaeiX4wJ2AK76N/zvtOYbwlE+vhJsmftlIXU+YbzOuOD/7YAUrx9DDqcWmawH7K9UZ/9X4Vnq4BIIyWuQ9boulVft06p5wElAm5grgjh1HPUDpzqktZBNxY1lg0YKFNLOGJeKmYg13g7EYjFiOeCnFUgp9AvJQxYwG9SWYk6fYojCHQPLgrfRya/9yPTh6T+UPTyBf7SWvWIh/ZYDPchfoAy9Unawfm7AiHwYKPg== 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=PeMPvstg6rX1Zn+RbZO1hcgNFDDVlCflwdKoaxdMHnc=; b=G75zMcX1FBF1BGLbVy3B8CqZuaeuigtDpEZ+ekqSRaCUDXiX5KDed/clehplraN2mqdAMSDfj+03cpTvGnzJdiof0SEGCq/OOx582J3ZlWbPSDf9uLghQ0h+yJRomMDVcQaSEvGg/5VWZMvRx1+nHyEauAXdKcZKaAE/byLEwsEaqJcVtoDarIG1Oru3GXEnOVvAjMBstp9v1Ga5glT9tW4fkiwwNbIPeE5v+6gs3FX2XVo6kvBHeVQM+Fx1dwmfjRKNZxRZFKwFzuYzrcQvVI0A7RGAypGtok1TmGcAgGii8sTrM5DMmhB+ZV1zrg1d++E82PymA5YWMUfq5XR1jQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV2P250MB0801.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:a9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Thu, 6 Oct 2022 00:57:15 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.028; Thu, 6 Oct 2022 00:57:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Oct 2022 02:57:08 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Lp6lL9PlLD9OKtJHVpJB/JzbArkqpswPdAYBP7B8PBo=] X-ClientProxiedBy: ZR0P278CA0150.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221006005714.3530026-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV2P250MB0801:EE_ X-MS-Office365-Filtering-Correlation-Id: 29ac4e21-a7b7-4fe9-b6f1-08daa735b5e8 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqgQ4FT7B8ShVDNjokrWqh3zJkwAGTD/j/+mg/ofxjpgYooWUPgYProBTnKeb1t9Zrkr0GQji66M16C5u3+mWhOhgT5k03XE6aYEAx062HQ1pwypN5DwkYP5H25iXsAyArwmQVRIZpGsFuFj77yd9JYW0GNI3HffzK4IYDH/Xq0E9CrtQkaSL5+SGtUf3w/63FqDofTCVLU1scVCXxrAbHUWH587hJpQ5wSgQBCOlqVJLL1L0LR10jLgiggL/2RneT1W5/7B1Etk1vOhMP93m/YDWoAUYyHYtcwUSfTwfvkgW3tQ6vM9MMlO+V0QrLR384vciMSAquzxSca1QCsp+C4wkrvRDtBhObUjbMfDQ8XzOWKOKNOaa2TftWH61q8oQFrlycNwnawQ9fTHgHcj4gSDg00CzufyuSVHrz4f/VYbcmMF2KLq0EZWVFKP4NoCU8Z6DOpymtD0KY++JIxm/tHdh3/7DmUCYmUXSEd5mDDnRlz6c2EVM9jnptGmLGwMCRegxPkA8fs86a7d9KrEyA0qsvJbb9OHG1Bm6G4jePk1io7ao23/fZpmUNoeQyTllyPcDlPjeQEpn4p2vtT0x2qCXEs/IXtlQecmqTrwqmNdSvBgr13jGxOQLGCYWTFeXwN+KDaOKT7N885MzDQNIpaUj1g/DJbQ8X53DzMel8DNBz6NC+/9h0MLyQhW9tCJZMWugW9Tfj2O3oAP/PDfVq8EUDMI08VUnrW4Bb6ZVLTx4R3mq75MrAHuLmoB7cpYno= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bzVGuDw0+1gaKWMxwl4O7UE5OQXX4YL4vLnpJO0c51HsoeP+1jpR2ekCghyJthhr+23428qcFJTdiBPf/kHefLw03XHpIKpzztXu2pKnxlhqmHKI8m/n5nh5E87JCpq5dd0IfJtV8WG8r/sjU9FouNHz58LNSm3kYEc46z2TxFdgjK+eqh5ifY8yyPHUSKII2bgafqjT27mjx5EALLc3ZRYSO5tYB3GDOip1rmtFpuUxt/30h70cXPgbdki1tXt3gfgFb6Zv1dDUwIqoEHdIzDT3wvXTghLkf1KRSR3IeVnOv+SkaVoM9f6P9UQkPozEzGNgB+VuBV8cSS6WSnuCx4TQE9x6UCwT+KcUeZd71AN1lHhxkJfbGPjH2RfD9iySQPeEivXjSJKWmkeNY7AGNWave9hbYwuOLyiZiBy604zup4wgumRA2eIrfFNxbw0UortorL5ej7uUGMUDkyEwJRQ/boE2RmA+3gWsB0dGn+HP9OjFJpjmmLanzLLbfC/rPM6aFBctLD0RO+Q/3NfVBlBAK7wwYrQ67Em2VyXhiQ6/ehKOF1C/qVW7zT/uURYIpJOXzSmi8TimuomGBmtZGAkCncF6jq/Gnuf6rORXbFt2PlUfY2VElDFry8j/JokMMfccc5MN0lx799eBFq6MEbraHXxbm3yhP+Cyb4BMYMgbTiCzkAE0/tSPDqRY+9IS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8ccaFLwvRXkhuZceJENG6UjAtjzxY4C9gAkGAXncbzxCZvXfHAt2JH7Qfac/pzB07WopPnXvRu2HOVLKB0bzI/Mb/gQhOigokJNmyCeLBlhFtbx8B8OVwBRQH0F2Ai2+dW/sI/N7i/G/qhY3STNyrGVx5nc5M3xS9HNsh7VFoCRCedeBvC5010uYzHv5STNUOz/HFi6SLg4qShL4j0q+9PfZOq2D+jXVWWWWjM21iw2SlJB1OtyRrL0ugB5jQRDfgn4Ygalo+YmRn0h+JhRW008l3O4+7cpQayJML9t9FwSW0FGrmmbQCjfDruPBbdaCw2wfVsJ+jmta+izkC0Q+vqneEuha7VONmTZVClMTlzdFzzXQUvoGccddHnDrzDxSBSf/UQ2kecoLmi6ePzb2G69FoxwC+gDGzwHPyIp3syw/3wHSUT8wHy0cEHB61e6uWuXXFEbmAol9ulu261jj7Eyyt8N4GWbKsCvSPQjbQpt3vAcHl9IGeMJX+836e0rEmqofw19kAz5avgIWNb/6qklVG8aWUtNeyJ/C+dkbsdUwriBhEswzqmDL8aDAN9yYKR6aff+RD6FrDRPO3443k2Tprz9zZvF/BorGt/2fdthVBl+TTTUSW6zs3kJXFkNfI2+3oWM/E7E2Ldp5HGcyf7VBMbw6FmND3xjcx84g19d5qCX8rg2WSvB43nyyQrLwP3vQ2c2bGfp3axIQIOTU1zB0LGvGEjsy8Ix23Lj9uxJKIC3ljzcM7d05cei10ZwyBcgg7weJIfctoqXrRz7SeBq4oiFbxXauahJqRIpVN/fdIIbIIBV1HPrmEhGZV4n3DD7gVvydwtMbDsl+fALBOzSoEXSAv7JBo1nqcbsCx4AM1/j6XOY1kP8ZdU/SGoUo1/h6mMWJzPLkjD8RqSQkDwbg0g/MQxGLrxYNRpLElBfMO4bwXJTmkzVhDei6sv3bHLM304e0bXHPw2z0OR7a/QIdUK6siOqe7mXdQEqfA7twASJlesL3YwKj2yTDeHFirWrf6NhgyFMIK5YHJ2V2H/ZCukpk5ri17aHkgCqnnH3FsZAg4U+m1Z88uFFhdZ1mmxF//eMm4QY0BKoatbGcSKHdSTJ1tT9zSUdIotUBpK3z2advYASte3kVPzKxhqXTdRTd42Y0kbmKTO0WlkJfQIyKWZKUZC9fgrNpK/8guMl6ouwrjjP/ZmnGEq4Y5+rrPTORJxlVzYIqMJ3PWdBG3IQAUp+Yt8GGmG2idI3Ojz09tT8X+U5cx57ULiWqUk5bp1ulkE3Qf9Zf3vC8oeBtpBGnYTrwUWqEqKnkhr2RJLR2J9OhhfuiOe+9VaCdZFTn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29ac4e21-a7b7-4fe9-b6f1-08daa735b5e8 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2022 00:57:15.5253 (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: GV2P250MB0801 Subject: [FFmpeg-devel] [PATCH 3/9] avcodec/ljpegenc: Remove unused IDCTDSPContext 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: +vVTqqGVqhxR It is basically write-only. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavcodec/ljpegenc.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 957b7fe13e..ab6ff27249 100755 --- a/configure +++ b/configure @@ -2869,7 +2869,7 @@ ipu_decoder_select="mpegvideodec" jpegls_decoder_select="mjpeg_decoder" jv_decoder_select="blockdsp" lagarith_decoder_select="llviddsp" -ljpeg_encoder_select="idctdsp jpegtables" +ljpeg_encoder_select="jpegtables" lscr_decoder_select="inflate_wrapper" magicyuv_decoder_select="llviddsp" magicyuv_encoder_select="llvidencdsp" diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index a708d71220..4b88218990 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -33,22 +33,16 @@ #include "libavutil/frame.h" #include "libavutil/mem.h" #include "libavutil/opt.h" -#include "libavutil/pixdesc.h" #include "avcodec.h" #include "codec_internal.h" #include "encode.h" -#include "idctdsp.h" #include "jpegtables.h" -#include "mathops.h" #include "mjpegenc_common.h" #include "mjpeg.h" typedef struct LJpegEncContext { AVClass *class; - IDCTDSPContext idsp; - ScanTable scantable; - uint16_t matrix[64]; int vsample[4]; int hsample[4]; @@ -240,8 +234,8 @@ static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, init_put_bits(&pb, pkt->data, pkt->size); - ff_mjpeg_encode_picture_header(avctx, &pb, pict, NULL, &s->scantable, - s->pred, s->matrix, s->matrix, 0); + ff_mjpeg_encode_picture_header(avctx, &pb, pict, NULL, NULL, + s->pred, NULL, NULL, 0); header_bits = put_bits_count(&pb); @@ -287,10 +281,6 @@ static av_cold int ljpeg_encode_init(AVCodecContext *avctx) if (!s->scratch) return AVERROR(ENOMEM); - ff_idctdsp_init(&s->idsp, avctx); - ff_init_scantable(s->idsp.idct_permutation, &s->scantable, - ff_zigzag_direct); - ff_mjpeg_init_hvsample(avctx, s->hsample, s->vsample); ff_mjpeg_build_huffman_codes(s->huff_size_dc_luminance,