From 9a608ed72d2b99f28ded00afcd63584236d3cf95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Mon, 3 Nov 2025 15:31:01 +0100 Subject: [PATCH] android: camera_hal_manager: Remove `cameraLocation()` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 7500c749..a7a25717 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 836a8daf..e2d4eacb 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);