From patchwork Fri Oct 3 16:16:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 24563 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 53F9EBF415 for ; Fri, 3 Oct 2025 16:16:48 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 94BAA6B5F8; Fri, 3 Oct 2025 18:16:45 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="FBcTf5cD"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B2FB16B5C2 for ; Fri, 3 Oct 2025 18:16:43 +0200 (CEST) Received: from [192.168.1.102] (93-61-96-190.ip145.fastwebnet.it [93.61.96.190]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B8D761F16; Fri, 3 Oct 2025 18:15:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1759508113; bh=lBO0uo2legv1RFpoVoJNs/0maL1XDu+CGupwbB9YZ8g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=FBcTf5cDTbUs34p5W/NCXWkaVxNHUz6ZRirXPRWj3+s5YdvIzRzPYbSjP4xe85vRF JjEUONRxqvENlnRvz5U/FUjAi+CvOcQO4OkyJejNwD4nMN/w2OxrsM0hYGtvdcWizD 9DMVfLbwmHBQXEdKQubKcSbAULLA0JNVauq+MqnU= From: Jacopo Mondi Date: Fri, 03 Oct 2025 18:16:31 +0200 Subject: [PATCH v2 1/2] libcamera: ipa_manager: Create IPA by name MIME-Version: 1.0 Message-Id: <20251003-ipa-match-by-name-v2-1-54f3cd828ddd@ideasonboard.com> References: <20251003-ipa-match-by-name-v2-0-54f3cd828ddd@ideasonboard.com> In-Reply-To: <20251003-ipa-match-by-name-v2-0-54f3cd828ddd@ideasonboard.com> To: libcamera-devel@lists.libcamera.org, =?utf-8?q?Niklas_S=C3=B6derlund?= , Hans de Goede Cc: Jacopo Mondi , Kieran Bingham X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7914; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=qlnCgwYcVWfZj6RiMuGlvvd+UXFnC8YG+UkcFe7KCUI=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBo3/bpxEVpsSFpl3XAry3dqPmV3+zbbi+CYIklh Nux/z1CqLuJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaN/26QAKCRByNAaPFqFW PHZYD/45iwqNZ58xsBbik7D4VqOOJflC4hbNQhnl/pErqK1zpst5mHLQ6IACWvoHvETnJJzLSlF DbZ2ssKnzFvvQbOwninU+C14JD3ajx3JHrTwM8Jc0HwJpEJbwl4CTWum1ef/SxxHtw3fQXl5bbx tN/o00fHt0z2cd3CyTY0BEf+dGKlyGqbzR/j9SPa0GC71uba8lPM/7yTDimZm+uijZsSr7ZosGy BNB//KkxJ2QCvqW0in64z7QYBtSUz1Jz4gDBIWdIs9muN/vRXyISH8CQp7Unf3Qlt+jk5q9j3mD +sPLFUUntI6dJE2uSWV2A7InxaInNvrWB9IOrG6K07XXDZnR0h76aPyOArqDoJOia6ig24K91L2 YNAoFhr30/4Q33N/joXedzlcG99w7JZoDmfbDjOw8Fsqs6/zpwUroriUElm2CwfURRn6uoFqJS8 Q4JBz+q4ORnhZd0bcHAZybCjZxGIBbiVBcm5Tj7bJLZ4tRZVRNNy82XFXj0AY4yXFPRc12iZCqJ OAoSCG6iV9hI3Y/fO6be+rw1S9jM4DGr2SDhyCk4T83Fpb8ZPhwsKZMAy1Gfz5qVehP2mrWAGbH OJLrAR8A76tgiXE4tnid/17nS4q1qw7eW44S5NkEJyGJibrmB7KoCYTnTjRHkeTkG9yKfu49ZDP W8e0YUZcA6OlwGQ== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Hans de Goede Currently createIPA() / IPAManager::module() assume that there is a 1:1 relationship between pipeline handlers and IPAs and IPA matching is done based on matching the pipe to ipaModuleInfo.pipelineName[]. One way to allow using a single IPA with multiple pipelines would be to allow the IPA to declare itself compatible with more than one pipeline, turning ipaModuleInfo.pipelineName[] into e.g. a vector. But the way ipaModuleInfo is loaded as an ELF symbol requires it to be a simple flat C-struct. Instead, move the IPA creation procedure to be name-based, introducing an overload to IPAManager::createIPA(pipe, name, minVer, maxVer) that allows to specify the name of the IPA module to match. Pipeline handlers that wants to use their name as matching criteria can continue doing so using the already existing createIPA(pipe, minVer, maxVer) overload. Signed-off-by: Hans de Goede Signed-off-by: Jacopo Mondi Reviewed-by: Hans de Goede Reviewed-by: Kieran Bingham Tested-by: Niklas Söderlund Reviewed-by: Barnabás Pőcze --- include/libcamera/internal/ipa_manager.h | 13 ++++++++++-- include/libcamera/internal/ipa_module.h | 4 ++-- src/libcamera/ipa_manager.cpp | 34 ++++++++++++++++++++++++++------ src/libcamera/ipa_module.cpp | 12 +++++------ 4 files changed, 47 insertions(+), 16 deletions(-) diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h index f8ce780169e617088557888d7c8dae2d3f10ec08..4c01e76f1800120f0baca25bc2e5e251f7cf80b5 100644 --- a/include/libcamera/internal/ipa_manager.h +++ b/include/libcamera/internal/ipa_manager.h @@ -34,12 +34,13 @@ public: template static std::unique_ptr createIPA(PipelineHandler *pipe, + const char *name, uint32_t minVersion, uint32_t maxVersion) { CameraManager *cm = pipe->cameraManager(); IPAManager *self = cm->_d()->ipaManager(); - IPAModule *m = self->module(pipe, minVersion, maxVersion); + IPAModule *m = self->module(name, minVersion, maxVersion); if (!m) return nullptr; @@ -60,6 +61,14 @@ public: return proxy; } + template + static std::unique_ptr createIPA(PipelineHandler *pipe, + uint32_t minVersion, + uint32_t maxVersion) + { + return createIPA(pipe, pipe->name(), minVersion, maxVersion); + } + #if HAVE_IPA_PUBKEY static const PubKey &pubKey() { @@ -72,7 +81,7 @@ private: std::vector &files); unsigned int addDir(const char *libDir, unsigned int maxDepth = 0); - IPAModule *module(PipelineHandler *pipe, uint32_t minVersion, + IPAModule *module(const char *name, uint32_t minVersion, uint32_t maxVersion); bool isSignatureValid(IPAModule *ipa) const; diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h index 15f19492c3a027a0bc4f9572188d13af41fcd450..a0a53764e1394abed3bab92cdde9f33a86441c5f 100644 --- a/include/libcamera/internal/ipa_module.h +++ b/include/libcamera/internal/ipa_module.h @@ -36,8 +36,8 @@ public: IPAInterface *createInterface(); - bool match(PipelineHandler *pipe, - uint32_t minVersion, uint32_t maxVersion) const; + bool match(const char *name, uint32_t minVersion, + uint32_t maxVersion) const; protected: std::string logPrefix() const override; diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 35171d097136a6d85b8f518c099f8228f9eacd6f..f62a4ee5fd012d23ce178d59f84c6ab49513376b 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -247,15 +247,15 @@ unsigned int IPAManager::addDir(const char *libDir, unsigned int maxDepth) /** * \brief Retrieve an IPA module that matches a given pipeline handler - * \param[in] pipe The pipeline handler + * \param[in] name The IPA module string identifier * \param[in] minVersion Minimum acceptable version of IPA module * \param[in] maxVersion Maximum acceptable version of IPA module */ -IPAModule *IPAManager::module(PipelineHandler *pipe, uint32_t minVersion, +IPAModule *IPAManager::module(const char *name, uint32_t minVersion, uint32_t maxVersion) { for (const auto &module : modules_) { - if (module->match(pipe, minVersion, maxVersion)) + if (module->match(name, minVersion, maxVersion)) return module.get(); } @@ -263,12 +263,34 @@ IPAModule *IPAManager::module(PipelineHandler *pipe, uint32_t minVersion, } /** - * \fn IPAManager::createIPA() - * \brief Create an IPA proxy that matches a given pipeline handler - * \param[in] pipe The pipeline handler that wants a matching IPA proxy + * \fn IPAManager::createIPA(PipelineHandler *pipe, const char *ipaName, uint32_t minVersion, uint32_t maxVersion) + * \brief Create an IPA proxy that matches the requested name and version + * \param[in] pipe The pipeline handler that wants to create the IPA module + * \param[in] ipaName The IPA module name * \param[in] minVersion Minimum acceptable version of IPA module * \param[in] maxVersion Maximum acceptable version of IPA module * + * Create an IPA module using \a name as the matching identifier. This overload + * allows pipeline handlers to create an IPA module by specifying its name + * instead of relying on the fact that the IPA module matches the pipeline + * handler's one. + * + * \return A newly created IPA proxy, or nullptr if no matching IPA module is + * found or if the IPA proxy fails to initialize + */ + +/** + * \fn IPAManager::createIPA(PipelineHandler *pipe, uint32_t minVersion, uint32_t maxVersion) + * \brief Create an IPA proxy that matches the pipeline handler name and the + * requested version + * \param[in] pipe The pipeline handler that wants to create the IPA module + * \param[in] minVersion Minimum acceptable version of IPA module + * \param[in] maxVersion Maximum acceptable version of IPA module + * + * Create an IPA module using the pipeline handler name as the matching + * identifier. This overload allows pipeline handler to create an IPA module + * whose name matches the pipeline handler one. + * * \return A newly created IPA proxy, or nullptr if no matching IPA module is * found or if the IPA proxy fails to initialize */ diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index e6ea61e4482983a83b4185c4309f2c514ed24fc2..0bd6f14626fe2038072f48b70ca4341b0eb8cef5 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -463,21 +463,21 @@ IPAInterface *IPAModule::createInterface() /** * \brief Verify if the IPA module matches a given pipeline handler - * \param[in] pipe Pipeline handler to match with + * \param[in] name The IPA module name * \param[in] minVersion Minimum acceptable version of IPA module * \param[in] maxVersion Maximum acceptable version of IPA module * - * This function checks if this IPA module matches the \a pipe pipeline handler, + * This function checks if this IPA module matches the requested \a name * and the input version range. * - * \return True if the pipeline handler matches the IPA module, or false otherwise + * \return True if the IPA module matches, or false otherwise */ -bool IPAModule::match(PipelineHandler *pipe, - uint32_t minVersion, uint32_t maxVersion) const +bool IPAModule::match(const char *name, uint32_t minVersion, + uint32_t maxVersion) const { return info_.pipelineVersion >= minVersion && info_.pipelineVersion <= maxVersion && - !strcmp(info_.pipelineName, pipe->name()); + !strcmp(info_.name, name); } std::string IPAModule::logPrefix() const From patchwork Fri Oct 3 16:16:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 24564 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id B49C1C3261 for ; Fri, 3 Oct 2025 16:16:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4C4746B5F3; Fri, 3 Oct 2025 18:16:47 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="nNwTQFjK"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 45F2A6B5C2 for ; Fri, 3 Oct 2025 18:16:44 +0200 (CEST) Received: from [192.168.1.102] (93-61-96-190.ip145.fastwebnet.it [93.61.96.190]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 32E7E1F17; Fri, 3 Oct 2025 18:15:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1759508113; bh=d6RAoAOXgtxUYCv+bvTgdQFi54674+5E92dgL5mVNgo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nNwTQFjKvodqWBdHGDbQn4YuVonYh996s7dM71LOPOSpBTeJOQ+AXRF85sLuOjRRq fMYMz3eOnKKrDji+BMzrmeFU0+GIfNebFgAeNQVqvKY65hX7wUky8GmdOsTg4Hq4it HYs4D5xeY0S1GAyC+q0EuacY4jgF49cUFvFIjoIE= From: Jacopo Mondi Date: Fri, 03 Oct 2025 18:16:32 +0200 Subject: [PATCH v2 2/2] ipa: ipa_module: Remove pipelineName MIME-Version: 1.0 Message-Id: <20251003-ipa-match-by-name-v2-2-54f3cd828ddd@ideasonboard.com> References: <20251003-ipa-match-by-name-v2-0-54f3cd828ddd@ideasonboard.com> In-Reply-To: <20251003-ipa-match-by-name-v2-0-54f3cd828ddd@ideasonboard.com> To: libcamera-devel@lists.libcamera.org, =?utf-8?q?Niklas_S=C3=B6derlund?= , Hans de Goede Cc: Jacopo Mondi , =?utf-8?b?QmFybmFiw6Fz?= =?utf-8?q?_P=C5=91cze?= , Kieran Bingham X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6759; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=d6RAoAOXgtxUYCv+bvTgdQFi54674+5E92dgL5mVNgo=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBo3/bpAgXkQEuMdnCSHEhnv5wxIQUjDVGksv/Vq vJe8u2IRgiJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaN/26QAKCRByNAaPFqFW PBgPD/9TD4zlEpB4FtxetjakiQpE513B5vlRDmLg/UYKSkrEy2iKZn1st9K6vQyW130Q+amxZEc 2jB8Pc3vjLDkuBlBZjsiIt53F+B+NTOKw0jZW5mwWfo4bSBFUP7dLTjsuCAMrhugrP4ahHQ31fV PN/wt85OikLgPr+fxPr8BnQoHZ2XorpFD2HwfFKfi+jsumZhCoBcsA993PkS3nQvllzL9UteTLG sRqmjqrbIThFB6uTC3cKApbKBP/dkbeoe5x0v/LEgEbdUsDszRSnHcyiqHgU1HRYnWQDw5g4c8Q FaqCcY/tRaEvVg7a1y36MsJ0eF7VoLlFJ9ca9367XxSu2G8zaSFIKix1qj5GWlWkbr4IB4B7s7n GuD2ps9ihO+SfBoMKmdl66CYfX+U4cX1Vr6W83Kvf6GEgVBNOlDWSo8ejdPhDVTPidifSNAD2xm 6TzVtujPOhqMnWESCGJtSR9J3mLC56koLTw3JRDw0y7AkyQdUzoS7SxK9tTnlvGWbMezbSRnVMk TdA6Y7GjD7vR+cU2n3njCCKStGizd7I6mKDA+poXm8luvgpVSQq44OLDcf7OtHEOjiC9oCJjVNC 2Ad6NrZKEXfsc9trIfXU3nxc8Qq6KaNLbqST9eQjEdUsqhqqjh2sdMlf0hJxdRcwYe8UcANpZNY 2IzFBPpx6uxj6Jw== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" All the IPA modules declare a pipelineName that is identical to their name. As we now support creating IPAs by name (either explicitly provided by the pipeline handlers or by using the pipeline name), the duplicated information in IPAModuleInfo is redundant. Remove it. Signed-off-by: Jacopo Mondi Reviewed-by: Barnabás Pőcze Reviewed-by: Kieran Bingham --- include/libcamera/ipa/ipa_module_info.h | 1 - src/ipa/ipu3/ipu3.cpp | 1 - src/ipa/mali-c55/mali-c55.cpp | 1 - src/ipa/rkisp1/rkisp1.cpp | 1 - src/ipa/rpi/pisp/pisp.cpp | 1 - src/ipa/rpi/vc4/vc4.cpp | 1 - src/ipa/simple/soft_simple.cpp | 1 - src/ipa/vimc/vimc.cpp | 1 - src/libcamera/ipa_module.cpp | 15 ++++++--------- test/ipa/ipa_module_test.cpp | 3 --- 10 files changed, 6 insertions(+), 20 deletions(-) diff --git a/include/libcamera/ipa/ipa_module_info.h b/include/libcamera/ipa/ipa_module_info.h index 3507a6d7678a3fd171c9239967d4667381ac3ea6..436ec82d7750d1ab7901499f4c4d88f0a173b563 100644 --- a/include/libcamera/ipa/ipa_module_info.h +++ b/include/libcamera/ipa/ipa_module_info.h @@ -16,7 +16,6 @@ namespace libcamera { struct IPAModuleInfo { int moduleAPIVersion; uint32_t pipelineVersion; - char pipelineName[256]; char name[256]; } __attribute__((packed)); diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 1cae08bf255f6f53a0ebee02ba3aadda5a650ae3..a714024129b688b0579662ac7d6d9c3ffc15b62a 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -672,7 +672,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 1, "ipu3", - "ipu3", }; /** diff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp index 7d45e7310aecdae0e47655e6d2e8830e776d74cd..e52e89be7c7e34310ca866bcbea2134833e967db 100644 --- a/src/ipa/mali-c55/mali-c55.cpp +++ b/src/ipa/mali-c55/mali-c55.cpp @@ -387,7 +387,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 1, "mali-c55", - "mali-c55", }; IPAInterface *ipaCreate() diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index fa22bfc349043002345d275b11a60ac983e329d7..a8e46094bdb9c431eb9143cccfa88e8ae7a3c04f 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -480,7 +480,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 1, "rkisp1", - "rkisp1", }; IPAInterface *ipaCreate() diff --git a/src/ipa/rpi/pisp/pisp.cpp b/src/ipa/rpi/pisp/pisp.cpp index 829b912585223a0296a9709aca433d5240caea1b..9424cb4d129dda541a3cc5f9bacac56dc44f15da 100644 --- a/src/ipa/rpi/pisp/pisp.cpp +++ b/src/ipa/rpi/pisp/pisp.cpp @@ -1089,7 +1089,6 @@ const IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 1, "rpi/pisp", - "rpi/pisp", }; IPAInterface *ipaCreate() diff --git a/src/ipa/rpi/vc4/vc4.cpp b/src/ipa/rpi/vc4/vc4.cpp index b2fec934480487c0c0566d510afd7a72129e441c..dc3455642ec71865d73662e6cd2d42bba61cadb8 100644 --- a/src/ipa/rpi/vc4/vc4.cpp +++ b/src/ipa/rpi/vc4/vc4.cpp @@ -606,7 +606,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 1, "rpi/vc4", - "rpi/vc4", }; IPAInterface *ipaCreate() diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp index b147aca2e3436cd79586063c4ee23f6698f266bf..9122f1c019ce1bb1c6a4d96e3fda664023391464 100644 --- a/src/ipa/simple/soft_simple.cpp +++ b/src/ipa/simple/soft_simple.cpp @@ -350,7 +350,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 0, "simple", - "simple", }; IPAInterface *ipaCreate() diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index a1351a0f45ce4ce6afed3151001eb74b10090c16..822e00aff2033e42254823b07ec396a50f71f182 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -202,7 +202,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 0, "vimc", - "vimc", }; IPAInterface *ipaCreate() diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index 0bd6f14626fe2038072f48b70ca4341b0eb8cef5..53cea6b187e86f20628d3b51c47097836801b094 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -215,18 +215,15 @@ Span elfLoadSymbol(Span elf, const char *symbol) * \var IPAModuleInfo::pipelineVersion * \brief The pipeline handler version that the IPA module is for * - * \var IPAModuleInfo::pipelineName - * \brief The name of the pipeline handler that the IPA module is for - * - * This name is used to match a pipeline handler with the module. - * * \var IPAModuleInfo::name * \brief The name of the IPA module * - * The name may be used to build file system paths to IPA-specific resources. - * It shall only contain printable characters, and may not contain '*', '?' or - * '\'. For IPA modules included in libcamera, it shall match the directory of - * the IPA module in the source tree. + * This name is used to match a the IPA module. + * + * The name may also be used to build file system paths to IPA-specific + * resources. It shall only contain printable characters, and may not contain + * '*', '?' or '\'. For IPA modules included in libcamera, it shall match the + * directory of the IPA module in the source tree. * * \todo Allow user to choose to isolate open source IPAs */ diff --git a/test/ipa/ipa_module_test.cpp b/test/ipa/ipa_module_test.cpp index 1c97da3242a7d558c52dce6ed3bc9b5f76742944..af71c3285328263da71643da97e7b8c440d9a7ad 100644 --- a/test/ipa/ipa_module_test.cpp +++ b/test/ipa/ipa_module_test.cpp @@ -37,12 +37,10 @@ protected: cerr << "IPA module information mismatch: expected:" << endl << "moduleAPIVersion = " << testInfo.moduleAPIVersion << endl << "pipelineVersion = " << testInfo.pipelineVersion << endl - << "pipelineName = " << testInfo.pipelineName << endl << "name = " << testInfo.name << "got: " << endl << "moduleAPIVersion = " << info.moduleAPIVersion << endl << "pipelineVersion = " << info.pipelineVersion << endl - << "pipelineName = " << info.pipelineName << endl << "name = " << info.name << endl; } @@ -58,7 +56,6 @@ protected: IPA_MODULE_API_VERSION, 0, "vimc", - "vimc", }; count += runTest("src/ipa/vimc/ipa_vimc.so", testInfo);