summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUmang Jain <umang.jain@ideasonboard.com>2021-07-30 16:31:51 +0530
committerUmang Jain <umang.jain@ideasonboard.com>2021-08-04 09:03:23 +0530
commitcc0a50cddf8a45cc1402b0739275bf619e9c46d3 (patch)
tree609bb3fe2211d6eda43dfec44d1112f7df4c14ae
parentc615807bc420d3ce8fe2091ae99789077cb094a1 (diff)
android: Instantiate CameraDevice after checking HAL config validity
Currently CameraDevice wrapper is created first and then HAL config validity is checked. If the validity checks fail, the code path will simply return, in which case, creating CameraDevice seems a futile exercise. This patch defers the creation of CameraDevice wrapper until the HAL config validity is checked for internal cameras. This will also enable us to infer a few things beforehand, by reading the config file before creating the CameraDevice wrapper. Signed-off-by: Umang Jain <umang.jain@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
-rw-r--r--src/android/camera_hal_manager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp
index 4cd67544..b364f62a 100644
--- a/src/android/camera_hal_manager.cpp
+++ b/src/android/camera_hal_manager.cpp
@@ -133,9 +133,6 @@ void CameraHalManager::cameraAdded(std::shared_ptr<Camera> cam)
}
}
- /* Create a CameraDevice instance to wrap the libcamera Camera. */
- std::unique_ptr<CameraDevice> camera = CameraDevice::create(id, cam);
-
/*
* The configuration file must be valid, and contain a corresponding
* entry for internal cameras. External cameras can be initialized
@@ -155,6 +152,9 @@ void CameraHalManager::cameraAdded(std::shared_ptr<Camera> cam)
return;
}
+ /* Create a CameraDevice instance to wrap the libcamera Camera. */
+ std::unique_ptr<CameraDevice> camera = CameraDevice::create(id, cam);
+
int ret = camera->initialize(cameraConfigData);
if (ret) {
LOG(HAL, Error) << "Failed to initialize camera: " << cam->id();