From patchwork Wed May 21 13:21:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 23413 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 8A961BD78E for ; Wed, 21 May 2025 13:21:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6C3E168D97; Wed, 21 May 2025 15:21:34 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="CNd0M4TK"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BCE0168D85 for ; Wed, 21 May 2025 15:21:30 +0200 (CEST) Received: from [127.0.1.1] (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3960F9E5; Wed, 21 May 2025 15:21:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1747833669; bh=iTMoWhQ1HTY+rynjybrVk6/R4TSeYAmMTbJcHmzyT2w=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CNd0M4TKfvEToZ3JQuIGsEDONU1Yra/dCht2+UAQZBQYk9SLlRm+vo3EyoclMuT5x lpmJpmOHZmshB/fIpgf2Z5gxPL4Zs4XiHSZthGfOyp0ROiO9hhII5xPJUyxM3igxL7 K8YRFlX+DVkDrfkA0g45SsGJZdyYb5ee/4DcoWyA= From: Daniel Scally Date: Wed, 21 May 2025 14:21:01 +0100 Subject: [PATCH 1/2] libcamera/mali-c55: Remove tpgCodes_ MIME-Version: 1.0 Message-Id: <20250521-djrscally-c55-cleanup-v1-1-aa171b2aed38@ideasonboard.com> References: <20250521-djrscally-c55-cleanup-v1-0-aa171b2aed38@ideasonboard.com> In-Reply-To: <20250521-djrscally-c55-cleanup-v1-0-aa171b2aed38@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Daniel Scally X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1196; i=dan.scally@ideasonboard.com; h=from:subject:message-id; bh=iTMoWhQ1HTY+rynjybrVk6/R4TSeYAmMTbJcHmzyT2w=; b=owEBbQKS/ZANAwAKAchJV3psRXUyAcsmYgBoLdNYpQOybcc+uEh64PH0S0ZEofixS7kCoRdNp zWu/nZX4PKJAjMEAAEKAB0WIQQqyuwyDnZdb+mxmm/ISVd6bEV1MgUCaC3TWAAKCRDISVd6bEV1 MsghEACj7GPYGVyH7ZivlRXb1ghKHRaEtydGg1nFPMe9fF9qVygHTzfXR0kkivpLmAwM7OOm1bS qMannCuXxPNBBGiM6u1FGLB7ZyKmDK8Fh3RRS3YVNM/fi8G122xDBhAmEkaIqzS7tajdLa0baoT 4TJ5k3uVGSJhf1bKD05MCKh3AGGVvpRZ9Pq4uxGEzrMOjb9ceRWISIKQg3q3cESa1i1NTJWxh2F A77mWttLKROG2LxM8UQCCfJ38xRMKXH1rc9kr5fJ80JNd3bD70upFvWwlRBptwWF4JlWVX3z+Xy f6eC3duBFaQTse+T9fUSs2cAPtxY8GaSp45iQYh2ED0LsGPCstixQXDr1QXSoymoy0rWASow9hQ v4GQP60GajfpPg1H+sn+g6YJkH4W3xrLRm4iREfYpK7A0EubtpHYd7fM5VKTfYjZXDseqjnsUXR Uhq5nwDj8jMMlyjaV6VeRF6HeglMwKloqGTRji9QgwFe/mYLfVG8WuWeEascn+Zx2+TSlh3ejsc kwehOVp6/GwPvq1MhC7RVW/bx8M+CSoqePCA8kMbcscu7MzsjW6STDwSeSLstyYYkNbJIJEZNSp +TjWmUWVBee/9LvF8DNt3KbVTGxdXsiiPh6d9bFenZH8kJ5rVkVmCBGxBzn66DOaVx7HyB3LaDG 8UrioQSgNc7mRvQ== X-Developer-Key: i=dan.scally@ideasonboard.com; a=openpgp; fpr=EEC699ACA1B7CB5D31330C0BBD501C2A3546CCF6 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" MaliC55CameraData stores a vector of the TPG's mbus codes (if the camera in question is a TPG). This is never used - remove it. Signed-off-by: Daniel Scally Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/mali-c55/mali-c55.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp index a05e11fccf8dfde1a0eeda994afe2d78d884c530..35372ee1ed6f694166c395088c65509d32b9d1f2 100644 --- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp +++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp @@ -131,7 +131,6 @@ private: void setSensorControls(const ControlList &sensorControls); std::string id_; - std::vector tpgCodes_; std::vector tpgSizes_; Size tpgResolution_; }; @@ -180,9 +179,6 @@ void MaliC55CameraData::initTPGData() if (formats.empty()) return; - tpgCodes_ = utils::map_keys(formats); - std::sort(tpgCodes_.begin(), tpgCodes_.end()); - for (const auto &format : formats) { const std::vector &ranges = format.second; std::transform(ranges.begin(), ranges.end(), std::back_inserter(tpgSizes_), From patchwork Wed May 21 13:21:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 23414 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 67ECCBD78E for ; Wed, 21 May 2025 13:21:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A4BB168D9A; Wed, 21 May 2025 15:21:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MVTnURyC"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DCDF468D8E for ; Wed, 21 May 2025 15:21:30 +0200 (CEST) Received: from [127.0.1.1] (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6EC09E8A; Wed, 21 May 2025 15:21:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1747833669; bh=csuodIz9Yl1ShfGdzGSCyBgu4RHAswwnYKSpI6Gkssc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MVTnURyCShumiUqLhNnycnHWoviY9c8UOlX7bWi4zcEgrKat2IATalT2yKny57Zi8 ArOlIHB979badvFYNonSTqY0BwaxauQeAF9oSsQW16yAmWxXe/PYwXjpo10ges1Z4j jLijnhPt9BXY+YAELLlIjz2DmUkDw8L7+pAILock= From: Daniel Scally Date: Wed, 21 May 2025 14:21:02 +0100 Subject: [PATCH 2/2] libcamera/mali-c55: Remove tpgSizes_ member from MaliC55CameraData MIME-Version: 1.0 Message-Id: <20250521-djrscally-c55-cleanup-v1-2-aa171b2aed38@ideasonboard.com> References: <20250521-djrscally-c55-cleanup-v1-0-aa171b2aed38@ideasonboard.com> In-Reply-To: <20250521-djrscally-c55-cleanup-v1-0-aa171b2aed38@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Daniel Scally X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1614; i=dan.scally@ideasonboard.com; h=from:subject:message-id; bh=csuodIz9Yl1ShfGdzGSCyBgu4RHAswwnYKSpI6Gkssc=; b=owEBbQKS/ZANAwAKAchJV3psRXUyAcsmYgBoLdNZd83Ekw4BCvdUpZQ5LYHsPl5hZaUvFNhMb g1Wnk7Qo32JAjMEAAEKAB0WIQQqyuwyDnZdb+mxmm/ISVd6bEV1MgUCaC3TWQAKCRDISVd6bEV1 MjgKD/9rzNXXupOHS1Fc4vXzYxUL0jcVu0mS1MWJUBcb9TObElr9AFzrGBSm34nrAICjhxzhwLI INGq5bBiPvbPpXKRVG+m5MiGLX6wji36YQSPYtAUZJQ+o3I09gLLmSTjftR8QKaQFDPRCgmv8l2 58eufbHHvmk+h1t2z+TnsnSmZRO25CIrDMeTZlTui2RP/1m+F9OlsXVF6rQkL+Ofumogi2LVzot bjV/myo/AuZKb1rIfjpa54gUPJj2sIdBFuTIS3nT6hAUuZG8hJrbLDZD3wG8Y8PJJ6cuYO7Bkus 461M9jlHu8SdCbMY8MJOeBc5HUbFoytafyukcZ+FZSKvaQ5VZMsNcAORCDjhSYA/oq+d1IRwC8L 4AoFfevHv+fYEcA8QgzJ7MeF3hcGLuBDj2UuYYuoAvQukLDl/ysHZ4HclXsiWI0Uif/5dmBJfHW PSKCPJ6d/n2pxMSN7xGrv+XpIgAl1941mMqhJ7AflVt8Yd82uF7rJ2pKp0LfeS6qbQRWZ3qWd8u nsSIOYwy0hp4FwJrNgFsZMEfTyymUQY43GTFfiZ5hBDYzEfF6paPThR0kwk+QXCWygkqeITsyyu hnTeTbwEXH5HNjW7I6Pt0QfPfut8eEArsoZB5pOP9YFR/IXBeRtCGEZycCOrkr5uyZwUbyxatz0 lURtAXCxdDiCgcQ== X-Developer-Key: i=dan.scally@ideasonboard.com; a=openpgp; fpr=EEC699ACA1B7CB5D31330C0BBD501C2A3546CCF6 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The tpgSizes_ vector is only used within the initTPGData() function. Drop it and use a local variable instead. Signed-off-by: Daniel Scally Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/mali-c55/mali-c55.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp index 35372ee1ed6f694166c395088c65509d32b9d1f2..e8c03ee9aafb44d47e3853e9987f8749dc385bb2 100644 --- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp +++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp @@ -131,7 +131,6 @@ private: void setSensorControls(const ControlList &sensorControls); std::string id_; - std::vector tpgSizes_; Size tpgResolution_; }; @@ -174,6 +173,8 @@ int MaliC55CameraData::init() void MaliC55CameraData::initTPGData() { + std::vector tpgSizes; + /* Replicate the CameraSensor implementation for TPG. */ V4L2Subdevice::Formats formats = sd_->formats(0); if (formats.empty()) @@ -181,11 +182,11 @@ void MaliC55CameraData::initTPGData() for (const auto &format : formats) { const std::vector &ranges = format.second; - std::transform(ranges.begin(), ranges.end(), std::back_inserter(tpgSizes_), + std::transform(ranges.begin(), ranges.end(), std::back_inserter(tpgSizes), [](const SizeRange &range) { return range.max; }); } - tpgResolution_ = tpgSizes_.back(); + tpgResolution_ = tpgSizes.back(); } void MaliC55CameraData::setSensorControls(const ControlList &sensorControls)