NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

android: capabilities: Initialize camera state when building properties

Browse source 
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@jmondi.org>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Jacopo Mondi 2021-06-30 14:19:00 +02:00
parent 56ee14e16d
commit 5a995a01bc
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/android/camera_capabilities.cpp
View file

@ -394,11 +394,14 @@ int CameraCapabilities::initialize(std::shared_ptr<Camera> camera,
} }
ret = initializeStreamConfigurations(); ret = initializeStreamConfigurations();
camera_->release(); if (ret) {
if (ret) camera_->release();
return ret; return ret;
}
return initializeStaticMetadata(); ret = initializeStaticMetadata();
camera_->release();
return ret;
} }
std::vector<Size> std::vector<Size>
@ -696,6 +699,25 @@ int CameraCapabilities::initializeStaticMetadata()
return -EINVAL; return -EINVAL;
} }
/*
* Generate and apply a new configuration for the Viewfinder role to
* collect control limits and properties from a known state.
*/
std::unique_ptr<CameraConfiguration> cameraConfig =
camera_->generateConfiguration({ StreamRole::Viewfinder });
if (!cameraConfig) {
LOG(HAL, Error) << "Failed to generate camera configuration";
staticMetadata_.reset();
return -ENODEV;
}
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 ControlInfoMap &controlsInfo = camera_->controls();
const ControlList &properties = camera_->properties(); const ControlList &properties = camera_->properties();