summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Plowman <david.plowman@raspberrypi.com>2020-06-23 10:14:02 +0100
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-06-25 06:47:53 +0300
commit58e63a6e7e09f271793663024b9777fb6378c33b (patch)
tree8724fd5ffe45351c3c72b153265cbb2570147f9a
parentf68c6eb17ba5b501b5406b134901116969a27cb5 (diff)
libcamera: ipa: raspberrypi: Make sharpening mode_factor an ordinary double
No need for it to be std::atomic as SwitchMode runs synchronously with Prepare. 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>
-rw-r--r--src/ipa/raspberrypi/controller/rpi/sharpen.cpp7
-rw-r--r--src/ipa/raspberrypi/controller/rpi/sharpen.hpp2
2 files changed, 4 insertions, 5 deletions
diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp
index 086952fd..4c2fdb3e 100644
--- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp
@@ -44,13 +44,12 @@ void Sharpen::Read(boost::property_tree::ptree const &params)
void Sharpen::Prepare(Metadata *image_metadata)
{
- double mode_factor = mode_factor_;
struct SharpenStatus status;
// Binned modes seem to need the sharpening toned down with this
// pipeline.
- status.threshold = threshold_ * mode_factor;
- status.strength = strength_ / mode_factor;
- status.limit = limit_ / mode_factor;
+ status.threshold = threshold_ * mode_factor_;
+ status.strength = strength_ / mode_factor_;
+ status.limit = limit_ / mode_factor_;
image_metadata->Set("sharpen.status", status);
}
diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp
index f871aa65..a3bf899d 100644
--- a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp
@@ -26,7 +26,7 @@ private:
double threshold_;
double strength_;
double limit_;
- std::atomic<double> mode_factor_;
+ double mode_factor_;
};
} // namespace RPi