[libcamera-devel] [PATCH 05/16] android: capabilities: Initialize camera state when building properties
Jacopo Mondi
jacopo at jmondi.org
Fri Aug 27 14:07:46 CEST 2021
Now that building the list of supported stream configuration requires
applying a configuration to the Camera, re-initialize the camera
controls by applying a configuration generated for the Viewfinder stream
role before building the list of static metadata.
Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
---
src/android/camera_capabilities.cpp | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
index fdda90379ce2..723a4fd5a880 100644
--- a/src/android/camera_capabilities.cpp
+++ b/src/android/camera_capabilities.cpp
@@ -394,11 +394,14 @@ int CameraCapabilities::initialize(std::shared_ptr<libcamera::Camera> camera,
}
ret = initializeStreamConfigurations();
- camera_->release();
- if (ret)
+ if (ret) {
+ camera_->release();
return ret;
+ }
- return initializeStaticMetadata();
+ ret = initializeStaticMetadata();
+ camera_->release();
+ return ret;
}
std::vector<Size>
@@ -682,6 +685,15 @@ int CameraCapabilities::initializeStaticMetadata()
return -EINVAL;
}
+ std::unique_ptr<CameraConfiguration> cameraConfig =
+ camera_->generateConfiguration({ StreamRole::Viewfinder });
+ int ret = camera_->configure(cameraConfig.get());
+ if (ret) {
+ LOG(HAL, Error) << "Failed to initialize the camera state";
+ staticMetadata_.reset();
+ return ret;
+ }
+
const ControlInfoMap &controlsInfo = camera_->controls();
const ControlList &properties = camera_->properties();
--
2.32.0
More information about the libcamera-devel
mailing list