From 306b0f952fa4191df92770d2b754d594f1cfb0cb Mon Sep 17 00:00:00 2001
From: Milan Zamazal <mzamazal@redhat.com>
Date: Fri, 27 Sep 2024 15:46:08 +0200
Subject: libcamera: software_isp: Move BlackLevel to libcamera::ipa::soft
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@redhat.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
src/ipa/simple/black_level.cpp | 5 +++++
src/ipa/simple/black_level.h | 4 ++++
2 files changed, 9 insertions(+)
(limited to 'src')
diff --git a/src/ipa/simple/black_level.cpp b/src/ipa/simple/black_level.cpp
index cc490eb5..37e0109c 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 5e032f9f..a04230c9 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 */
--
cgit v1.2.1