summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorPaul Elder <paul.elder@ideasonboard.com>2021-05-24 18:37:14 +0900
committerPaul Elder <paul.elder@ideasonboard.com>2021-05-27 17:05:25 +0900
commit19772ffe102ab2e72d0f9f1403e0c02fcca4424d (patch)
tree4245aef0383ef4fc2ef36e82da3accd36e1dd71a /src/android
parentc0a9768a9bfb8f61e9d21d2f150daa5336537e80 (diff)
controls: Split FrameDurations into FrameDuration and FrameDurationLimits
We need a separate control to report the nominal frame duration, but it's also useful to report the min/max frame duration values that will be used. Split the FrameDurations control into FrameDuration and FrameDurationLimits respectively to support both of these. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/camera_device.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 7fc4ddb0..ee6ba28a 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -864,7 +864,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
int64_t minFrameDurationNsec = -1;
int64_t maxFrameDurationNsec = -1;
- const auto frameDurationsInfo = controlsInfo.find(&controls::FrameDurations);
+ const auto frameDurationsInfo = controlsInfo.find(&controls::FrameDurationLimits);
if (frameDurationsInfo != controlsInfo.end()) {
minFrameDurationNsec = frameDurationsInfo->second.min().get<int64_t>() * 1000;
maxFrameDurationNsec = frameDurationsInfo->second.max().get<int64_t>() * 1000;