diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-04-27 02:36:18 +0300 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-04-28 01:54:49 +0300 |
commit | a6de9030893753e5428ee912fe7c52fbf93febd1 (patch) | |
tree | e82996e2e87c464919808663c443a3dcb99ea887 /src/libcamera | |
parent | 26a4b03ed85e0cc39939028964ae4a8961c05d02 (diff) |
ipa: Pass IPA initialization settings to IPAInterface::init()
Add a new IPASettings class to pass IPA initialization settings through
the IPAInterface::init() method. The settings currently only contain the
name of a configuration file, and are expected to be extended later.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/libcamera')
-rw-r--r-- | src/libcamera/include/ipa_context_wrapper.h | 2 | ||||
-rw-r--r-- | src/libcamera/ipa_context_wrapper.cpp | 9 | ||||
-rw-r--r-- | src/libcamera/ipa_interface.cpp | 34 | ||||
-rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/pipeline/vimc/vimc.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/proxy/ipa_proxy_linux.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/proxy/ipa_proxy_thread.cpp | 6 |
7 files changed, 47 insertions, 10 deletions
diff --git a/src/libcamera/include/ipa_context_wrapper.h b/src/libcamera/include/ipa_context_wrapper.h index 0a48bfe7..64395b4a 100644 --- a/src/libcamera/include/ipa_context_wrapper.h +++ b/src/libcamera/include/ipa_context_wrapper.h @@ -19,7 +19,7 @@ public: IPAContextWrapper(struct ipa_context *context); ~IPAContextWrapper(); - int init() override; + int init(const IPASettings &settings) override; int start() override; void stop() override; void configure(const std::map<unsigned int, IPAStream> &streamConfig, diff --git a/src/libcamera/ipa_context_wrapper.cpp b/src/libcamera/ipa_context_wrapper.cpp index ab6ce396..5bd5d916 100644 --- a/src/libcamera/ipa_context_wrapper.cpp +++ b/src/libcamera/ipa_context_wrapper.cpp @@ -69,15 +69,18 @@ IPAContextWrapper::~IPAContextWrapper() ctx_->ops->destroy(ctx_); } -int IPAContextWrapper::init() +int IPAContextWrapper::init(const IPASettings &settings) { if (intf_) - return intf_->init(); + return intf_->init(settings); if (!ctx_) return 0; - ctx_->ops->init(ctx_); + struct ipa_settings c_settings; + c_settings.configuration_file = settings.configurationFile.c_str(); + + ctx_->ops->init(ctx_, &c_settings); return 0; } diff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp index 890d4340..616f20fb 100644 --- a/src/libcamera/ipa_interface.cpp +++ b/src/libcamera/ipa_interface.cpp @@ -93,6 +93,16 @@ */ /** + * \struct ipa_settings + * \brief IPA initialization settings for the IPA context operations + * \sa IPASettings + * + * \var ipa_settings::configuration_file + * \brief The name of the IPA configuration file (may be null or point to an + * empty string) + */ + +/** * \struct ipa_stream * \brief Stream information for the IPA context operations * @@ -231,6 +241,7 @@ * \var ipa_context_ops::init * \brief Initialise the IPA context * \param[in] ctx The IPA context + * \param[in] settings The IPA initialization settings * * \sa libcamera::IPAInterface::init() */ @@ -311,6 +322,24 @@ namespace libcamera { /** + * \struct IPASettings + * \brief IPA interface initialization settings + * + * The IPASettings structure stores data passed to the IPAInterface::init() + * function. The data contains settings that don't depend on a particular camera + * or pipeline configuration and are valid for the whole life time of the IPA + * interface. + */ + +/** + * \var IPASettings::configurationFile + * \brief The name of the IPA configuration file + * + * This field may be an empty string if the IPA doesn't require a configuration + * file. + */ + +/** * \struct IPAStream * \brief Stream configuration for the IPA interface * @@ -424,6 +453,11 @@ namespace libcamera { /** * \fn IPAInterface::init() * \brief Initialise the IPAInterface + * \param[in] settings The IPA initialization settings + * + * This function initializes the IPA interface. It shall be called before any + * other function of the IPAInterface. The \a settings carry initialization + * parameters that are valid for the whole life time of the IPA interface. */ /** diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index f4226436..fde445b9 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -401,7 +401,7 @@ int RkISP1CameraData::loadIPA() ipa_->queueFrameAction.connect(this, &RkISP1CameraData::queueFrameAction); - ipa_->init(); + ipa_->init(IPASettings{}); return 0; } diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 77de4c38..99f5261b 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -385,7 +385,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) if (data->ipa_ == nullptr) LOG(VIMC, Warning) << "no matching IPA found"; else - data->ipa_->init(); + data->ipa_->init(IPASettings{}); /* Locate and open the capture video node. */ if (data->init(media)) diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp index 89f5cb54..cd8ac824 100644 --- a/src/libcamera/proxy/ipa_proxy_linux.cpp +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp @@ -26,7 +26,7 @@ public: IPAProxyLinux(IPAModule *ipam); ~IPAProxyLinux(); - int init() override { return 0; } + int init(const IPASettings &settings) override { return 0; } int start() override { return 0; } void stop() override {} void configure(const std::map<unsigned int, IPAStream> &streamConfig, diff --git a/src/libcamera/proxy/ipa_proxy_thread.cpp b/src/libcamera/proxy/ipa_proxy_thread.cpp index 1ebb9b6a..be82fde3 100644 --- a/src/libcamera/proxy/ipa_proxy_thread.cpp +++ b/src/libcamera/proxy/ipa_proxy_thread.cpp @@ -25,7 +25,7 @@ class IPAProxyThread : public IPAProxy, public Object public: IPAProxyThread(IPAModule *ipam); - int init() override; + int init(const IPASettings &settings) override; int start() override; void stop() override; @@ -97,9 +97,9 @@ IPAProxyThread::IPAProxyThread(IPAModule *ipam) valid_ = true; } -int IPAProxyThread::init() +int IPAProxyThread::init(const IPASettings &settings) { - int ret = ipa_->init(); + int ret = ipa_->init(settings); if (ret) return ret; |