[libcamera-devel,v3,2/4] libcamera: ipa: raspberrypi: Make sharpening mode_factor an ordinary double
diff mbox series

Message ID 20200623091404.15155-3-david.plowman@raspberrypi.com
State Accepted
Commit 58e63a6e7e09f271793663024b9777fb6378c33b
Headers show
Series
  • libcamera sharpness strength control
Related show

Commit Message

David Plowman June 23, 2020, 9:14 a.m. UTC 
No need for it to be std::atomic as SwitchMode runs synchronously with
Prepare.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
---
 src/ipa/raspberrypi/controller/rpi/sharpen.cpp | 7 +++----
 src/ipa/raspberrypi/controller/rpi/sharpen.hpp | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

Patch
diff mbox series 

diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp
index 086952f..4c2fdb3 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 f871aa6..a3bf899 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