From patchwork Tue Jul 28 17:24:43 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: 27514 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 13C4CC3264 for ; Tue, 28 Jul 2026 17:24:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 12EC967FA0; Tue, 28 Jul 2026 19:24:56 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="Qch0L7cE"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="L/P5KRic"; 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 2BABC67F96 for ; Tue, 28 Jul 2026 19:24:53 +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 66SEcdGk3063296 for ; Tue, 28 Jul 2026 17:24:52 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= YvOLWZaa2ARsXpTzaMH55lyGJ5u3pN7HFbz+LZe8YQQ=; b=Qch0L7cEY48MxcM0 GJZF+16564a02xvRswuEeAYffi5zIiBtZE6wB7by1WYn2L7a+fHZYRtY91hfls/x UQnjC62JmmfSk841+0yRbu8pN7StpA9PEm3qrmANe0Gc4OqKaoycgOsKo+2+0OCu kzmcy6L+Q6tycA1GQPhjlmDJBug88sByqsf711X6d5QuWpHDmq087oWiO8D2AsyK aqWoLFn81NT0T3R3Bj0aAI2xIGBx1EA8OO8QWZ7Me4xBOpe8+3+c/6lXpKiP2jwG etJBFS9IGOrlbfXDRsevz0MqyVV784uJ3T5YLBzcwbN0n/q9EPh/moqInzSzfC1H sauX1A== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fpuyg9x4w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Jul 2026 17:24:51 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-51bfe3fa93bso864971cf.2 for ; Tue, 28 Jul 2026 10:24:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785259491; x=1785864291; 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=YvOLWZaa2ARsXpTzaMH55lyGJ5u3pN7HFbz+LZe8YQQ=; b=L/P5KRiccpf/72wXhIa+YYlj9oxRqc8rKisYjViVqPLUP52UYviFrKV0K7WpfLj1LH Z5kMCkdyyQHUURa55sK040WNpLlCn9bjwI0nQqgA4JqPsdKvzF+IbAjfhgQXLKQTz5Vn x0wWWbeDRrBdLju7HrjGCyi1WJs7r99cn9nYQC//jcLc0LJI+B37G0yTBCy3wX5kpBqP 8AQ/2PC/RN3yxbOnBWoFismj0aG1PXnRpgJZk6fZ/6TYrlVzuIA4iNB91hNj1iydRXV4 3QZZM6ODypF9OXH5JtZed2/GWVKP3/u/mAOItU1+d0RGHRXaI64JWyh8Rge8kNcm8isl 7oTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785259491; x=1785864291; 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=YvOLWZaa2ARsXpTzaMH55lyGJ5u3pN7HFbz+LZe8YQQ=; b=lf3tBOIbZpzq3T8I8lyLItgmlL4BQDYTY2u+NoftnrdEcutcjoZltGJk0gBIljGTSn AYRvo2RcXAnD8LymRhr/JGZezfmQk7V4WS5uSH4vNIjEg9mhAikdfwMU+pCtKYdo81Vj KUK3LvjpjYcYWDlFTe/WcXDdItcIK59XTZNgupWYchdYZqG54dy1Oa4cBgfjiCTRs82b kE8ur5WOiZTpKL4UG+u88kDNagKAcOQRJ6nes3q2UT7Lyb9Il9g7AxiKv20zYDEdSazN F2grznBuAJGGVyhsMilWuR0qERCMuZ1OyrMryoKtaKW6I10JYH3/OiHoUUibAhF8DFxP JBTw== X-Gm-Message-State: AOJu0Yyb0d17ZPk0VBJRgPpO5LFicrbRDCPuSnLi9oCJrSBzrYt1GEMj jfYJizN1HJzTQjwmtLpppqcGeD/v8va/sGctXVZuRIs5wvqFaWu52yCfXaxm2wiWbXBoeXa8XrK bjOh4x2z3STxGmfgjOPN7kwabKsgfaopRDbTagNBPZY0oReabEhzLkWfpvnoAqxIXOjK+abLJwk vs/j+oiL5v X-Gm-Gg: AR+sD13jX2DKJ+xANqP73PZYRJTgPThpS70DKIUbimyPEH07yE7Hqge+tgOZYkRhBdk flTcjJWc8tAi5cVtvtnyP1glqY9UUY9HgaWXjcw/vf2O5UgkSDdv86r4ixKU/QPKEUyfthJpRCP UnPP2MlFtdqgJkY/a4WQt8OYydpsrLOrl8POaIBfSclNg6+fUh5ruF1BJ2/efRydwC4e0rD2x2i i2NdTI+BVe4yuvIJE7EVXxTzhSzmGnCEeso5zyChZOpoM6LM4Bcoz572z5MRjSSpFszXcKwWw/N oxioGEjnpyC3jwL6tCH1xlyTlsySj3P1Zyzs1m9HmkqtbY++XQvz9O4cxmVqBfJF4xKN8b/oM0I fHk1ONTTy/6WDMaXBFtGHVjHNJtVaFNkNwaiWzJrhTbdTDbjlZ3l8HJo6XktiFMk45BHcNel/8s 5XSNIleMKoXFI= X-Received: by 2002:ac8:7fc5:0:b0:51c:1590:8e28 with SMTP id d75a77b69052e-529d6ffc7cfmr29856371cf.25.1785259490989; Tue, 28 Jul 2026 10:24:50 -0700 (PDT) X-Received: by 2002:ac8:7fc5:0:b0:51c:1590:8e28 with SMTP id d75a77b69052e-529d6ffc7cfmr29856041cf.25.1785259490373; Tue, 28 Jul 2026 10:24:50 -0700 (PDT) Received: from t14s (2001-1c00-0c32-7800-07d4-cca3-ec08-7ac7.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:7d4:cca3:ec08:7ac7]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1f83fabcdasm11136466b.48.2026.07.28.10.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 10:24:49 -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 v6 1/5] libcamera: Create IPA by name Date: Tue, 28 Jul 2026 19:24:43 +0200 Message-ID: <20260728172447.68551-2-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260728172447.68551-1-johannes.goede@oss.qualcomm.com> References: <20260728172447.68551-1-johannes.goede@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: tqh5v5NryZ2WJYXHLAI6fOmY9xV2LnSN X-Proofpoint-ORIG-GUID: tqh5v5NryZ2WJYXHLAI6fOmY9xV2LnSN X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI4MDE1MyBTYWx0ZWRfX0t+W1GchHYiI 2g5SXiAzuB7tF3lNmlwLIi/vP+P8HLb0eFjcnG0eoDXyRMkgGBQwkPJKFkatw4ahqu9ljlQrqmX lHLK95bUeKFSI65fvKf3gRTfrSps+bmn+HMnlCLLJSuh+97tBUhYZ4wV1ZEC2hua//+4LSoyfJZ W+8qxZWLXUCiT7YgRK9jnhIG/xW0IQr7X/2o/NjKjuRLDo1uX6cFpg3MwYk9vtViF0B4HEgEOQJ UkGvo7jJVN3JPc0ETf+9sSADxEI5+KhmMklLh6A47UoCSplX+rKtKqDbnnqZGZycZvRiccOjXl2 gn88rzx/96vt9lqA39zyrofVdWUqjQWKxV6c6e7sexpEq3Cajf1siysCvvviAvn8+dATrZo3xWH BnuU1AJBaa47pvM3q3YJGUgNt5wC1og3EjS3c9b+8+CTpzZkA4gPxaQ/2y0KHnrd0DeV+XKY3Ls LkH1mLGMA9ysGq0OAXw== X-Authority-Analysis: v=2.4 cv=aoWCzyZV c=1 sm=1 tr=0 ts=6a68e5e3 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA: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=uxP6HrT_eTzRwkO_Te1X:22 a=D0XLA9XvdZm18NrgonBM:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI4MDE1MyBTYWx0ZWRfX3zxqPGQssvqH 8yiqM8G/Vtl45YIVXxKXhl13/7Q1dzTXCQFwkH96Z5I+c/K6TObGe9Ig2t+uRm0FSRf3TNcFEF+ N3NMlNf5VoEc2YmIVOFuCzbylGW9ONE= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293, Aquarius:18.0.1143, Hydra:6.1.134, FMLib:17.12.100.49 definitions=2026-07-28_04,2026-07-28_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 spamscore=0 bulkscore=0 adultscore=0 malwarescore=0 impostorscore=0 phishscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607280153 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;