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);