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

85
src/android/camera_capabilities.cpp
View file

@ -882,55 +882,52 @@ 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
* requirements. The camera service mandates all preview/record * requirements. The camera service mandates all preview/record
* streams to have a minimum frame duration < 33,366 milliseconds * streams to have a minimum frame duration < 33,366 milliseconds
* (see MAX_PREVIEW_RECORD_DURATION_NS in the camera service * (see MAX_PREVIEW_RECORD_DURATION_NS in the camera service
* implementation). * implementation).
* *
* If we're close enough (+ 500 useconds) to that value, round * If we're close enough (+ 500 useconds) to that value, round
* the minimum frame duration of the camera to an accepted * the minimum frame duration of the camera to an accepted
* value. * value.
*/ */
static constexpr int64_t MAX_PREVIEW_RECORD_DURATION_NS = 1e9 / 29.97; static constexpr int64_t MAX_PREVIEW_RECORD_DURATION_NS = 1e9 / 29.97;
if (minFrameDurationNsec > MAX_PREVIEW_RECORD_DURATION_NS && if (minFrameDurationNsec > MAX_PREVIEW_RECORD_DURATION_NS &&
minFrameDurationNsec < MAX_PREVIEW_RECORD_DURATION_NS + 500000) minFrameDurationNsec < MAX_PREVIEW_RECORD_DURATION_NS + 500000)
minFrameDurationNsec = MAX_PREVIEW_RECORD_DURATION_NS - 1000; minFrameDurationNsec = MAX_PREVIEW_RECORD_DURATION_NS - 1000;
/* /*
* The AE routine frame rate limits are computed using the frame * The AE routine frame rate limits are computed using the frame
* duration limits, as libcamera clips the AE routine to the * duration limits, as libcamera clips the AE routine to the
* frame durations. * frame durations.
*/ */
int32_t maxFps = std::round(1e9 / minFrameDurationNsec); int32_t maxFps = std::round(1e9 / minFrameDurationNsec);
int32_t minFps = std::round(1e9 / maxFrameDurationNsec); int32_t minFps = std::round(1e9 / maxFrameDurationNsec);
minFps = std::max(1, minFps); minFps = std::max(1, minFps);
/* /*
* Force rounding errors so that we have the proper frame * Force rounding errors so that we have the proper frame
* durations for when we reuse these variables later * durations for when we reuse these variables later
*/ */
minFrameDurationNsec = 1e9 / maxFps; minFrameDurationNsec = 1e9 / maxFps;
maxFrameDurationNsec = 1e9 / minFps; maxFrameDurationNsec = 1e9 / minFps;
/* /*
* Register to the camera service {min, max} and {max, max} * Register to the camera service {min, max} and {max, max}
* intervals as requested by the metadata documentation. * intervals as requested by the metadata documentation.
*/ */
int32_t availableAeFpsTarget[] = { int32_t availableAeFpsTarget[] = {
minFps, maxFps, maxFps, maxFps minFps, maxFps, maxFps, maxFps
}; };
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,