From patchwork Wed Jan 24 19:52:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45805 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1511878pzf; Wed, 24 Jan 2024 12:06:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFuJlpF5ylV12mQiVdiTXmc0Ud2HwTVCLz+T9JpCSmkXY9ewWhMuxZvJPSSUd2pTl47Wgbp X-Received: by 2002:a05:651c:b23:b0:2cc:9389:ca1 with SMTP id b35-20020a05651c0b2300b002cc93890ca1mr1304205ljr.73.1706126793818; Wed, 24 Jan 2024 12:06:33 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eo15-20020a056402530f00b0055c68a93bcfsi2899775edb.295.2024.01.24.12.06.33; Wed, 24 Jan 2024 12:06:33 -0800 (PST) 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=T+ehOLKX; 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 0311568D140; Wed, 24 Jan 2024 22:06:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2090.outbound.protection.outlook.com [40.92.64.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7E3368D115 for ; Wed, 24 Jan 2024 22:06:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z1QrxUEJI+poByp6QYrtw4O0bu7J0isTFlEkA3DYvuQRsGuq3S7gZAC/cOgHUm/aD4ev6HyFEZZX7+VcSAZurttNS/ko7WUva7KqArD990LqE6Wwcyl2THhzcs4ROWd4qDfCLX4dsDeqZ7igEdoUPtj2AsLSrJWNK2l0bQTjTMT9yVHcgJL38cGjBSmZuMGUuAre9/157rIIqlJb5UtUkWGu3EBA9E1ceiFVyG49pgUr56As6nGVgXoFLxro+mLGlDqLcinF0+VnrKNXlWIkHIlWmdPFeTzpQ7annModV6UQ0dSssnWP+2ok4Qyr/nonmhNPCMQQ/b9XfAPdau1jDg== 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=xOW4+PD4y59MBC8Ic6mK1r58qQdOK6bqCNHO+144EAw=; b=bA9X+53KaHFAYkv+cnnGtLQtq+WsnV80hdhe8k9bVCM+WLTYZKHmAm2lQdI7omgJfIP4IV8/zLy0VLSoyzVlHH2kN2rhYREg6ISrgf7Dtpi1LEEob/tsLfvCIABoqAxCBE6ofHoC9RvY1H+kglbpaios4j/badNHhb1GJUvov3JK82/5qEMTy1GpB+q6bISx35+T1VSuy9aDUDdoF6nSXHd5OARRaWUiCGhLuf+E08+awZ9AcZxjCIYeWTWr0JKp1+AJ7L/tbnohBEjrkjuHEe+594XUiQWwdwuk9j2CnYFh5JkfFB/V/WVpNAGalc9jMLXBwN9kUeL7ll6e5/yjrw== 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=xOW4+PD4y59MBC8Ic6mK1r58qQdOK6bqCNHO+144EAw=; b=T+ehOLKX6LthBuuQ/DvvM65Enf08/yKxVEEXhBDSj38ptYkuy1N+4NSiFseNQD1K5W3fZwb4W58P5LCpaWGOxV8GldPiDtu5NHWfn/Vlk/1PyoeqEl631y/d3lhsiLZ0f+H5/U+v27aOZRq0qlIJxNHkf+kfgTIiSQ3TivYirckPsiUl1Jizs/wLwP6dmhZRlD+x+oCwAne2P7EEW44ffRAZ4VtvpZ+LX7isf9Jcmmzu1yB04vIc+o15F3v8xp3ShYGFKHqkGVRNWcdQPP0V4wxIOz17+57bG0tzHOS/NNlWNcvjIl/2dU2NZRh+WaNJlg8ilsiGoBvkKMa3/4gAfQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0350.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.37; Wed, 24 Jan 2024 19:51:25 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Wed, 24 Jan 2024 19:51:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 20:52:35 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [zAJVUKSPyDfGPxcUbHOSGDaadTg+ach+5Khzo6K574E=] X-ClientProxiedBy: ZR0P278CA0019.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240124195239.558681-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0350:EE_ X-MS-Office365-Filtering-Correlation-Id: 5092ea6f-26e4-40c4-46b5-08dc1d15d902 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8x0C1IM5jdUEbKssFY50SBqJTKkt8pJ986UyqDNHRarO41R/272UfM5DqbLKjbzrUQ7wtzL6DN05ISrvZ31efr6EO9ApixKPdlh1ky+83rvHU72betFrd2miU8HBFvKbOGhV4Fiwhz+7qzkveFIIPD41JfgSca1xoH8p0YeG+6FV2PRvL/wNFGqKDD0bPV0JEPj2sKL9tyHbIdGNqhRI7qhGZSlup+qOpoZZsjAw634X/TbVAu3d+E6RzfUQLNpsMvEmnlfJK0WUAlfYol3GyqC8pPCcl03c7ZWtPXPgELwUMqgo3h4R75FO4CNu2Dgx+AciWZwl4QHBdfqgPUI0NLHfSFuGFlJMRAe8+8TPKYyfqknT45w0XgYKsKZS1Zas8NxOiLbhxn2TJT/vqAFJOCIYz7yIfrzvlNVZwyCsP+YXlp8RDCi6vHUYdKHzsKCMfdnnUXJTPDeWix6Mv/8v9RHrCwaEhNRuDZhqF1NLAZiNeFJftkdHWI02sTV2N4dxVs1brcwYwX7K9RO3CC3ZPJp/zgHZQcMAYUQDAW4WR7f16KPbAuvYP4f5nALCc0+AJDesU8mmQRDfm9/LnNro/U5KBirhMe9YiFkJTGcV7NanQKthV6hD6lMI17bCG/V4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3JTMpdnXXLkc+iW5HHPmuxHOrn0/4FbmLE6ZismLSB+f8dEYvTbSDqsOVLwR/sHetgkoiAtMF1COfURcCvOjfEul+x4n2++ErObFaDl/4bV0FC+m/bCYQDw9smXA7BcbSSXfREjHzQkJ6th+RSV/g7+gcuL82H0g/+pZAXB4YT6fndy2R/lRHR17eKUYxdChKh/t+ok3zSxYWhOryt6YXxaHEci14mHRKQYov/VoMAE04MA25I+vLW5JeDSafk4mGsC8uK0RVIFuBMBFuJRKykF2zdm6j9J1KNTTys29b8xQxMQiyV/kXYvNiNGVKIPJFzmiGHM4KcSNsZ/JFwMgNTHsprzkBqthU0LImlUyI1vrLdkHRbeptzyfsP6dX9a+LOrofP5W+3V1bi4PvtYHZPEHK6lAq6Tw09FDtXuRkVEFa5QH322xaKIetqKq48/Rdzi76aGwHQrmQ/HP5c+L1YcPZrBpIuRfe5HPGYlYRwUN8aqdB8M3mpW2J9CfF5StMwFn9vYZCusPVLg7V3i84F21Pejqckh9+X3q7cqEVi7R/pqcmZAf9kiWaM1j86JybO+fEpkVmfha6wo0azUPBAI+timcg3QWSLMjHgQUxaU5vw8TtpN03ZzWscBoMLEmrrbOk1K1FlZR2hyx4hCrHOQexo3U3C9ftXwbdBn1BhhDtuL6A9uWcBvdJ7KD6D6UTxF479nCtBce1jOI7KykZA7jVwphHtrqFDwppqClF//Oos82LVyLNFhMI7QWxaAENzp9FZ93ajQTj9Zw4OQvWZja91QrhFe4lTutsxCvg8s9dn0T8hIgu1ojf3ghoPdoi6aj1nvBCaOT1g8js9G1rOm8KbPt2k65odStizQa7sfAeY+7mbXCWFIcQnl99mpLWQvrsVWgHlJJp44F+WF7y73oPK9y6uOeZBXEpkDLDh8HvJePAlfPCKfaqpiI9DDgAGWrSWvRSBKq5+CP+A0xUOMlx4yHlFe2crMTX1gKQgnfBb/DkGpXre91oYNsSzsQsJMBSNyM1vh3HEq84prTG/D0LaGIpx4Zke9VJ2skXiCa5DlLoOTLeJXl5+zR6UpM2N9UhufRy6bumwaQB7LY041LhNzQexAmaToDl6aeNuKZuvkXHn3Br8HyKNu4yFiZweJz/Eg/BmfeevnOG4jjob0EdLb3knu9kyRREb/gjCQO1YIaFtvAJHciwgQzMXBo1RI/5yRPgGsCtZQCIv3fGxkOYSmVk5Linhd9DUs0WuAKx913I20uUNq4EMW0NUkD X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5092ea6f-26e4-40c4-46b5-08dc1d15d902 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2024 19:51:25.4147 (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: DU2P250MB0350 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/texturedspenc: Remove unused rgtc1_u_alpha encoding func 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: RxX1JWCqN6a2 Effectively reverts 50a20de6b9edd1d893fe0ea652ccf796dd9850fb. Signed-off-by: Andreas Rheinhardt --- libavcodec/texturedspenc.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libavcodec/texturedspenc.c b/libavcodec/texturedspenc.c index 7ae28ea134..54cf6fe6e0 100644 --- a/libavcodec/texturedspenc.c +++ b/libavcodec/texturedspenc.c @@ -647,28 +647,11 @@ static int dxt5ys_block(uint8_t *dst, ptrdiff_t stride, const uint8_t *block) return 16; } -/** - * Compress one block of RGBA pixels in a RGTC1U texture and store the - * resulting bytes in 'dst'. Use the alpha channel of the input image. - * - * @param dst output buffer. - * @param stride scanline in bytes. - * @param block block to compress. - * @return how much texture data has been written. - */ -static int rgtc1u_alpha_block(uint8_t *dst, ptrdiff_t stride, const uint8_t *block) -{ - compress_alpha(dst, stride, block); - - return 8; -} - av_cold void ff_texturedspenc_init(TextureDSPContext *c) { c->dxt1_block = dxt1_block; c->dxt5_block = dxt5_block; c->dxt5ys_block = dxt5ys_block; - c->rgtc1u_alpha_block = rgtc1u_alpha_block; } #define TEXTUREDSP_FUNC_NAME ff_texturedsp_compress_thread