PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: ipa_interface: Add support for custom IPA data to configure()

Browse Source 
Add two new parameters, ipaConfig and result, to the
IPAInterface::configure() function to allow pipeline handlers to pass
custom data to their IPA, and receive data back. Wire this through the
code base. The C API interface will be addressed separately, likely
through automation of the C <-> C++ translation.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart
2020-06-28 23:28:30 +03:00
parent f1a48f96af
commit 72263c5203
13 changed files with 61 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ipa/libipa/ipa_interface_wrapper.cpp
+4 -1
View File
@@ -166,7 +166,10 @@ void IPAInterfaceWrapper::configure(struct ipa_context *_ctx,
entityControls.emplace(id, infoMaps[id]);
}
ctx->ipa_->configure(sensorInfo, ipaStreams, entityControls);
/* \todo Translate the ipaConfig and result. */
IPAOperationData ipaConfig;
ctx->ipa_->configure(sensorInfo, ipaStreams, entityControls, ipaConfig,
nullptr);
}
void IPAInterfaceWrapper::map_buffers(struct ipa_context *_ctx,
src/ipa/raspberrypi/raspberrypi.cpp
+6 -2
View File
@@ -79,7 +79,9 @@ public:
void configure(const CameraSensorInfo &sensorInfo,
const std::map<unsigned int, IPAStream> &streamConfig,
const std::map<unsigned int, const ControlInfoMap &> &entityControls) override;
const std::map<unsigned int, const ControlInfoMap &> &entityControls,
const IPAOperationData &data,
IPAOperationData *response) override;
void mapBuffers(const std::vector<IPABuffer> &buffers) override;
void unmapBuffers(const std::vector<unsigned int> &ids) override;
void processEvent(const IPAOperationData &event) override;
@@ -187,7 +189,9 @@ void IPARPi::setMode(const CameraSensorInfo &sensorInfo)
void IPARPi::configure(const CameraSensorInfo &sensorInfo,
const std::map<unsigned int, IPAStream> &streamConfig,
const std::map<unsigned int, const ControlInfoMap &> &entityControls)
const std::map<unsigned int, const ControlInfoMap &> &entityControls,
const IPAOperationData &ipaConfig,
IPAOperationData *result)
{
if (entityControls.empty())
return;
src/ipa/rkisp1/rkisp1.cpp
+6 -2
View File
@@ -39,7 +39,9 @@ public:
void configure(const CameraSensorInfo &info,
const std::map<unsigned int, IPAStream> &streamConfig,
const std::map<unsigned int, const ControlInfoMap &> &entityControls) override;
const std::map<unsigned int, const ControlInfoMap &> &entityControls,
const IPAOperationData &ipaConfig,
IPAOperationData *response) override;
void mapBuffers(const std::vector<IPABuffer> &buffers) override;
void unmapBuffers(const std::vector<unsigned int> &ids) override;
void processEvent(const IPAOperationData &event) override;
@@ -76,7 +78,9 @@ private:
*/
void IPARkISP1::configure(const CameraSensorInfo &info,
const std::map<unsigned int, IPAStream> &streamConfig,
const std::map<unsigned int, const ControlInfoMap &> &entityControls)
const std::map<unsigned int, const ControlInfoMap &> &entityControls,
const IPAOperationData &ipaConfig,
IPAOperationData *result)
{
if (entityControls.empty())
return;
src/ipa/vimc/vimc.cpp
+3 -1
View File
@@ -39,7 +39,9 @@ public:
void configure(const CameraSensorInfo &sensorInfo,
const std::map<unsigned int, IPAStream> &streamConfig,
const std::map<unsigned int, const ControlInfoMap &> &entityControls) override {}
const std::map<unsigned int, const ControlInfoMap &> &entityControls,
const IPAOperationData &ipaConfig,
IPAOperationData *result) override {}
void mapBuffers(const std::vector<IPABuffer> &buffers) override {}
void unmapBuffers(const std::vector<unsigned int> &ids) override {}
void processEvent(const IPAOperationData &event) override {}