summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/android/camera_capabilities.cpp9
-rw-r--r--src/android/camera_capabilities.h1
2 files changed, 7 insertions, 3 deletions
diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
index b92af5de..43ef2ee6 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 6e55ddab..2cf97ae8 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_;