diff options
| -rw-r--r-- | src/libcamera/include/ipa_manager.h | 6 | ||||
| -rw-r--r-- | src/libcamera/include/pipeline_handler.h | 5 | ||||
| -rw-r--r-- | src/libcamera/ipa_manager.cpp | 14 |
3 files changed, 13 insertions, 12 deletions
diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h index 6165efb8..aa6b9adb 100644 --- a/src/libcamera/include/ipa_manager.h +++ b/src/libcamera/include/ipa_manager.h @@ -24,9 +24,9 @@ class IPAManager public: static IPAManager *instance(); - std::unique_ptr<IPAInterface> createIPA(PipelineHandler *pipe, - uint32_t maxVersion, - uint32_t minVersion); + std::unique_ptr<IPAProxy> createIPA(PipelineHandler *pipe, + uint32_t maxVersion, + uint32_t minVersion); private: std::vector<IPAModule *> modules_; diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h index 3fcfeda4..706413fa 100644 --- a/src/libcamera/include/pipeline_handler.h +++ b/src/libcamera/include/pipeline_handler.h @@ -15,11 +15,12 @@ #include <sys/types.h> #include <vector> -#include <ipa/ipa_interface.h> #include <libcamera/controls.h> #include <libcamera/object.h> #include <libcamera/stream.h> +#include "ipa_proxy.h" + namespace libcamera { class Camera; @@ -46,7 +47,7 @@ public: std::list<Request *> queuedRequests_; ControlInfoMap controlInfo_; ControlList properties_; - std::unique_ptr<IPAInterface> ipa_; + std::unique_ptr<IPAProxy> ipa_; private: CameraData(const CameraData &) = delete; diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 50b6792d..df378679 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -247,17 +247,17 @@ unsigned int IPAManager::addDir(const char *libDir, unsigned int maxDepth) } /** - * \brief Create an IPA interface that matches a given pipeline handler - * \param[in] pipe The pipeline handler that wants a matching IPA interface + * \brief Create an IPA proxy that matches a given pipeline handler + * \param[in] pipe The pipeline handler that wants a matching IPA proxy * \param[in] minVersion Minimum acceptable version of IPA module * \param[in] maxVersion Maximum acceptable version of IPA module * - * \return A newly created IPA interface, or nullptr if no matching - * IPA module is found or if the IPA interface fails to initialize + * \return A newly created IPA proxy, or nullptr if no matching IPA module is + * found or if the IPA proxy fails to initialize */ -std::unique_ptr<IPAInterface> IPAManager::createIPA(PipelineHandler *pipe, - uint32_t maxVersion, - uint32_t minVersion) +std::unique_ptr<IPAProxy> IPAManager::createIPA(PipelineHandler *pipe, + uint32_t maxVersion, + uint32_t minVersion) { IPAModule *m = nullptr; |