summaryrefslogtreecommitdiff
path: root/src/ipa
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/ipa
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/ipa')
-rw-r--r--src/ipa/raspberrypi/raspberrypi.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index e5bb8159..0c4752ec 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -859,7 +859,7 @@ void IPARPi::queueRequest(const ControlList &controls)
break;
}
- case controls::FRAME_DURATIONS: {
+ case controls::FRAME_DURATION_LIMITS: {
auto frameDurations = ctrl.second.get<Span<const int64_t>>();
applyFrameDurations(frameDurations[0], frameDurations[1]);
break;
@@ -1074,7 +1074,7 @@ void IPARPi::applyFrameDurations(double minFrameDuration, double maxFrameDuratio
maxFrameDuration_ = std::max(maxFrameDuration_, minFrameDuration_);
/* Return the validated limits via metadata. */
- libcameraMetadata_.set(controls::FrameDurations,
+ libcameraMetadata_.set(controls::FrameDurationLimits,
{ static_cast<int64_t>(minFrameDuration_),
static_cast<int64_t>(maxFrameDuration_) });