[PATCH v8 02/18] libcamera: software_isp: Move BlackLevel to libcamera::ipa::soft

Milan Zamazal mzamazal at redhat.com
Fri Sep 27 15:46:08 CEST 2024


IPA modules use custom namespaces for all their internal components to
avoid namespace clashes. The simple IPA module for the software ISP uses
libcamera::ipa::soft for this purpose. It however defines an internal
class named BlackLevel in the root of the libcamera namespace, making it
prone to clashes. Move it to the ipa::soft namespace along with the rest
of the code.

Signed-off-by: Milan Zamazal <mzamazal at redhat.com>
Reviewed-by: Umang Jain <umang.jain at ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally at ideasonboard.com>
---
 src/ipa/simple/black_level.cpp | 5 +++++
 src/ipa/simple/black_level.h   | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/ipa/simple/black_level.cpp b/src/ipa/simple/black_level.cpp
index cc490eb5c..37e0109ce 100644
--- a/src/ipa/simple/black_level.cpp
+++ b/src/ipa/simple/black_level.cpp
@@ -15,6 +15,8 @@ namespace libcamera {
 
 LOG_DEFINE_CATEGORY(IPASoftBL)
 
+namespace ipa::soft {
+
 /**
  * \class BlackLevel
  * \brief Object providing black point level for software ISP
@@ -85,4 +87,7 @@ void BlackLevel::update(SwIspStats::Histogram &yHistogram)
 		}
 	};
 }
+
+} /* namespace ipa::soft */
+
 } /* namespace libcamera */
diff --git a/src/ipa/simple/black_level.h b/src/ipa/simple/black_level.h
index 5e032f9fb..a04230c9c 100644
--- a/src/ipa/simple/black_level.h
+++ b/src/ipa/simple/black_level.h
@@ -14,6 +14,8 @@
 
 namespace libcamera {
 
+namespace ipa::soft {
+
 class BlackLevel
 {
 public:
@@ -26,4 +28,6 @@ private:
 	bool blackLevelSet_;
 };
 
+} /* namespace ipa::soft */
+
 } /* namespace libcamera */
-- 
2.44.1



More information about the libcamera-devel mailing list