From patchwork Mon Aug 17 13:40:35 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: 27827 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 E5530C3264 for ; Mon, 17 Aug 2026 13:40:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B01096826F; Mon, 17 Aug 2026 15:40:51 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="f7K6x3lB"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="JNcu8iDZ"; 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 A3F1768215 for ; Mon, 17 Aug 2026 15:40: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 67HD6JMc2431665 for ; Mon, 17 Aug 2026 13:40: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= LpVaJ8XyDdY3Z4NU4YyIFIuQGALht3poswTPE/FwpFY=; b=f7K6x3lB0C1z9ZZK INXqRAokgzo9KnvQv6Tdd8oCetnDb05fMcS0TJJMsNhYo4Pzc8VBC+QCogNtIopz aRKHXEDykhFMvqGwc0uEp4btxXddzixMxgJC7CNYPtbSvop2VxV6l8NupNQboKnZ DCZ7Tww7e9iEAoqTuIYGHRtnWm/jHaX5E9XiKkUvk1aq9EkdhQdgU6+7zeHimHa9 7CzocnSTg5/eA73DcwNYgkujydIuM18jJ8QWpo3fhStGhkBQ6HxFe47U2QCNhkY5 2StFcp9DRKu5a9VquIJ1O5O97bsQd1A+yyRE4f6/jPBzjE7ve0G3XNA8QLLeQg5n QmsYSA== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g3wrehfdr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 17 Aug 2026 13:40:47 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-936d067836eso346975085a.0 for ; Mon, 17 Aug 2026 06:40:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786974047; x=1787578847; 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=JNcu8iDZt3+t3BZt/5JDpqFcPiLVyPSBrWauBKMd05j9/oZuv0SYPAorFZ3k1oylpc SfDl11CKQMonYozDKuWHSuvgdjDnkSvGg6p2vwqDCCR8deiED8BTRlWxaOMqEEp/KwCQ nqXoX1shmd7WV/RqiO6eQ5ICbMYp7Y7Z48IWVJxGMIqv0IHcv4mUzKKpTo8wLU93SYWD NRSBgbRiXE4VHnQOEPLde4K1WDoPVH/3bWatmxvOHwfA/jmx36HTFu8Zy0STKzUSftii ZRdMtt/UNgMvyR0wpEobspTU84wD6kGqWfhvjGbEOU5RBA3amFKifwn24OWyqwLBw0dG WQfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786974047; x=1787578847; 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=V+JLTbkjCA8bER8WhiukIBZn4lXcCH6tcaumXnlOodHcTYW4iBSFTGRs1sUV7+F7vB bCS+Qs7KhqLlb5K1StW6Vmodqla+VF8l6cYA2xvHQfDff4QZh76rWnVGHKJ/BRaAFQbu wp0tRH23FkzLS/WFV+Chx8IuwsWZXZcFMUZp0+Sw4b59edbbeO4ryVZT7Cm2Kb48HCfI 0jvmfMa7qKkwJ7fW6mH/5Sn4pBldW4o8h9/O4LLYXDXKH7P/dcUnCjQ2BKrNmgTOu1LA qdKNEMd8V8+PYAHrmXsrX/7Mfy+ZM3LZJc4ygJH3eDv0QFMbLt7CGpgmX6gqUCIQhCIL xsKQ== X-Gm-Message-State: AOJu0YzZQ6AzRI0IiDKsuyDDS29Et40QgSKyVafPRZVW4MyJQvh75eWW 9KNl62FIP+m9nOInS2ygWDBtZLSQECsZOtPIZH5SSNRGZ4GfKuh8Swx1qABgvGWni/w9x6K87Ao JdBtSev7BF0zAZksAhZSdcvbyobrhuDEoMmI6qxxCxSfzt+75mE3BCS5bTNxQ7dgr6dOlGT225L gk/NxvzrjO X-Gm-Gg: AR+sD137wR6GBcAg1K1M3xyW5IxVdVrpx7otyNdwzTVsgaQuoE3jZKbqpPFjYgW8MfV uYJPg+HKxIgTFp0YKgjN1DKDabZPRatjhmZHSiRiggwJdyWST6oSy8vbvAxDiOD1R4mL5feDniN I9JgPPjQEtG9de8LEkyPNebakIYwzcVV7Mdpx9oSN79DcOWqc/wlHEOtZYycMyts/iWUadQ+oiL 0HrI8rVdsqOa2TDHc7d/huVvzyrj7u2Ru4TNqBmArbMjvHnObFrSfvWcOLrIlbF+idcfcpt3vD1 z3PCkCtCi7chWKApImo4f0IL/8RNcr9qnC1UEqkmt7z59CRO1tozRXRfpb8IZkhecQkXslsrhQT 4kjprGP1MxLWub53l+KP6cFP1XyB0 X-Received: by 2002:a05:620a:414c:b0:92e:94a7:16e8 with SMTP id af79cd13be357-936d2287b14mr2407692485a.15.1786974046425; Mon, 17 Aug 2026 06:40:46 -0700 (PDT) X-Received: by 2002:a05:620a:414c:b0:92e:94a7:16e8 with SMTP id af79cd13be357-936d2287b14mr2407684885a.15.1786974045725; Mon, 17 Aug 2026 06:40:45 -0700 (PDT) Received: from t14s.vakwerkhuis.com ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6a3d8517181sm772179a12.1.2026.08.17.06.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2026 06:40:44 -0700 (PDT) From: Hans de Goede To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi , =?utf-8?q?Niklas_S=C3=B6?= =?utf-8?q?derlund?= , Loic Poulain , Hans de Goede , Kieran Bingham Subject: [PATCH v8 1/8] libcamera: Create IPA by name Date: Mon, 17 Aug 2026 15:40:35 +0200 Message-ID: <20260817134042.277168-2-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817134042.277168-1-johannes.goede@oss.qualcomm.com> References: <20260817134042.277168-1-johannes.goede@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=FqI1OWrq c=1 sm=1 tr=0 ts=6a830f5f cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=rrvG0T/C2D967D07Ol03YQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=P1BnusSwAAAA:8 a=EUspDBNiAAAA:8 a=rl81jYYfPRFGC34jM1YA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=D0XLA9XvdZm18NrgonBM:22 X-Proofpoint-ORIG-GUID: 46XqesBpyc8A1KmSzozV9Oluq305vC85 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODE3MDEwNCBTYWx0ZWRfXw7hBJkBNHngS UeBAF6R5eBFi+g2duKudHq+3sNJWGol0W5TIqLrXXilpYFpTtjQUQUZpBopT58crtwZ3uO9hVIA EekY2rqjEFQtnJW9RlnPaFliCts1GYXxhen9zKnSvWmcMAs3flX0qA3/UGRSi1hPH9whlWadvBJ kx57hMtjbw65+/Ur1vMBkLyl+e8sBS/HXZ6lcRnMQS/EjEVQ1hLe2j3d9EBmDmIttEL1IPRrSna BTskHmA28iljQYRLCRTb2u2yuP+ZjQaSR79EgOg8kWCiEYfc7CKkVx9BhhE4XWANSWmmRBTovfx irH2XoEviy+kkL3LvRd6cW5PtjZPriO20DWq/lSNtM51/aKeO2Rxfr3cAORnKy4uBMBRCh+mRbi RjdytDpCS5zBS/VVeSLgHttFXw2WDRuiN0nprKtvENxoNOLM4OC/cYmkHqBTj9fsiig2hB4cnIw BuinD4pYGTjdETe2uLA== X-Proofpoint-GUID: 46XqesBpyc8A1KmSzozV9Oluq305vC85 X-Proofpoint-Spam-Info: AW1haW4tMjYwODE3MDEwNCBTYWx0ZWRfX2lEIuz0Mlzh/ LzkFZZz/4fsxaF/L9KZnypDl4vHhc86bhnqMmA32209b61B3YpiTz2zOGt+Mcm/DDs1AQYNt06N dr4LgEMlkbKi9RnlXaTx8Cmi/mdMLoE= 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-17_01,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 adultscore=0 priorityscore=1501 bulkscore=0 suspectscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608170104 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;