summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2021-06-08 12:03:34 +0100
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-06-08 23:56:18 +0300
commit2db8a767ca2c1a06658716e762b2fa8b4c005983 (patch)
tree2cf1c8d4278c2a738ff72747a26e89a43c8e4fcb
parentcaa753179c039a0ecbfef595c3179aac4bf044d5 (diff)
ipa: raspberrypi: Switch AgcAlgorithm API to use utils::Duration
Switch the AgcAlgorithm API functions to use utils::Duration for all time based variables. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/ipa/raspberrypi/controller/agc_algorithm.hpp7
-rw-r--r--src/ipa/raspberrypi/controller/rpi/agc.cpp13
-rw-r--r--src/ipa/raspberrypi/controller/rpi/agc.hpp6
-rw-r--r--src/ipa/raspberrypi/raspberrypi.cpp6
4 files changed, 17 insertions, 15 deletions
diff --git a/src/ipa/raspberrypi/controller/agc_algorithm.hpp b/src/ipa/raspberrypi/controller/agc_algorithm.hpp
index f97deb0f..134bbcda 100644
--- a/src/ipa/raspberrypi/controller/agc_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/agc_algorithm.hpp
@@ -6,6 +6,7 @@
*/
#pragma once
+#include "libcamera/internal/utils.h"
#include "algorithm.hpp"
namespace RPiController {
@@ -17,9 +18,9 @@ public:
// An AGC algorithm must provide the following:
virtual unsigned int GetConvergenceFrames() const = 0;
virtual void SetEv(double ev) = 0;
- virtual void SetFlickerPeriod(double flicker_period) = 0;
- virtual void SetFixedShutter(double fixed_shutter) = 0; // microseconds
- virtual void SetMaxShutter(double max_shutter) = 0; // microseconds
+ virtual void SetFlickerPeriod(libcamera::utils::Duration flicker_period) = 0;
+ virtual void SetFixedShutter(libcamera::utils::Duration fixed_shutter) = 0;
+ virtual void SetMaxShutter(libcamera::utils::Duration max_shutter) = 0;
virtual void SetFixedAnalogueGain(double fixed_analogue_gain) = 0;
virtual void SetMeteringMode(std::string const &metering_mode_name) = 0;
virtual void SetExposureMode(std::string const &exposure_mode_name) = 0;
diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp
index f4cd5d26..fd3359a7 100644
--- a/src/ipa/raspberrypi/controller/rpi/agc.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp
@@ -21,6 +21,7 @@
using namespace RPiController;
using namespace libcamera;
+using libcamera::utils::Duration;
LOG_DEFINE_CATEGORY(RPiAgc)
@@ -222,19 +223,19 @@ void Agc::SetEv(double ev)
ev_ = ev;
}
-void Agc::SetFlickerPeriod(double flicker_period)
+void Agc::SetFlickerPeriod(Duration flicker_period)
{
- flicker_period_ = flicker_period;
+ flicker_period_ = flicker_period.get<std::micro>();
}
-void Agc::SetMaxShutter(double max_shutter)
+void Agc::SetMaxShutter(Duration max_shutter)
{
- max_shutter_ = max_shutter;
+ max_shutter_ = max_shutter.get<std::micro>();
}
-void Agc::SetFixedShutter(double fixed_shutter)
+void Agc::SetFixedShutter(Duration fixed_shutter)
{
- fixed_shutter_ = fixed_shutter;
+ fixed_shutter_ = fixed_shutter.get<std::micro>();
// Set this in case someone calls Pause() straight after.
status_.shutter_time = clipShutter(fixed_shutter_);
}
diff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp
index 0427fb59..b52aaa23 100644
--- a/src/ipa/raspberrypi/controller/rpi/agc.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp
@@ -77,9 +77,9 @@ public:
void Resume() override;
unsigned int GetConvergenceFrames() const override;
void SetEv(double ev) override;
- void SetFlickerPeriod(double flicker_period) override;
- void SetMaxShutter(double max_shutter) override; // microseconds
- void SetFixedShutter(double fixed_shutter) override; // microseconds
+ void SetFlickerPeriod(libcamera::utils::Duration flicker_period) override;
+ void SetMaxShutter(libcamera::utils::Duration max_shutter) override;
+ void SetFixedShutter(libcamera::utils::Duration fixed_shutter) override;
void SetFixedAnalogueGain(double fixed_analogue_gain) override;
void SetMeteringMode(std::string const &metering_mode_name) override;
void SetExposureMode(std::string const &exposure_mode_name) override;
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index 33b316b9..4aa8ccaa 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -638,8 +638,8 @@ void IPARPi::queueRequest(const ControlList &controls)
break;
}
- /* This expects units of micro-seconds. */
- agc->SetFixedShutter(ctrl.second.get<int32_t>());
+ /* The control provides units of microseconds. */
+ agc->SetFixedShutter(ctrl.second.get<int32_t>() * 1.0us);
libcameraMetadata_.set(controls::ExposureTime, ctrl.second.get<int32_t>());
break;
@@ -1091,7 +1091,7 @@ void IPARPi::applyFrameDurations(Duration minFrameDuration, Duration maxFrameDur
RPiController::AgcAlgorithm *agc = dynamic_cast<RPiController::AgcAlgorithm *>(
controller_.GetAlgorithm("agc"));
- agc->SetMaxShutter(maxShutter.get<std::micro>());
+ agc->SetMaxShutter(maxShutter);
}
void IPARPi::applyAGC(const struct AgcStatus *agcStatus, ControlList &ctrls)