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

android: capabilties: Assume controls::FrameDurationLimits is supported

Browse source 
As we now collect the per-stream frame durations at
initializeStreamConfigurations() times, the Camera is now guaranteed to
support the controls::FrameDurationLimits control.

Remove the check for its presence when populating the
ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES 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:37:21 +02:00
parent 5a995a01bc
commit e3d7206fb5
1 changed files with 41 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/android/camera_capabilities.cpp
View file

@ -882,12 +882,10 @@ int CameraCapabilities::initializeStaticMetadata()
staticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_MODES, staticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_MODES,
aeAvailableModes); aeAvailableModes);
int64_t minFrameDurationNsec = -1; /* Initialize the AE frame duration limits. */
int64_t maxFrameDurationNsec = -1;
const auto frameDurationsInfo = controlsInfo.find(&controls::FrameDurationLimits); const auto frameDurationsInfo = controlsInfo.find(&controls::FrameDurationLimits);
if (frameDurationsInfo != controlsInfo.end()) { int64_t minFrameDurationNsec = frameDurationsInfo->second.min().get<int64_t>() * 1000;
minFrameDurationNsec = frameDurationsInfo->second.min().get<int64_t>() * 1000; int64_t maxFrameDurationNsec = frameDurationsInfo->second.max().get<int64_t>() * 1000;
maxFrameDurationNsec = frameDurationsInfo->second.max().get<int64_t>() * 1000;
/* /*
* Adjust the minimum frame duration to comply with Android * Adjust the minimum frame duration to comply with Android
@ -930,7 +928,6 @@ int CameraCapabilities::initializeStaticMetadata()
}; };
staticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES, staticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,
availableAeFpsTarget); availableAeFpsTarget);
}
std::vector<int32_t> aeCompensationRange = { std::vector<int32_t> aeCompensationRange = {
0, 0, 0, 0,