summaryrefslogtreecommitdiff
path: root/src/ipa
diff options
context:
space:
mode:
authorDavid Plowman <david.plowman@raspberrypi.com>2021-02-04 09:34:56 +0000
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-02-07 16:09:02 +0200
commit7fab304719d4f3414bdda579bff4e9cab46fc81d (patch)
tree9fad6696c5b6796a05fcc6fce98e8b43ca749645 /src/ipa
parentef3ce74b261bca51088ba49dd5740e801905ab20 (diff)
ipa: raspberrypi: lux: Supply missing method and remove atomic variable
Supply the missing SetCurrentAperture() method (even though no one is calling it). If we did call it, it would be called synchronously so the atomic variable is not required. Signed-off-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/ipa')
-rw-r--r--src/ipa/raspberrypi/controller/rpi/lux.cpp5
-rw-r--r--src/ipa/raspberrypi/controller/rpi/lux.hpp3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ipa/raspberrypi/controller/rpi/lux.cpp b/src/ipa/raspberrypi/controller/rpi/lux.cpp
index aefd92d4..f74381ca 100644
--- a/src/ipa/raspberrypi/controller/rpi/lux.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/lux.cpp
@@ -46,6 +46,11 @@ void Lux::Read(boost::property_tree::ptree const &params)
current_aperture_ = reference_aperture_;
}
+void Lux::SetCurrentAperture(double aperture)
+{
+ current_aperture_ = aperture;
+}
+
void Lux::Prepare(Metadata *image_metadata)
{
std::unique_lock<std::mutex> lock(mutex_);
diff --git a/src/ipa/raspberrypi/controller/rpi/lux.hpp b/src/ipa/raspberrypi/controller/rpi/lux.hpp
index 7b6c7258..f9090484 100644
--- a/src/ipa/raspberrypi/controller/rpi/lux.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/lux.hpp
@@ -6,7 +6,6 @@
*/
#pragma once
-#include <atomic>
#include <mutex>
#include "../lux_status.h"
@@ -34,7 +33,7 @@ private:
double reference_aperture_; // units of 1/f
double reference_Y_; // out of 65536
double reference_lux_;
- std::atomic<double> current_aperture_;
+ double current_aperture_;
LuxStatus status_;
std::mutex mutex_;
};