[libcamera-devel,v4,11/16] android: capabilities: Collect absolute max frame durations
diff mbox series

Message ID 20211014174208.50509-12-jacopo@jmondi.org
State Accepted
Headers show
Series
  • IPU3 control info update and HAL frame durations
Related show

Commit Message

Jacopo Mondi Oct. 14, 2021, 5:42 p.m. UTC 
While building the list of supported stream configurations also collect
the absolute max frame durations to be used to populate the sensor
maximum frame duration.

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>
---
 src/android/camera_capabilities.cpp | 9 ++++++---
 src/android/camera_capabilities.h   | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

Patch
diff mbox series 

diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
index b92af5deac08..43ef2ee6ec74 100644
--- a/src/android/camera_capabilities.cpp
+++ b/src/android/camera_capabilities.cpp
@@ -385,6 +385,7 @@  int CameraCapabilities::initialize(std::shared_ptr<Camera> camera,
 	orientation_ = orientation;
 	facing_ = facing;
 	rawStreamAvailable_ = false;
+	maxFrameDuration_ = 0;
 
 	/* Acquire the camera and initialize available stream configurations. */
 	int ret = camera_->acquire();
@@ -673,6 +674,9 @@  int CameraCapabilities::initializeStreamConfigurations()
 				});
 				maxJpegSize = std::max(maxJpegSize, res);
 			}
+
+			maxFrameDuration_ = std::max(maxFrameDuration_,
+						     maxFrameDuration);
 		}
 
 		/*
@@ -1154,9 +1158,8 @@  int CameraCapabilities::initializeStaticMetadata()
 	staticMetadata_->addEntry(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,
 				  timestampSource);
 
-	if (maxFrameDurationNsec > 0)
-		staticMetadata_->addEntry(ANDROID_SENSOR_INFO_MAX_FRAME_DURATION,
-					  maxFrameDurationNsec);
+	staticMetadata_->addEntry(ANDROID_SENSOR_INFO_MAX_FRAME_DURATION,
+				  maxFrameDuration_);
 
 	/* Statistics static metadata. */
 	uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;
diff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h
index 6e55ddab445e..2cf97ae80095 100644
--- a/src/android/camera_capabilities.h
+++ b/src/android/camera_capabilities.h
@@ -71,6 +71,7 @@  private:
 	int facing_;
 	int orientation_;
 	bool rawStreamAvailable_;
+	int64_t maxFrameDuration_;
 	camera_metadata_enum_android_info_supported_hardware_level hwLevel_;
 	std::set<camera_metadata_enum_android_request_available_capabilities> capabilities_;