From patchwork Tue May 12 17:53:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 26743 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 5C30DBDB1C for ; Tue, 12 May 2026 17:53:51 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 150EA6302C; Tue, 12 May 2026 19:53:51 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="KgALcLka"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Z8iakjla"; dkim-atps=neutral Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D2A696301E for ; Tue, 12 May 2026 19:53:48 +0200 (CEST) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64CHlcoY075092 for ; Tue, 12 May 2026 17:53:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= i2SVqLF0EoJ2UahwRTlUv0JYhk8i5RAv6Q5zYgRyeJU=; b=KgALcLkaO6w5Aodf NFXt04arDgZ7i5yxq87GZ1zp1NSxTS29Yn4rXc2m9Qbwu2MFB2WWD5/HPYoAsyh6 M5gnNYjWIgbQOvR3JN62yWKfxmckILZLGem6dRB6uj5/xbtfRBpLbWsU1kEXTKCQ eAGOMbB4ChXi4RJeA/w5ZpveZ5/X8w816MeiFgKtuXCn5LM49kZo3o91nxKGVu/A 3sTswBPkPqOq7u2JguPEi9JUAFvCOOgv8ozA5XAHQ/3FvK++iYSQ99SDBVCPwj2F jHlvPqhrO4IIqZ9Cf2YqBJ7epWc8IUXKkmwap4w5KlMmEfeXlrhivWezxJpCB0YU vpZDIQ== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e43gyhnpf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 12 May 2026 17:53:46 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-6312af106fcso8356103137.3 for ; Tue, 12 May 2026 10:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778608426; x=1779213226; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i2SVqLF0EoJ2UahwRTlUv0JYhk8i5RAv6Q5zYgRyeJU=; b=Z8iakjlacBtz+ZYyg4Ie+f+tRa5s9anBS+op0uY/6P2SsC5bESjSMOrV4aSzvstUWb Av7q021Af+onQs5jlkPwfEf6zvcTCIJtuUcaVolvzKvKHksuRab+G4A89SkfORxdMWtk Tha/8kdKuiqDgJ0VijTqH37glnHrMChn6qpKKKXUnK/c20S7uBNeeDB5NDy91MmcN3uX OMmrZBUAgBeXYSYNiNqQGf9qrHAZOO2wuFcGyOSUp2MphyRRjzxauYdMJB0NFGlCKHhT 66ksL8sApxeCvaB5JHQk+qHBXlyobFUqn9qnFJVxJnBEDkQvSXZxLtVQzqcWIg5Mn4h4 2eSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608426; x=1779213226; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=i2SVqLF0EoJ2UahwRTlUv0JYhk8i5RAv6Q5zYgRyeJU=; b=ClfFVU3l2rwgG3fz3IZPma1GX8r3JUII8HwPQhY5CMRT5KwcbQRIKBigYK/wXRXiLT tvfeI5u1DUN17bbilTl7DiXh6UMZ/n9WzacAbyjtTmpCx+9hWV3StUKBzc9F265VfjD5 E/cuzBKAVCU2dG8Z1U0TnUSXu+uuu3sLcgBo2kfAfHFWcquYkNlUfWpclSyOpYnxIaNJ LIr2sSZHSb7kp7NFHqNDZQS/HdO1AYoWlqYPKmcEQiF8EN42GOqMSA7NH3BFFl3B0smR YYPIGyLuKYw1CMm0/Vc/Tn2sSOF6zT5ON3VVAmDQwTvEKyM1tUVtHohsAvuKuYZDeKmj x1bQ== X-Gm-Message-State: AOJu0Yy6rHAqqWxx5rcCVuqOp8qjmYwiXUlpJMpbH+Is3T/AjxfwbCDh PDAetCmQ0AGXk6V6/G/D3xXOIpnXY3XEGmcNmOtn8C9WNrwuesWYXauzShuscwhpbRtfTxZbB8N X5MD64AAPf+sUNpPlMMEUT47dmdLYqsQARj/2o/lskcwuNDWNv31wKN21ixwYeKRATydytNuYBQ R0LOdFEUxx X-Gm-Gg: Acq92OFjOg5JuW9474CvewhQZv90zCnQKfL9GXPRH8g8zLTJV/U5S20knWdTiRcmfM0 8NQytDAGVMEVSBtyhQ+AJUKPhzZGUq6ZEj6NNuR346Wqu2xHmqAxxl3M/fjntWm5UsfjXmjvf1h L/WVXvqJKsJ7oKBVNwyoDizIiZKP5A2uJ1JSVQB7qNcjC3YK1JZXyT+IsPqOuZURCvVPm2Fyp09 6ncY9H1tZX4FHRJQuK6WjHm7KcBmmxvqLeHBJOyfj1ZhsfT3+pWfWRTOYDNiQw4rWVb7HSZTt9X mYyFULvhIGS7zM0J975P9DHSF/BG42MjIbFMcp9tt3fsLMmgbM3iNFQgye9/F+Te8mgcQfTcHGp IEYGj+E6Rdm/pnD286+9eUONQSiai7xjb45lWz4z+eEjD4wr6bERDC79DlFQBgoQ3m6KBitFnJg O2hgUOo1DvfSParpQEW10tzLzIIHkrtNS4S+vV X-Received: by 2002:a05:6102:5045:b0:618:442a:9e76 with SMTP id ada2fe7eead31-630f8ed8eebmr16844300137.10.1778608425408; Tue, 12 May 2026 10:53:45 -0700 (PDT) X-Received: by 2002:a05:6102:5045:b0:618:442a:9e76 with SMTP id ada2fe7eead31-630f8ed8eebmr16844289137.10.1778608424847; Tue, 12 May 2026 10:53:44 -0700 (PDT) Received: from shalem (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-bce128529fbsm463191566b.36.2026.05.12.10.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 10:53:43 -0700 (PDT) From: Hans de Goede To: libcamera-devel@lists.libcamera.org Cc: Hans de Goede , Jacopo Mondi , Kieran Bingham , =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH v5 1/4] libcamera: Create IPA by name Date: Tue, 12 May 2026 19:53:37 +0200 Message-ID: <20260512175340.115153-2-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512175340.115153-1-johannes.goede@oss.qualcomm.com> References: <20260512175340.115153-1-johannes.goede@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=fMAJG5ae c=1 sm=1 tr=0 ts=6a03692b cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=P1BnusSwAAAA:8 a=EUspDBNiAAAA:8 a=L8eZCmLGBQB7CTaRy48A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f:22 a=D0XLA9XvdZm18NrgonBM:22 X-Proofpoint-ORIG-GUID: EfcOVzsUr0kPzIF-C_y98HkHVdgG4mb0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTEyMDE4NSBTYWx0ZWRfXy7QRjaAN/d06 mO1EJoocy6Qq8JqOEAdfnp7qS4bTRQTxE3wL7x7/Gfbu/h6hTQ1cn/XRIGyK70qJqXttK4xMUbR dW265/IPrQuDcxIJFRFkWZ11l9LV3nuP51LRmG86dFVKJSB+46USlewvm+GQ1UxN5bKA/UKZ4F9 wWJF02O0AyM4EWRPF6Yw371ybDofoQrs26Ji/C8+YQDkxX8xKfl7hq/JlT9YRIn3hYVbHcyXmBE b6i3ozUpYHCvLR4vJyvaIJ8mWWRJgv8nI18MbjrJJWTziOEGx/aQb9MDHZS25GU/YbdgEmHBdWu qDA1W/zdxvmgABFHtvPZa1bPl94WXUZal5hT5QulFvXgRENy/JGyCtpvcDykzOU3w1cEWN6j4X2 zvVL4wHucjFyhaW+t+sxJrjTtKcJ8P9toPaQZIfqjHQjmV8mOHeur8pSxPGWUixscF9HvVNKP0d ZSmNem/b+wTk+hAHsuA== X-Proofpoint-GUID: EfcOVzsUr0kPzIF-C_y98HkHVdgG4mb0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293, Aquarius:18.0.1143, Hydra:6.1.51, FMLib:17.12.100.49 definitions=2026-05-11_05,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 suspectscore=0 malwarescore=0 clxscore=1015 spamscore=0 adultscore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605050000 definitions=main-2605120185 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" 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 a PipelineHandler::createIPA(name, minVer, maxVer) overload 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 PipelineHandler::createIPA(minVer, maxVer) overload. Signed-off-by: Jacopo Mondi Reviewed-by: Kieran Bingham Tested-by: Niklas Söderlund Signed-off-by: Hans de Goede --- Changes in v5: - Rebase on top of db998e618aaa ("libcamera: pipeline_handler: Add createIPA() function") which moved the createIPA() wrapper for pipeline-handlers into the PipelineHandler class Changes in v4: - Rebase, change author to Hans' new email address Changes in v1 from Hans' original patch: - Slightly different approach addressing the review comments on Hans' v1 by creating an overload for PipelineHandler::createIPA() that allows pipelines to specify the IPA module name. --- include/libcamera/internal/ipa_manager.h | 6 ++--- include/libcamera/internal/ipa_module.h | 4 +-- include/libcamera/internal/pipeline_handler.h | 9 ++++++- src/libcamera/ipa_manager.cpp | 8 +++--- src/libcamera/ipa_module.cpp | 14 +++++------ src/libcamera/pipeline_handler.cpp | 25 +++++++++++++++++-- 6 files changed, 47 insertions(+), 19 deletions(-) diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h index aaa3ca37c..7ab193112 100644 --- a/include/libcamera/internal/ipa_manager.h +++ b/include/libcamera/internal/ipa_manager.h @@ -34,10 +34,10 @@ public: ~IPAManager(); template - std::unique_ptr createIPA(PipelineHandler *pipe, uint32_t minVersion, + std::unique_ptr createIPA(const char *name, uint32_t minVersion, uint32_t maxVersion) { - IPAModule *m = module(pipe, minVersion, maxVersion); + IPAModule *m = module(name, minVersion, maxVersion); if (!m) return nullptr; @@ -68,7 +68,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 15f19492c..a0a53764e 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/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index 6922ce18e..b60c07b13 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -76,7 +76,14 @@ public: std::unique_ptr createIPA(uint32_t minVersion, uint32_t maxVersion) { IPAManager *ipaManager = manager_->_d()->ipaManager(); - return ipaManager->createIPA(this, minVersion, maxVersion); + return ipaManager->createIPA(name_, minVersion, maxVersion); + } + + template + std::unique_ptr createIPA(const char *ipaName, uint32_t minVersion, uint32_t maxVersion) + { + IPAManager *ipaManager = manager_->_d()->ipaManager(); + return ipaManager->createIPA(ipaName, minVersion, maxVersion); } protected: diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 41918e4c2..b709a024e 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -248,15 +248,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(); } @@ -266,7 +266,7 @@ 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 + * \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 * diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index e6ea61e44..c89887954 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -462,22 +462,22 @@ IPAInterface *IPAModule::createInterface() } /** - * \brief Verify if the IPA module matches a given pipeline handler - * \param[in] pipe Pipeline handler to match with + * \brief Verify if the IPA module matches a given name + * \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 diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index e7145c1d4..25fc11989 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -836,11 +836,32 @@ void PipelineHandler::disconnect() */ /** - * \fn PipelineHandler::createIPA() - * \brief Create an IPA proxy that matches this pipeline handler + * \fn PipelineHandler::createIPA(const char *ipaName, uint32_t minVersion, uint32_t maxVersion) + * \brief Create an IPA proxy that matches the requested name and version + * \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 ipaName 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 PipelineHandler::createIPA(uint32_t minVersion, uint32_t maxVersion) + * \brief Create an IPA proxy that matches the pipeline handler name and the + * requested version + * \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 */