android: CameraDevice: Report proper min and max frame durations
The HAL layer was getting the min and max frame durations from the camera, then rounding it to fps to report as available fps ranges. The same min and max frame durations were then being reported as min and max frame durations. Since the fps are integer values while the frame durations are in ns, this caused a rounding error making it seem like we were reporting an available max fps that was higher than what was allowed by the minimum frame duration. An example is if the minimum frame duration is reported as 33366700ns. The HAL layer would then convert it to fps, which is 29.97, but it would be rounded and reported as 30 fps. When 30 fps is converted to a frame duration it is 33333333ns, which is less than the minimum frame duration that we report. Thus the minimum frame duration that we report contradicts the fps range that we report. Fix this by recalculating the frame durations based on the rounded fps values. This allows the following CTS test to pass: - android.hardware.camera2.cts.SurfaceViewPreviewTest#testPreviewFpsRange Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
parent
63c3c54592
commit
77c6ac0ae7
1 changed files with 7 additions and 0 deletions
|
@ -854,6 +854,13 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
|
|||
int32_t minFps = std::round(1e9 / maxFrameDurationNsec);
|
||||
minFps = std::max(1, minFps);
|
||||
|
||||
/*
|
||||
* Force rounding errors so that we have the proper frame
|
||||
* durations for when we reuse these variables later
|
||||
*/
|
||||
minFrameDurationNsec = 1e9 / maxFps;
|
||||
maxFrameDurationNsec = 1e9 / minFps;
|
||||
|
||||
/*
|
||||
* Register to the camera service {min, max} and {max, max}
|
||||
* intervals as requested by the metadata documentation.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue