From 1b54a0dbae238b797caedf81e8b84174cc9e2c42 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Fri, 24 Dec 2021 15:55:37 +0200 Subject: [PATCH] android: Fallback to some default min/max frame duration Instead of failing to initialize pipeline. (uvccamera pipeline doesn't expose these controls) Signed-off-by: Roman Stratiienko --- src/android/camera_capabilities.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index b161bc6b..941c2f61 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -656,18 +656,20 @@ int CameraCapabilities::initializeStreamConfigurations() if (ret) return ret; + int64_t minFrameDuration = 1e9 / 30.0; + int64_t maxFrameDuration = 1e9 / 1.0; + const ControlInfoMap &controls = camera_->controls(); const auto frameDurations = controls.find( &controls::FrameDurationLimits); if (frameDurations == controls.end()) { - LOG(HAL, Error) + LOG(HAL, Warning) << "Camera does not report frame durations"; - return -EINVAL; + } else { + minFrameDuration = frameDurations->second.min().get() * 1000; + maxFrameDuration = frameDurations->second.max().get() * 1000; } - int64_t minFrameDuration = frameDurations->second.min().get() * 1000; - int64_t maxFrameDuration = frameDurations->second.max().get() * 1000; - /* * Cap min frame duration to 30 FPS with 1% tolerance. *