From patchwork Wed Aug 12 18:49:05 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: 27760 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 24DD7C3264 for ; Wed, 12 Aug 2026 18:49:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C4F0C682BF; Wed, 12 Aug 2026 20:49:23 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="aVKro4uG"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="QcLH6WGB"; 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 8F91D682B2 for ; Wed, 12 Aug 2026 20:49:20 +0200 (CEST) Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67CI8jjC355329 for ; Wed, 12 Aug 2026 18:49:19 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= LpVaJ8XyDdY3Z4NU4YyIFIuQGALht3poswTPE/FwpFY=; b=aVKro4uGQUo5mq5n sBn+BrpqcpS5++tjeCH3CnxbNVM/qh8DwICuUYlKreQSfcVNlTyGPTlq32HGItAf okCoClSKVHWTMt1ZTQdOugh7t8vRJ4KhFKqWBL3Njmy/EUY6QmnuFAXvuGGk4Cpl sgz3joXQ6KQhnxaSiKLb7FDkYlYcGkHFKFagNlsQIZ6eN8X4esA1eobl3+zXs9nD NkKVpF7/jhdJSMN/Ic4xbEC1OkRVIeX46NTWgYVCWbM5V0ZI/PCOfy1URMiBrqB0 DjELqkhmliwvYLf+oe68hUUz8zbWOD44Cs6b+2ynVwrO/ZPkpLWgqTB/Uchdv7sk 470UUw== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g0hj2uqtc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 12 Aug 2026 18:49:18 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51c1a97644aso11648251cf.2 for ; Wed, 12 Aug 2026 11:49:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786560558; x=1787165358; darn=lists.libcamera.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=LpVaJ8XyDdY3Z4NU4YyIFIuQGALht3poswTPE/FwpFY=; b=QcLH6WGBKaIlYReD21cOXdwasTK5hxZqMniNDbTBkHxyKiwID6minRilCx/reMF3r9 NoBiZ6EnD/qM4qf2ksglYLtxkl10XCmF+ZZQNT2NBDxq1F2O0Wo5Gqdc+MRjjzpxA5HA BvQ3qXErNi6tAuDS3//fulRxqTkUCo0Bx6UO33b9m4xZTAL0Yev3nzroYRBIRoPNMvTH wDovQStXng5m2lT4W0Q9zb0ed5rhGxeKSjBJCxCcVO9kj1qKDQFL4hvaoFmBD2Izp9F9 YGqjXwJjZ9bCiehDgIEPn3jAhz6c0so6vs0/ddYkF7AYi4Ah+ZYptAKWxvN2fyx4ExjG V04A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786560558; x=1787165358; h=content-transfer-encoding:content-type: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 :content-type; bh=LpVaJ8XyDdY3Z4NU4YyIFIuQGALht3poswTPE/FwpFY=; b=alelIJBqmMv+YfNmovv6rrdJ3FsHre6LWbDpdSEPR//wQaWRtLMaJXyQoj7ocYJm1r se+4TiLOMAvbWVJFnk7aZzGxtXCyezwcWm6c0YGk/y6VDlu13xPzCYa5EEJWIq0ZJNl7 LI0jHyQ14PiYcm+LhzyO93sXAUV2UMT+PKqFlOM8174J860ipukgiAfIvHoKADsZACQH JKamwZS1d4BpbsTGZP2CWANwUtPiWyz0mkvpu2QZPUKsXGCYxMm4RbbrGIqhJ9lJpZsz U6yaHJC5rrRjDrMOI6O77SN+5ir73q1shOBaarJ1QDg/CsC9mFbhIdqVJR47xHnxBOv7 BApw== X-Gm-Message-State: AOJu0YxT9pwwzwUX81TnYPRz4JhlWZrcgSUlzmtnrBEALs60GqxQzUGP lzewZODyegItaCIFWgeAQcxHrX358Kiaj7rh1Kwxv3qTzRa+29qQWveDRavy70nJ8gYMXXPS8iL U5QXLlV5X+cT9gXUhnSN3BjqHoXN7b8BfGG6wwFJL2eP58Ezi1if8XeopOD2KmE2WIhLo6Thj6V 6xxubEmJns X-Gm-Gg: AR+sD13/HMwrB7unx318GLx0iPCHest17c2Z4iDY+xoA5/bu7U8QuQ8rtqBX8+GlVfA rnfLck66rQg+5NlDNZZeGqerUxC24ZbuVRkI04caVGvNWZpw7j7XXPYGtnDFYi9qU1+GUTCF135 Y1ZvmHcCb6phWMdriUFrMUNAQnWNZZP4rC3lIOZ0fjfvNxJTD0yDh8OdYGTlaLc88vZw+VzNmLm 107ij9Cp17NqmPHPymEEyHKCzs3xsjoNalyT3ubEagrK5EZCSUCzAEk6FIDBJDsa37UIbMQ4/If ZAufRlF4E2XUCPzcSJSjloCpCyieaWMHi8BRLusEvW7IGygIxhOFAmG4ejiUqia9Z6ihHbR10Ix 3wgup/C+EUMEE0Cckcwom5WdOnihMfb/wjexd3WeirkuHBNdkjv6ag24iyqgt21PJ1Z1cK6HO4N gMDmJMrAS64EileE0= X-Received: by 2002:ac8:5a15:0:b0:51c:1a4c:3c9f with SMTP id d75a77b69052e-52d73bf01aamr3023961cf.4.1786560558107; Wed, 12 Aug 2026 11:49:18 -0700 (PDT) X-Received: by 2002:ac8:5a15:0:b0:51c:1a4c:3c9f with SMTP id d75a77b69052e-52d73bf01aamr3023371cf.4.1786560557493; Wed, 12 Aug 2026 11:49:17 -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 4fb4d7f45d1cf-6a37f8a202fsm52348a12.15.2026.08.12.11.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 11:49:15 -0700 (PDT) From: Hans de Goede To: libcamera-devel@lists.libcamera.org Cc: Loic Poulain , Hans de Goede , Kieran Bingham , =?utf-8?q?Niklas_S=C3=B6derlund?= , Jacopo Mondi Subject: [PATCH v7 1/8] libcamera: Create IPA by name Date: Wed, 12 Aug 2026 20:49:05 +0200 Message-ID: <20260812184912.287894-2-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260812184912.287894-1-johannes.goede@oss.qualcomm.com> References: <20260812184912.287894-1-johannes.goede@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=a8EAM0SF c=1 sm=1 tr=0 ts=6a7cc02e cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=P1BnusSwAAAA:8 a=EUspDBNiAAAA:8 a=rl81jYYfPRFGC34jM1YA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 a=D0XLA9XvdZm18NrgonBM:22 X-Proofpoint-ORIG-GUID: BnucEBUNrcjZQaSv5Nx3srxxoj7l6-O6 X-Proofpoint-GUID: BnucEBUNrcjZQaSv5Nx3srxxoj7l6-O6 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE1MSBTYWx0ZWRfX3CXtj4SBJBbz z5aPIkEidnNOFTRQwCIp+XBhBKgeaKFMoW9AmQk5+aDHpWqP5Pgdh5zt1pQPvll71tQs0nxIKRC qsPTyelcaY/14Li6Li8IEeoCd/1DPzI= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE1MSBTYWx0ZWRfXxl2gkT5MVB8G +2bCoerWx9xx0tTIIh69zs84VjG3oeGRomRPcaXpb2PNWJoZU2Co4jG4C6u3dIpbPLTFYgjnxuF wsblsnF/bagJYn8STtJHiGDNWMGmeiBuH3VHw81FZQujNdEIDBkSmjOYkqCpita4GObwgE2qkKv PG/CeOt2X1ZaFoNYJTvFj8dmnaN02RT+jMURj4nCvE0a543EuXd0koAapB6Tj47XlyIEZe0Ea2a fcVm2ir/0NToxVEznN4NC0bdAZB7IJEMYPIG8uEmqovOt+wq4XdPblc3ZC1QNgjWur/4IvvGrSV vXhNPk+fG7Jb8S9RDr8P/ZgKDk2hQ3KyCoBmVfCm5ym+cczozfGGfOYZhXIGzuzy6udtvtU0h69 1NLMnVWibQA3EyC16w3IWKjFfOVN1+vjMGWOt1Mz3xHADJwQaFUy3VIWdZmXAtDpZouA+QP2Ulr VneRHJp5/39Dc0+LPkg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293, Aquarius:18.0.1176, Hydra:6.1.134, FMLib:17.12.100.49 definitions=2026-08-12_05,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 adultscore=0 spamscore=0 malwarescore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120151 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. Reviewed-by: Kieran Bingham Tested-by: Niklas Söderlund Signed-off-by: Jacopo Mondi 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 +++++++++++++++++-- test/ipa/ipa_interface_test.cpp | 2 +- 7 files changed, 48 insertions(+), 20 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 */ diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index 271c4e2c9..0b01a396e 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -99,7 +99,7 @@ protected: EventDispatcher *dispatcher = thread()->eventDispatcher(); Timer timer; - ipa_ = ipaManager_->createIPA(pipe_.get(), 0, 0); + ipa_ = ipaManager_->createIPA(pipe_->name(), 0, 0); if (!ipa_) { cerr << "Failed to create VIMC IPA interface" << endl; return TestFail;