From patchwork Mon Nov 3 14:47:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 24953 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 11506BDE4C for ; Mon, 3 Nov 2025 14:48:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 460DD609D8; Mon, 3 Nov 2025 15:48:01 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Jh78ht92"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5F3F8606A0 for ; Mon, 3 Nov 2025 15:47:59 +0100 (CET) Received: from pb-laptop.local (185.221.140.239.nat.pool.zt.hu [185.221.140.239]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5A7E87CE for ; Mon, 3 Nov 2025 15:46:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1762181166; bh=Y5cgqOHvfukGziZ5lwQeNaZKDG0kYHRnHzJHRApueHE=; h=From:To:Subject:Date:From; b=Jh78ht924dmeqd1/rJEqfjrAHaxy0i2AbNqBUwn4/Us79PMRUEodOUq0Dy5aYDlTp E1p/cU/QSL8uDqhZVm+568dtXwuR4BTsSeelP+3Hd1Y/orFiwmeqefpAJfyP7x+LDH f8ifdf19d7d6ukHV75mq6k6EDivrWU/WOcssXIvk= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1] android: camera_hal_manager: Remove `cameraLocation()` Date: Mon, 3 Nov 2025 15:47:55 +0100 Message-ID: <20251103144755.438422-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.51.2 MIME-Version: 1.0 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" Inline the function as it is only used in a single place and does not do anything complicated. This also lets the `operator==` of `std::optional` take care of the proper comparison instead of defaulting the value to -1 and comparing that. Signed-off-by: Barnabás Pőcze Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/android/camera_hal_manager.cpp | 7 +------ src/android/camera_hal_manager.h | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp index 7500c749be..a7a2571754 100644 --- a/src/android/camera_hal_manager.cpp +++ b/src/android/camera_hal_manager.cpp @@ -125,7 +125,7 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam) * Now check if this is an external camera and assign * its id accordingly. */ - if (cameraLocation(cam.get()) == properties::CameraLocationExternal) { + if (cam->properties().get(properties::Location) == properties::CameraLocationExternal) { isCameraExternal = true; id = nextExternalCameraId_; } else { @@ -227,11 +227,6 @@ void CameraHalManager::cameraRemoved(std::shared_ptr cam) LOG(HAL, Debug) << "Camera ID: " << id << " removed successfully."; } -int32_t CameraHalManager::cameraLocation(const Camera *cam) -{ - return cam->properties().get(properties::Location).value_or(-1); -} - CameraDevice *CameraHalManager::cameraDeviceFromHalId(unsigned int id) { auto iter = std::find_if(cameras_.begin(), cameras_.end(), diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h index 836a8daf70..e2d4eacbb5 100644 --- a/src/android/camera_hal_manager.h +++ b/src/android/camera_hal_manager.h @@ -48,8 +48,6 @@ private: CameraHalManager(); - static int32_t cameraLocation(const libcamera::Camera *cam); - void cameraAdded(std::shared_ptr cam); void cameraRemoved(std::shared_ptr cam);