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

android: camera_device: Get properties from configuration

Browse source 
Open the HAL configuration file in the Camera HAL manager and get
the camera properties for each created CameraDevice and initialize it
with them.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
This commit is contained in:
Jacopo Mondi 2021-03-10 16:19:33 +01:00
parent 07c2a4257d
commit 9133c5b2cc
4 changed files with 85 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/android/camera_hal_manager.cpp
View file

@ -41,6 +41,15 @@ int CameraHalManager::init()
{
cameraManager_ = std::make_unique<CameraManager>();
/*
* If the configuration file is not available the HAL only supports
* external cameras. If it exists but it's not valid then error out.
*/
if (halConfig_.exists() && !halConfig_.isValid()) {
LOG(HAL, Error) << "HAL configuration file is not valid";
return -EINVAL;
}
/* Support camera hotplug. */
cameraManager_->cameraAdded.connect(this, &CameraHalManager::cameraAdded);
cameraManager_->cameraRemoved.connect(this, &CameraHalManager::cameraRemoved);
@ -100,6 +109,8 @@ void CameraHalManager::cameraAdded(std::shared_ptr<Camera> cam)
auto iter = cameraIdsMap_.find(cam->id());
if (iter != cameraIdsMap_.end()) {
id = iter->second;
if (id >= firstExternalCameraId_)
isCameraExternal = true;
} else {
isCameraNew = true;
@ -117,7 +128,27 @@ 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);
int ret = camera->initialize();
/*
* The configuration file must be valid, and contain a corresponding
* entry for internal cameras. External cameras can be initialized
* without configuration file.
*/
if (!isCameraExternal && !halConfig_.exists()) {
LOG(HAL, Error)
<< "HAL configuration file is mandatory for internal cameras";
return;
}
const CameraConfigData *cameraConfigData = halConfig_.cameraConfigData(cam->id());
if (!isCameraExternal && !cameraConfigData) {
LOG(HAL, Error)
<< "HAL configuration entry for internal camera "
<< cam->id() << " is missing";
return;
}
int ret = camera->initialize(cameraConfigData);
if (ret) {
LOG(HAL, Error) << "Failed to initialize camera: " << cam->id();
return;