summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/ipa_manager.cpp20
-rw-r--r--src/libcamera/pipeline/raspberrypi/raspberrypi.cpp2
-rw-r--r--src/libcamera/pipeline/rkisp1/rkisp1.cpp2
-rw-r--r--src/libcamera/pipeline/vimc/vimc.cpp2
4 files changed, 6 insertions, 20 deletions
diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
index e7fddf42..d7a75104 100644
--- a/src/libcamera/ipa_manager.cpp
+++ b/src/libcamera/ipa_manager.cpp
@@ -99,8 +99,7 @@ IPAManager *IPAManager::self_ = nullptr;
* \brief Construct an IPAManager instance
*
* The IPAManager class is meant to only be instantiated once, by the
- * CameraManager. Pipeline handlers shall use the instance() function to access
- * the IPAManager instance.
+ * CameraManager.
*/
IPAManager::IPAManager()
{
@@ -160,19 +159,6 @@ IPAManager::~IPAManager()
}
/**
- * \brief Retrieve the IPA manager instance
- *
- * The IPAManager is constructed by the CameraManager. This function shall be
- * used to retrieve the single instance of the manager.
- *
- * \return The IPA manager instance
- */
-IPAManager *IPAManager::instance()
-{
- return self_;
-}
-
-/**
* \brief Identify shared library objects within a directory
* \param[in] libDir The directory to search for shared objects
* \param[in] maxDepth The maximum depth of sub-directories to parse
@@ -273,7 +259,7 @@ std::unique_ptr<IPAProxy> IPAManager::createIPA(PipelineHandler *pipe,
{
IPAModule *m = nullptr;
- for (IPAModule *module : modules_) {
+ for (IPAModule *module : self_->modules_) {
if (module->match(pipe, minVersion, maxVersion)) {
m = module;
break;
@@ -289,7 +275,7 @@ std::unique_ptr<IPAProxy> IPAManager::createIPA(PipelineHandler *pipe,
*
* \todo Implement a better proxy selection
*/
- const char *proxyName = isSignatureValid(m)
+ const char *proxyName = self_->isSignatureValid(m)
? "IPAProxyThread" : "IPAProxyLinux";
IPAProxyFactory *pf = nullptr;
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index e16a9c7f..b9b88506 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -1118,7 +1118,7 @@ void RPiCameraData::frameStarted(uint32_t sequence)
int RPiCameraData::loadIPA()
{
- ipa_ = IPAManager::instance()->createIPA(pipe_, 1, 1);
+ ipa_ = IPAManager::createIPA(pipe_, 1, 1);
if (!ipa_)
return -ENOENT;
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index d807fc2c..900f873a 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -395,7 +395,7 @@ private:
int RkISP1CameraData::loadIPA()
{
- ipa_ = IPAManager::instance()->createIPA(pipe_, 1, 1);
+ ipa_ = IPAManager::createIPA(pipe_, 1, 1);
if (!ipa_)
return -ENOENT;
diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp
index ba9fca50..3881545b 100644
--- a/src/libcamera/pipeline/vimc/vimc.cpp
+++ b/src/libcamera/pipeline/vimc/vimc.cpp
@@ -410,7 +410,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
std::unique_ptr<VimcCameraData> data = std::make_unique<VimcCameraData>(this, media);
- data->ipa_ = IPAManager::instance()->createIPA(this, 0, 0);
+ data->ipa_ = IPAManager::createIPA(this, 0, 0);
if (data->ipa_ != nullptr) {
std::string conf = data->ipa_->configurationFile("vimc.conf");
data->ipa_->init(IPASettings{ conf });