Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-16 00:45:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: Apply 1% tolerance to minFrameDuration capping

Browse source 
We have some stream resolution which can provide slightly better
frame duration than what we cap (i.e. 1/30 fps). The problem with
this is CTS complains if the camera goes faster during the test
than minFrameDuration reported for that resolution. For instance,

1080p minFrameDuration:
	- Nautilus : 33282000ns
	- Soraka   : 33147000ns

Both are less than capped minFrameDuration 1/30 fps (33333333.33ns).

This patch considers this situation and doesn't cap the
minFrameDuration if the hardware can provide frame durations slightly
better. The tolerance considered is 1% only from the cap.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Umang Jain 2021-12-03 12:45:12 +05:30
parent f31be76ae6
commit 37c41aa6a6
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/android/camera_capabilities.cpp
View file

@ -648,7 +648,7 @@ int CameraCapabilities::initializeStreamConfigurations()
int64_t maxFrameDuration = frameDurations->second.max().get<int64_t>() * 1000; int64_t maxFrameDuration = frameDurations->second.max().get<int64_t>() * 1000;
/* /*
* Cap min frame duration to 30 FPS. * Cap min frame duration to 30 FPS with 1% tolerance.
* *
* 30 frames per second has been validated as the most * 30 frames per second has been validated as the most
* opportune frame rate for quality tuning, and power * opportune frame rate for quality tuning, and power
@ -667,8 +667,18 @@ int CameraCapabilities::initializeStreamConfigurations()
* control to be specified for each Request. Defer this * control to be specified for each Request. Defer this
* to the in-development configuration API rework. * to the in-development configuration API rework.
*/ */
if (minFrameDuration < 1e9 / 30.0) int64_t minFrameDurationCap = 1e9 / 30.0;
minFrameDuration = 1e9 / 30.0; if (minFrameDuration < minFrameDurationCap) {
float tolerance =
(minFrameDurationCap - minFrameDuration) * 100.0 / minFrameDurationCap;
/*
* If the tolerance is less than 1%, do not cap
* the frame duration.
*/
if (tolerance > 1.0)
minFrameDuration = minFrameDurationCap;
}
streamConfigurations_.push_back({ streamConfigurations_.push_back({
res, androidFormat, minFrameDuration, maxFrameDuration, res, androidFormat, minFrameDuration, maxFrameDuration,