diff options
author | Paul Elder <paul.elder@ideasonboard.com> | 2020-06-05 14:58:58 +0900 |
---|---|---|
committer | Paul Elder <paul.elder@ideasonboard.com> | 2020-06-08 17:11:26 +0900 |
commit | 6e730695deef37b9a66bb9547df41d17d2872028 (patch) | |
tree | 40f09253aa3e34c3c0fea1c342f5bd49c682e989 /src/libcamera/ipa_manager.cpp | |
parent | 46d544345cbae270da533a737e334880720ceea5 (diff) |
libcamera: IPAManager: remove instance() and make createIPA() static
As the only usage of IPAManager::instance() is by the pipeline handlers
to call IPAManager::createIPA(), remove the former and make the latter
static. Update the pipeline handlers and tests accordingly.
Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'src/libcamera/ipa_manager.cpp')
-rw-r--r-- | src/libcamera/ipa_manager.cpp | 20 |
1 files changed, 3 insertions, 17 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; |