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; From patchwork Tue Jul 28 17:24:44 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: 27515 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 98F8BC328C for ; Tue, 28 Jul 2026 17:24:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AA1F167FAE; Tue, 28 Jul 2026 19:24:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="nthyymWC"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Y7Vf+6lW"; 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 E066E67FAA for ; Tue, 28 Jul 2026 19:24:54 +0200 (CEST) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66SGJclv3328206 for ; Tue, 28 Jul 2026 17:24:53 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= gV2YFhczcfA5MBc/tyL/MUyntQa4LIYH+mF84W7QfZM=; b=nthyymWCC2N9/KRM 7E5ypxqY1Y32WgV7ycjQgGl8GiiEpGhgNxHsLh1zDcWV06aqXDeJTnebfWzX9EXb 64sndQzjVrCuI+XOJOGJuwOhru1a10xtNXKqpMd6EMksclSThHGXYKuC1NLfS0Kl L+l43gFmmirEUucaiD0nPV/OB6Ts42UirP6wq4U5ECwfthCUEMzVFdajmDXhZPOd x1EnbPdlXUKgSs9HMV6MFPvZnUCcp1vVUiHPSdQ7Z42uDe9xOO3qV2LFH0b7Xt7V AMCU8vh+BEO6XMLwxH3hiKPogO5R9BknUr9GQzQ378IQrPKY1XcSCEAykAdrpSww US9elQ== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fpyukrach-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Jul 2026 17:24:53 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51c21c01cf3so1269301cf.2 for ; Tue, 28 Jul 2026 10:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785259493; x=1785864293; 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=gV2YFhczcfA5MBc/tyL/MUyntQa4LIYH+mF84W7QfZM=; b=Y7Vf+6lWwTBsthP2nA/qeUk+JiOV1HfDCVkdSbHpLiXyxCORKQ4QQCdxwqHDBZtErL KK1uj77eJQimPxwIzOiWsLJHrsZwdEEH8KWH7uSgsZn3ezHDNHOBpJS7KkSMM2BBOLzQ /hyupOgDTtMT/08J158DbEdGF9AGZXzVmuIrnkHOr/GNCcQnOL2FJCBcGb4rSL8D7NSD R+Q7W71na+YuEoOwARJ+pQRZWM7AUB4sAL0+b3Ux55twCEgvL0eLrAFk/xDp9UJS+1KF cBt0etTvqDy329N05LPwU8tSNdTo1XSFit6+mQt1K2QU6bNyzJUCGPMQm4v1USzSvb9V 797w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785259493; x=1785864293; 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=gV2YFhczcfA5MBc/tyL/MUyntQa4LIYH+mF84W7QfZM=; b=YPvLhes5wAJV5a9j35WLMH70IRb8BcTWiXSIHDzaijbTRdUWk/LxMgrfBquXogLc1g +5ILkeBrvNnHIs5PwwU5h1Y8N9Fr8wZ9ufvXG9s8+ZbNTxZmC10HtSY7Js3fwwJeJ68S on0zqrFURDv5tfntS2psySVLxCFyASSKI/fdYYgkSgeekbyUBkWp9N0SIpm2oalBPD3v 9wlRJlHVF2CcDjsCBGFxMQsMJSHnvrI+5zulzrHkby/5jLJbWbS8F+YPgYsl1O1IjfQC Y7rWWF2gOlRvx8qO632YAehU8O5NAYJMit4dHCnN1pAkRFPN2Xd2Cm+xK+b2NCaTIEud yoZg== X-Gm-Message-State: AOJu0Yx7merZov28+DDu2q82Aj0GvixPSfArW2nyJtKRRGH9MPH7lFGS cme6P5lhQtJLYt8g3WLgrX3mOnYprghN7pvB3wpyqn9zQQaOOV8qCQlpoImzRzCeNl5q4LoCgVB dVOs0ZR4kxwQ2oZxAQNOMBG/PBLvdg/aYPTv5cg9Y3qWgMP2eOwiGe8Ary58//6gxIvZsw9KgQ8 huhHIYJBtH X-Gm-Gg: AR+sD13eEem9b7f4RoCAZ6VRieW5q0BGiqNrtHhs5vacHG+cf9l3Le7s4dUj+xVsbe6 rFVcYfxfwZlmggn8sZBtRRWrp0bg7SMDtTOufU+1jR6zT7XDKdYbPfh5m1AqLDzpsSRjV1y2Uax P245SwW5+7hCEmkDS09fWepva4E68Q+6hTFJhWMV6ejJBh1VGqPOBufAI42SUml/wjKjbDhe2xM 5WcBnkQI1RoasXgyp1AiAWRGGPwVsscu9TgTBDi5hcBGXRf62PfzovuTzXsDf92ZBln5O86cH+h Y6j2C7qSS7+/vWJNR5kpY1yV4uunn2PaW7onWE/nIseZXEtDdqWuG/oSyykRBoQvR5HaOu0yciR NmzTidCRmWE6kqcDq8Orsh6V6F3bycsOuzo2Ba8M+4fsgR7bttkXomhAY9MP5ULoBnaVQhzRP/R pnA2w5QA1lwno= X-Received: by 2002:ac8:7d91:0:b0:51c:7b12:120b with SMTP id d75a77b69052e-529d7204039mr32536791cf.73.1785259492426; Tue, 28 Jul 2026 10:24:52 -0700 (PDT) X-Received: by 2002:ac8:7d91:0:b0:51c:7b12:120b with SMTP id d75a77b69052e-529d7204039mr32536361cf.73.1785259491845; Tue, 28 Jul 2026 10:24:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 10:24:50 -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 , =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= , Kieran Bingham Subject: [PATCH v6 2/5] ipa: ipa_module: Remove pipelineName Date: Tue, 28 Jul 2026 19:24:44 +0200 Message-ID: <20260728172447.68551-3-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-Authority-Analysis: v=2.4 cv=O/kJeh9W c=1 sm=1 tr=0 ts=6a68e5e5 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=P1BnusSwAAAA:8 a=EUspDBNiAAAA:8 a=lvZftHTMWe99GEGio_gA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 a=D0XLA9XvdZm18NrgonBM:22 X-Proofpoint-GUID: QwvTRXSwLHRq39sZv6DXVYls5EfL0iR- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI4MDE1MyBTYWx0ZWRfXzhenU0PRZwC1 w/2qlQ0BADDFiZtfyFryiZb1qIx3GADgAjTOpF8bakQvo53va6tCdqejQzfg10UvOfrpttZ3UDU JGV1uHUfQI38nyxuB+BcVjo8WW1ONedsoqw3QJ2wkvr5oXT+qydT+uFSlUE3jl1ep7P+/cyJWXg UFhtedcKDueeXan2dKVGYSR3EBx7WAsvI0F3+qz34muZg//d09pPXWYweHnoD4EDhgPEl7R7fNa KGqyvSJJX9B2YDWkouFWHVw3Lua9L9rpJ/ZiS7DTYrM6+ybpvdKfG9+IRnSUtZTiM8JgZPVuavL YtcFbpm1gDXzS+G9kX1E7CO0Vta4k/yfL8+unyFEAIQrfywQD44pZH3JtoP0Emh03sOOtj+XuyH P9YBiL4Qsx1NGy09kgYHUSKu/vJgJyf63JmzbpCNgluVlUI0Uw6gIe6d8ycovr688HaGaYHDLBZ d8lPUgdukwXH5fwzzlg== X-Proofpoint-ORIG-GUID: QwvTRXSwLHRq39sZv6DXVYls5EfL0iR- X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI4MDE1MyBTYWx0ZWRfX/zGxDvSX2kcU Ihsj76C73Wb1pI0AigMf17CZ81UJCK65azn1BqG7ySpa8+jlK+2g7FR/DqQlmyoG5/rEYKvEBq9 q8FtU08+FZnlMVgJu3UVb3zA1NTQjig= 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 malwarescore=0 priorityscore=1501 bulkscore=0 adultscore=0 impostorscore=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=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" From: Jacopo Mondi 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. Reviewed-by: Barnabás Pőcze Reviewed-by: Kieran Bingham Reviewed-by: Hans de Goede Tested-by: Niklas Söderlund Signed-off-by: Jacopo Mondi Signed-off-by: Hans de Goede --- 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 3507a6d76..436ec82d7 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 4bdc4b767..42d475ecc 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 1d3af0627..47bcd3748 100644 --- a/src/ipa/mali-c55/mali-c55.cpp +++ b/src/ipa/mali-c55/mali-c55.cpp @@ -380,7 +380,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 58ef163d8..e0dde542c 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -481,7 +481,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 fd28fc385..88deccfd1 100644 --- a/src/ipa/rpi/pisp/pisp.cpp +++ b/src/ipa/rpi/pisp/pisp.cpp @@ -1147,7 +1147,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 b6ca44e7a..f30eee7ff 100644 --- a/src/ipa/rpi/vc4/vc4.cpp +++ b/src/ipa/rpi/vc4/vc4.cpp @@ -633,7 +633,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 629e1a32d..d4ab91e30 100644 --- a/src/ipa/simple/soft_simple.cpp +++ b/src/ipa/simple/soft_simple.cpp @@ -343,7 +343,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 4162b848f..bae48ea90 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -183,7 +183,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 c89887954..6e8513d0e 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 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 1c97da324..af71c3285 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); From patchwork Tue Jul 28 17:24:45 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 27516 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 303C1BE080 for ; Tue, 28 Jul 2026 17:25:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AE44567FB4; Tue, 28 Jul 2026 19:25:00 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="ZeYGh9rE"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="dxnL1Rkz"; 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 17EA267FA1 for ; Tue, 28 Jul 2026 19:24:55 +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 66SEcesR3063320 for ; Tue, 28 Jul 2026 17:24:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=p4qhMs83tjW e8RfjgkHMORxmA1XMNp5mXSZub0Q/x6Q=; b=ZeYGh9rE+k+7Fu3UXPKYMtK0zKo czO5OVqkzWPuo1jMh7qSoY+k7VlagIzhLel0AnIaa+f5DHXZkjlqm0wHZt/f1c02 QsxP3CA/85dXkA3Ju6nqfuVI4kgaEwbcJL53O2WOVugB4b8C5ozSc/58qMjVYxwv n/1f0wqbS+vPnqYyYCVO5DRb3OWwHSrL6smUMIEjRzMB5oyQ6k8q0hdtz+TRHCG0 PFLZzdhGpmJdA9RK8/a4wuSbvjtztOv03xSFQBNMLg7Ekqq/+BFliOf2+7N1iOVR LI/7jIFvkl/tiS1Cebpf5T6Kq5Ws6iSBx7W7mr3fiZjQ+AOS+Xs1j6BpNwA== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fpuyg9x5a-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Jul 2026 17:24:54 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c1eb52e1fso1588711cf.0 for ; Tue, 28 Jul 2026 10:24:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785259494; x=1785864294; 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:content-type; bh=p4qhMs83tjWe8RfjgkHMORxmA1XMNp5mXSZub0Q/x6Q=; b=dxnL1RkzlSMlMycyAl1bU0A/HhSo3QV+LTOMxCqwliv6DusVlpX4wQKn7jYnmWWy7K PHN/klPM514GQzIuKHE+yFko3xz2faSCNGNr9MdWQwVmSR7myGQj6dDUvlWNYDUsPZjP Nd4OX3J9E8HkVQeFC6V3d1mupLury3lCmtl34UCxdTFzxpry9RAqm5kyGjPBzk8Zpdz7 SX0YUJMLi8ILAiMfKQdqwsnbRAzWh/7xelYXf3Du0DQptFQjcRfJN+VJj/k0aD9rU8rq ypdNSWjbEv1LVFOCTAgmhTj9kU0ry00iBxcNetWQ7mJ+adf877vC/MkGcZ/edKf+77/Y jsLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785259494; x=1785864294; 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:content-type; bh=p4qhMs83tjWe8RfjgkHMORxmA1XMNp5mXSZub0Q/x6Q=; b=eFwWbKFQvshN4FL0o7lGP3tS/euJyClpKTLvQ58SEgBkbvrBLoj2gEjIXKgVU71zsV N0xuVlDBnNfOun+BnpxkAV7WWuR2n0XNzcIgVPufj06SQIS0afQseRu17kdvs8pjm+Ej upboQUXrTQFBlz/EvwJwGjYyu0+FlEiQANsfvXqf/MVnH8sQlHpHaK+k5rShnPECq3Ow Ib+7Ksoyi537YkNChr1Jl6z3p57I8nysdRvFUxRy+bZut84blXsXjOcIUci5TcbvtvzN k1laM+sHr9jMKWrHNtdQyCAzcDiPTnVtw+OO8JyFF6Etd7kJoD7xOpOY5bpmQ++NGqMQ yygA== X-Gm-Message-State: AOJu0YxJwSMx3yvxqko6QG64vwx7HngxS9Ez8AKJ5TIBYzof2B8I2Qjr hMTRHfe6qz4Q0dtYD9+BljCXBvIkSu+sdBP9e0mzWyYSxfxguDdNdoq0KZICQw0dcuQDRzcs5mE OJaXCpxjKsr3kcOroA3r7kjUQPo56Zod3lD0Q1tiAs5EAFrdeLKlc3Ulh0Amb9JOEVKkCUbKRmI 9ANzvRi9k7 X-Gm-Gg: AR+sD127muaG6cGEtEkJZg1SK6atsWdLMruD6QpX2MdXQmtIU/yYFgJ7GcAps+9lqmC VaR9CjI4ApWMOxXVuH9lWg3d/65M4ohW5azubV96PuJU24X54fexkn4KffsEiltcrZ2f9u+cBU4 jpFpd0X/2W5kBKjkzSnIcKonnOiwEdDafru/ohFFaC/jbMG5Qt7BH9Tq1VX6qDnvOMy9qGOj+IG 0mzPxcpUtTX+2lHvH/hWwHa0+lwhQhSg9vWmNxKxywwH/4IGJ/oBRcBBWV0wcl9Jbm9dZ+1BkhQ 7lq6++10kQNWxmim71+cyI0UcjVOyGpPAYr/7O0S6sJ8fTXkddHJ1wSy1Fswcms7q99ZwSB/m2T 5pNDiCjmx5rgOqgpamQZJlSPNnHNJnvhhgVTrvT8s6nOspZE0dXRD9BjFPv4vJ9+WtOmiXm6atJ Ay26D6CblH8c8= X-Received: by 2002:a05:622a:1903:b0:51a:8c86:bd44 with SMTP id d75a77b69052e-529d714760amr30821321cf.65.1785259494018; Tue, 28 Jul 2026 10:24:54 -0700 (PDT) X-Received: by 2002:a05:622a:1903:b0:51a:8c86:bd44 with SMTP id d75a77b69052e-529d714760amr30820941cf.65.1785259493359; Tue, 28 Jul 2026 10:24:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 10:24:52 -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 Subject: [PATCH v6 3/5] ipa: Allow pipelines to have differently named IPA Date: Tue, 28 Jul 2026 19:24:45 +0200 Message-ID: <20260728172447.68551-4-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: aaXTkZFYBUJKVq-IP4mz2nOgRhyb-fwh X-Proofpoint-ORIG-GUID: aaXTkZFYBUJKVq-IP4mz2nOgRhyb-fwh X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI4MDE1MyBTYWx0ZWRfX1nJoUy4V9dX3 wZLglKGNRu/lm8UFHVFsRWU3JTkBEKLkXdoHAM5Q7Z6JEL5JJUb1O3dkDttGJ1DLmka+r+JJJJx KA/rXY1dKRepMPPpJil2yRuNNSAsr/FMcG50VQHLa6QgYmoBVNriVNqL4+W+wZD+2e9arloAOMD ri5IQp27ut8kv2fpvNWpU7FQDIdYcXvZs8YqZifm01CPhhL+fO19HYN5wE/Vp8gI/mUGBC/Yepa 1muGqlWyc2u0i2xwvHT+F66Sr2UgQ47nF8/LHEbG0VCBdT98uyMtTjRwc8LNipT8KhXqMXf8MvD PgIyhMgD6fJdA8BaLSRszjhCI3PXembVC0Z7lz1TDXMAhT/S7BYBfFdL3zf8HeYlZlG5ApsmPBt ROpL43999ulj7mqK7NhQlBUU1u9gYIyqWjxVX4zCc8dg1db6qCwB+He1cfJes/xvVfem5mQUyLV md2+lJ7XpxhQIdjtgqw== X-Authority-Analysis: v=2.4 cv=aoWCzyZV c=1 sm=1 tr=0 ts=6a68e5e6 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A: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=c6ydndUcIca2Pb-fbGsA:9 a=a_PwQJl-kcHnX1M80qC6:22 a=D0XLA9XvdZm18NrgonBM:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI4MDE1MyBTYWx0ZWRfXx6WekFbRg43d hUHgbVjCiTmskT6P5zDFW/UwvKmv391Y9U2XC4TQzwpcfvQV9aOg8jXBSbdZnhMgyzsoOpwGbRF Xq5tNOFFgdJiitsymaDXDLBSrsJp18U= 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" From: Jacopo Mondi Right now the build system assumes a 1-to-1 matching between a pipeline handler name and an IPA module. This, as also acknowledged by a \todo comment, is quite a rigid requirement and only allows a 1-to-1 matching between pipeline and IPA names. The more platforms libcamera supports, the more it is likely that a pipeline handler could re-use an IPA module. This is particularly relevant for the softISP IPA module which could theoretically be plugged to any pipeline. Likewise, the forthcoming R-Car Gen4 support uses the RkISP1 IPA and at the moment would require building the 'rkisp1' pipeline in to have the IPA module available. When building IPAs, the build system iterates the list of enabled pipeline handlers and for each of them tries to verify if the 'ipas' list contains a corresponding entry for it. The 'ipas' meson options is an array option and, as no default value is specified for it, it contains by default all its possible choices. In this way if no value is specified for the 'ipas' option, compiling the pipeline handlers ['X','Y', 'Z'] will compile the ['X', 'Y', 'Z'] IPAs. If instead the user specifies '-Dipas=X' during the configuration then only IPA module ['X'] will be built, regardless of which pipeline is enabled. Building an IPA module will anyway require to build a corresponding pipeline with the same name. Relax the 1-to-1 'pipeline'-'IPA' naming requirement by introducing a dictionary that associates pipelines with IPA modules. For each enabled pipeline: 1) Make sure an IPA module exists for it 2) Make sure the IPA module is enabled by the 'ipas' option 3) Make sure the IPA is compiled once only This will require every new pipeline to add an entry to the dictionary and specify which IPA module they would like to use. Reviewed-by: Hans de Goede Signed-off-by: Jacopo Mondi Signed-off-by: Hans de Goede --- src/ipa/meson.build | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/src/ipa/meson.build b/src/ipa/meson.build index eb7846e47..c583c7efd 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -24,6 +24,16 @@ subdir('libipa') ipa_sign = files('ipa-sign.sh') +supported_ipas = { + 'ipu3': 'ipu3', + 'mali-c55': 'mali-c55', + 'rkisp1': 'rkisp1', + 'rpi/pisp': 'rpi/pisp', + 'rpi/vc4': 'rpi/vc4', + 'simple': 'simple', + 'vimc': 'vimc' +} + ipa_modules = get_option('ipas') # Tests require the vimc IPA, similar to vimc pipline-handler for their @@ -39,24 +49,34 @@ ipa_names = [] subdirs = [] foreach pipeline : pipelines - # The current implementation expects the IPA module name to match the - # pipeline name. - # \todo Make the IPA naming scheme more flexible. - if not ipa_modules.contains(pipeline) + # Make sure an IPA exists for the pipeline + if not supported_ipas.has_key(pipeline) continue endif - enabled_ipa_names += pipeline + + ipa = supported_ipas.get(pipeline) + + # Only build IPAs specified with '-Dipas' + if not ipa_modules.contains(ipa) + continue + endif + + # If enabled already do not add it twice + if enabled_ipa_names.contains(ipa) + continue + endif + enabled_ipa_names += ipa # Allow multi-level directory structuring for the IPAs if needed. - pipeline = pipeline.split('/')[0] - if pipeline in subdirs + ipa = ipa.split('/')[0] + if ipa in subdirs continue endif - subdirs += pipeline - subdir(pipeline) + subdirs += ipa + subdir(ipa) - # Don't reuse the pipeline variable below, the subdirectory may have + # Don't reuse the ipa variable below, the subdirectory may have # overwritten it. endforeach From patchwork Tue Jul 28 17:24:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 27517 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 00A41C32CE for ; Tue, 28 Jul 2026 17:25:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CC08C67FAE; Tue, 28 Jul 2026 19:25:01 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="Vq0U2IAW"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="BUTYr/tA"; 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 458D167FAF for ; Tue, 28 Jul 2026 19:24:57 +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 66SGQT1a3333070 for ; Tue, 28 Jul 2026 17:24:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=fN6Nsz++54q ZAy+cZrCkQLy/axQMGHJwQ7RnnI4nDck=; b=Vq0U2IAWOJGbiAhyIJd11Srmyvs 9VaQFkvud1+KvPb/FU5ttonQZBRlVxhTgXVpoxxKLE3UvWR/oeVf4Qflkge63wyf RkNDZ9CLFz2j4n744esjTQz9JUUlavHjOTMRUoDAXNGaKj1RytWvManM1JkzNBrA d+3IeaWFLDLfe4ZtLxDadj0qSOPcBjiQF+Ff2FrNGA5B5RdvfQU/qt+XM8SnkL2L Mmoo2iOQg4u4XnwheyfVvJD+jOvudmbfSgcOi/oraOh4R9uDSMWjcDOv8ekrvg4T aNb/MyrZ5siYx3aOyQl/vBCoONl8CSvln26JnyjpknZnuSisShKHb/bv7Qg== 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 4fpuyg9x5d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Jul 2026 17:24:55 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-51c21c01cf3so1270091cf.2 for ; Tue, 28 Jul 2026 10:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785259495; x=1785864295; 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:content-type; bh=fN6Nsz++54qZAy+cZrCkQLy/axQMGHJwQ7RnnI4nDck=; b=BUTYr/tAHWwtw3RVxU1lk2CQwEF+wzWrxU9s9pDAWRywG5rEvaqQJ8vtakoBA29QWl Rs6iVDTO5RaiaQVshKIpUisA+kwofwZ/v3DS8AzKBE1ra3sQRVIYRLOi4//eTxA/+/w3 Zeia6XvvFv0YNMLcBNl299oo+H50d6W233441wskGl6KlIYWHGTXvDtV8DjnQMbXq59o kHU5MuEwx/3EbthPqtGvCe0uYYm/H3L7mgfe2QLyEEiEu+igKBPNYowtolI84gzjAT30 l+xdh+OWcbiFFV0QuVFEJVbQrv5KOyPqspOl4kYSKv8hML4fkc7Ksv0Wkg8sTrhEH9Vq tFYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785259495; x=1785864295; 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:content-type; bh=fN6Nsz++54qZAy+cZrCkQLy/axQMGHJwQ7RnnI4nDck=; b=h6pyrtWC7Tng7xqNlfEEvE6BlWfiggR/6vLy0au6UV7q4sgSBW2BdgOpKS/eAkn09V o/SEjcOepj17ry/eM+wbglgECL3JcnwCMYKiNst8Xx79wTBeewZK/SAkrIxnwA5dDdNR b4wBWTPWuh/KTSBmn1Zxa3JhoeT7Z5Q9e4Pk0432qp0nn0jaVknShnrFDwsnkPzpCmBr iGrCau6OABjCnlovTu5BVyKywIc4PbO0ZhzppfPBIxjmrbsYVMyHQTIUEAM2oB1q0tK1 IFtC2vW8IWY/bQ0WYFFo78Ond0Q8N0zLZxKjanD19asVV1SqBgL+LA8sSDu8FBn5RSvi ukHQ== X-Gm-Message-State: AOJu0YwXnQKDJLLzYrkis2L4eVzSlFS6ACUsemZ9OrxxO/NOhdoiSY9L sAkmLTXhXoyiBryw4hHqWcetxJxV4PZuSLoBVqWXgflXwF9WjHtoeR7VHTxQrSr34b3lB8dZ4Fz osPuwDNYtZwaFw0lnjplYsPiZKOmSGvG+fqLWgLyaJt8Se4Sz+5celeLhVLPTXbgxDx7hu161si YHysKNv7Uq X-Gm-Gg: AR+sD125n7JmTHrenNw+GQGZAivsha56ZL/XtjjOMaHQu4B79t7M5YkSGm7z037EFcD m6Ov/IddZmluurw+rarO+WcMlNRsVbqcrmNrUhzTYHhrN8r/+4/PbQifW9ASp1p8p5zo3W61/uc BFV+OYeKBQUg2+i2z+zC+5hlfQb5/3X0VUk3RbjvxCxrIk4xtvbiF3Qu0scfO8Sho/+sBybm0lT QCBGE503JpfGvVQgPkMoVDLYpBLfpNP4G6pw2XeZpq214iE3mTkHoTQwfn0sOalg2+zqC5SusK/ E1439QuDFSoKu3QtP4OgI9zMwVfueOAxq2JKvGregRIWbbXHHlUO/6aAGuGjHnVxj60i+ey0z32 e4Mr90/pul26A0ZGVl/Z6MYr8QBWUMpabjDmryNdHa4hbpIoLnPktRotf5TluS55N6TNVLlLc9u MoL5fV8MpJDuw= X-Received: by 2002:a05:622a:4cd:b0:51a:8b64:69e2 with SMTP id d75a77b69052e-529d70557d4mr30823081cf.7.1785259495239; Tue, 28 Jul 2026 10:24:55 -0700 (PDT) X-Received: by 2002:a05:622a:4cd:b0:51a:8b64:69e2 with SMTP id d75a77b69052e-529d70557d4mr30822641cf.7.1785259494638; Tue, 28 Jul 2026 10:24:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 10:24:53 -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 Subject: [PATCH v6 4/5] pipeline: rpi: Explictly pass pipe()->name() when creating IPA Date: Tue, 28 Jul 2026 19:24:46 +0200 Message-ID: <20260728172447.68551-5-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: tbMh593NanrKOii8cXWsdN3hOCcHutsd X-Proofpoint-ORIG-GUID: tbMh593NanrKOii8cXWsdN3hOCcHutsd X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI4MDE1MyBTYWx0ZWRfX5DkR5gQPDhLh y9mGhXRMAIZB11tvRNd8HWpF1SDyTpoqe5o6T954Q66dIqG6HE+vaLsHRMBeXqh8gS7V6Itjf7S bnKd8PggAyMQqPxM4PcqeRPzhUOkUVREhsshadxccU/rab+lXyPJU71Dus5JVqM9U+ET65kDezT ww6CHHO2wUQ2+WlH8iHKqG0QmigcZ4QyT2nXf3YGdvl/D72nraH8tG35jHe2KCk1+V4aB6FTjN2 1IAxl5BOd97WCwQXiinpiQ62xD+JTC1IGJ6DlxrTz3up1A/Bz89A1BEdRLwHYK5/OU/b3nXqM7V Kd4UFX9hTP98icIEol/ghrjUQ1aZaGcmNiNugPc8WQLtK80UZASsboCYkvIT3hRtEq0Fb/hmUTw EhxO9vUiuleyhzzxkGCp+O7YMBZjWtQ5W02I7q2VGg7czRjHzyoVUbd4DyzKSNQ+h7pS+ciHEnM 4OSnKgZYW9ZOtDd5EFw== X-Authority-Analysis: v=2.4 cv=aoWCzyZV c=1 sm=1 tr=0 ts=6a68e5e7 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=xqWC_Br6kY4A:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=PI23gj2s8gul_AyujO4A:9 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI4MDE1MyBTYWx0ZWRfXyODc2NpFVekI UtzordYanYnD7zAMxQw24dtpW+/4+m7sGHCbBXITFCadRMyLw5p7oFeHpl7C9TeV9MiqExUAunO ZxS5fk1vAVO+U3mkigbW6uEXNwcpcKY= 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" Switch to explicitly specifying the pipeline-name as the name of the IPA to create. This is a preparation patch for switching the default IPA creation to matching IPA by IPA proxy type, which does not work for rpi because the same IPAProxyRPi type is used for both the rpi/vc4 and rpi/pisp pipeline handlers. Signed-off-by: Hans de Goede --- src/libcamera/pipeline/rpi/common/pipeline_base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp index 5a5acf6a1..d1f4bc79f 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp @@ -1165,7 +1165,7 @@ int CameraData::loadIPA(ipa::RPi::InitResult *result) { int ret; - ipa_ = pipe()->createIPA(1, 1); + ipa_ = pipe()->createIPA(pipe()->name(), 1, 1); if (!ipa_) return -ENOENT; From patchwork Tue Jul 28 17:24:47 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 27518 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 3ABF0C32FE for ; Tue, 28 Jul 2026 17:25:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D2CE167FAA; Tue, 28 Jul 2026 19:25:02 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="eV62rF3p"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="PEY0EegU"; 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 0300167FB1 for ; Tue, 28 Jul 2026 19:24:58 +0200 (CEST) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66SGJXlu3327954 for ; Tue, 28 Jul 2026 17:24:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=c+O9A6RXZNT /7ALRGO815PqHixx+14el9z+DkMtGVRs=; b=eV62rF3pzQU+HH+SvrvJT6cTL/l HIwcwZNFhYPfLHnkIR/9j6BYdZFr72XmjxUIqtUqWE/xw/UE/yt8Ttn+1JX1tA2b 64/9heRmj3nSIaJMeXOsTVJnOI1xX/JweQyHL+XstZjuv9X3vEpq7aWhsdPyBpkh eqzVy2cFYYJIAjK8hPqm3REe1vCNhkY331yujwv4Cl4NNnq62AfJ5PRFcTpQd0qE clBIbs508gVsJ1TVXZNLxeA9byEHtCCwf3eeNPOObzkvQAkFomxsxPGq+de79F87 ljjIRkWtapgII/HC+B/iA/vK8EkuwBtModZ4SxCq93Ma6vAPrB+zdXBLwtg== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fpyukracs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 28 Jul 2026 17:24:57 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c20762d21so1028231cf.0 for ; Tue, 28 Jul 2026 10:24:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785259497; x=1785864297; 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:content-type; bh=c+O9A6RXZNT/7ALRGO815PqHixx+14el9z+DkMtGVRs=; b=PEY0EegUtptCLzxXYe+09f2L3ZOXYMxEsZYORJKQFdWqVnr+4MJgnWBondz2z2ysnq adh7v4mxy3huL6oPJLQLJ/ch65nGFL41JiYUzDVCXiHEwFcirjkM/01tgwGOGhy5MVJ9 QZb1d51psvf4aeBdTrx+HiH1G+UP0rc1ahdAqb2Qe6uv0FV4vFI7OlGGR+8UqRikaGgH fT3UM/2JN/Q4F8WG79JSCOBK+nMHEFAMh4Aa/SSIzZv3aVJACCqHIl59rL3YKAYsJNEr oM4spKqdBZdRCy2UGNelxpicR7sLMLoH4y2M4MEZetODazqc3nQ7viq/dRD1L4Bv1BPJ oEZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785259497; x=1785864297; 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:content-type; bh=c+O9A6RXZNT/7ALRGO815PqHixx+14el9z+DkMtGVRs=; b=DNoL68m3uhwfQDajQv6/Xkg2FOTEGyqhtRUffSU3yl83CBwOqEE2wmsJG3I43RNoN0 pemMgORXHvQIbSjdFVtESns0fKf0vO44BQj0mwOmVeXAskW3HwBtot/UcqI8ZqkbrVQ5 lTNxdzQHAecm7Ul9MzEuaMksyyWkfOu7ZfgujImj7f5qLzYXGelUI7jVl2iQF+vFPUVI loIORhyJDdgmpgftRIKPyT/niNRCeBnQ/R7rnzelDuWkoYLsYoue/3DwUrlMYYInmC46 p/ZLvC6X56CJn9Pl7Wgh/9ddRY+PHR2pXiBbhrTXDzC2iKF+pAqrX6zpllE5qfOYL9P7 +Fsw== X-Gm-Message-State: AOJu0YyAGpEHix7m6dADySWPo3AfjEPUdwUtUOTJK+A45KyD8F6Syuy2 TxnvFxQGK290lyHVgFAAEOZwJNrHzvqksq4Wh40kEzUQu+MZjoPcJrkS+EEtct+PAmUP6yzoV1N WwukSxZ56b8KFHEIfNS7E073XruYsxWS5ekYTw7kFMshzptAgUqTExjvtSrxOY3GPXKw+ryl5Sp NHlEhIRLkw X-Gm-Gg: AR+sD13JTL5O2JQEvKueCcuVgfMnjVv2ArE7Ipgi4qPYTz5x18J3FjQH2eyyOP4ju88 aAMClDsEJHaFfGnXcwzmPtCeullqK/f3KvVRYZHysBvXXj5eezhWQYRggemBbEpXqyzJendd/Dm l/9G3cbRabVsSjELtG+/Up8R47CkP1VjDqKGj2E10yhmfIBOFvBd3ZZB4ScPI74PuyeMXVeT9KU 4TGgnxScUA/VilNRHf4qp1Sk1yeyIRzY5uSuWk7H/IjuhvbgAbmmLuexr6icwTOnfLrtf8hZbMQ X1B4ypJqMPHzG1N+C4vaMoBbAx1weTToB4H1Wijg9flCjorghQ7XB9pBGalQu0MgWAswpfl8Yfg uusrvZGfgpr0iu6UXiNsi2qP2fiMmZB12GUyPK6X7rg55NHJODbCPeScZM5wqNhrBT4vXuv/oR/ LTgDzewMsjwU8= X-Received: by 2002:ac8:5981:0:b0:51a:8c99:1f18 with SMTP id d75a77b69052e-529d7234c58mr27050811cf.71.1785259496882; Tue, 28 Jul 2026 10:24:56 -0700 (PDT) X-Received: by 2002:ac8:5981:0:b0:51a:8c99:1f18 with SMTP id d75a77b69052e-529d7234c58mr27050361cf.71.1785259496199; Tue, 28 Jul 2026 10:24:56 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 10:24:55 -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 Subject: [PATCH v6 5/5] libcamera: Create IPA by IPA proxy type name Date: Tue, 28 Jul 2026 19:24:47 +0200 Message-ID: <20260728172447.68551-6-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-Authority-Analysis: v=2.4 cv=O/kJeh9W c=1 sm=1 tr=0 ts=6a68e5e9 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=_0kJXWGtG4qjkoVi4RIA:9 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-GUID: uFsMVbeS3DN5sSI8b-ZAYeeCFTF4Rio3 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI4MDE1MyBTYWx0ZWRfX3s6Y7vfl3TD+ EHQxQwc3B6KdlJFzbKvuYUuAiclIdQGadUpAPsGJNTePuSLowvVCq6ERKmDGOUo9GyUq+5+TsK5 +CntMfROYkGJ4HRbSBfckyqejhGUXgtrM2eW0EQDnAdc4ViKe/eee+YH5BidRjQHaUwj7D2TaGX WrW0NHvyWK7kQomFaMW2PEh6p7TgTK58Wha0sJZ28qg4kO3uYrt8L8hppQevB2CNu2UERdHGUiJ N1Xjw7vE6uF9ysmUMylgEYEERrdNq8sZxfuhQNvE/ysW+pfOebjFEYBPPTYP7P2ldlUQ9EXsjIL FWEZKbGse6c4NPMK07mQltzzonyLC1ntDs7czorUO/JEtJRUkYED3Cs3gRO1CRakJE4c1N6rKc5 OdD32H580WdilNAJ5F/YEQgl90GwEM4zsxDuhQQDy/wFKyyCW1raktnpQynDBU5tNr626w41BW5 TS2IVaYEJwL3stfEglg== X-Proofpoint-ORIG-GUID: uFsMVbeS3DN5sSI8b-ZAYeeCFTF4Rio3 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI4MDE1MyBTYWx0ZWRfX3u6ZUVkj34V4 ukd87mifpo3RXiGOiP89dBxAaVWPqT8Qye9KG1hW69GASG6N9T4y1zPb7/iG6gF/n+lzRYE2v6p Oki4+biibO32eiNbcBkjuqDSbYHGuV4= 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 malwarescore=0 priorityscore=1501 bulkscore=0 adultscore=0 impostorscore=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=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's name to ipaModuleInfo.name[]. This coupling between pipeline name and which IPA to create is undesirable and makes it impossible to for example use the softISP as a fallback in other pipeline handlers then the simple pipeline handler. The actual API contract between the IPA and the pipeline handler is given by the IPA proxy type. Add a static IPAProxyXXX::name() to the generated IPAProxyXXX classes and use this in PipelineHandler::createIPA() instead of using PipelineHandler::name(). This requires changing the name, as well as the subdirectory of the softISP IPA from "simple" to "soft", which is the more sensible name anyway. Note: this means that softISP IPA config files will now be looked for under /usr/share/libcamera/ipa/soft instead of /usr/share/libcamera/ipa/simple! Signed-off-by: Hans de Goede --- include/libcamera/internal/pipeline_handler.h | 2 +- meson_options.txt | 2 +- src/ipa/meson.build | 2 +- src/ipa/{simple => soft}/algorithms/adjust.cpp | 0 src/ipa/{simple => soft}/algorithms/adjust.h | 0 src/ipa/{simple => soft}/algorithms/agc.cpp | 0 src/ipa/{simple => soft}/algorithms/agc.h | 0 src/ipa/{simple => soft}/algorithms/algorithm.h | 0 src/ipa/{simple => soft}/algorithms/awb.cpp | 2 +- src/ipa/{simple => soft}/algorithms/awb.h | 0 src/ipa/{simple => soft}/algorithms/blc.cpp | 0 src/ipa/{simple => soft}/algorithms/blc.h | 0 src/ipa/{simple => soft}/algorithms/ccm.cpp | 0 src/ipa/{simple => soft}/algorithms/ccm.h | 0 src/ipa/{simple => soft}/algorithms/meson.build | 0 src/ipa/{simple => soft}/data/meson.build | 2 +- src/ipa/{simple => soft}/data/uncalibrated.yaml | 0 src/ipa/{simple => soft}/ipa_context.cpp | 0 src/ipa/{simple => soft}/ipa_context.h | 0 src/ipa/{simple => soft}/meson.build | 0 src/ipa/{simple => soft}/module.h | 0 src/ipa/{simple => soft}/soft_simple.cpp | 2 +- src/libcamera/pipeline_handler.cpp | 6 +++--- .../generators/libcamera_templates/module_ipa_proxy.h.tmpl | 2 ++ 24 files changed, 11 insertions(+), 9 deletions(-) rename src/ipa/{simple => soft}/algorithms/adjust.cpp (100%) rename src/ipa/{simple => soft}/algorithms/adjust.h (100%) rename src/ipa/{simple => soft}/algorithms/agc.cpp (100%) rename src/ipa/{simple => soft}/algorithms/agc.h (100%) rename src/ipa/{simple => soft}/algorithms/algorithm.h (100%) rename src/ipa/{simple => soft}/algorithms/awb.cpp (98%) rename src/ipa/{simple => soft}/algorithms/awb.h (100%) rename src/ipa/{simple => soft}/algorithms/blc.cpp (100%) rename src/ipa/{simple => soft}/algorithms/blc.h (100%) rename src/ipa/{simple => soft}/algorithms/ccm.cpp (100%) rename src/ipa/{simple => soft}/algorithms/ccm.h (100%) rename src/ipa/{simple => soft}/algorithms/meson.build (100%) rename src/ipa/{simple => soft}/data/meson.build (80%) rename src/ipa/{simple => soft}/data/uncalibrated.yaml (100%) rename src/ipa/{simple => soft}/ipa_context.cpp (100%) rename src/ipa/{simple => soft}/ipa_context.h (100%) rename src/ipa/{simple => soft}/meson.build (100%) rename src/ipa/{simple => soft}/module.h (100%) rename src/ipa/{simple => soft}/soft_simple.cpp (99%) diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index b60c07b13..2a2ba95a4 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -76,7 +76,7 @@ public: std::unique_ptr createIPA(uint32_t minVersion, uint32_t maxVersion) { IPAManager *ipaManager = manager_->_d()->ipaManager(); - return ipaManager->createIPA(name_, minVersion, maxVersion); + return ipaManager->createIPA(T::name(), minVersion, maxVersion); } template diff --git a/meson_options.txt b/meson_options.txt index 20baacc4f..953b093e3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -48,7 +48,7 @@ option('gstreamer', option('ipas', type : 'array', - choices : ['ipu3', 'mali-c55', 'rkisp1', 'rpi/pisp', 'rpi/vc4', 'simple', + choices : ['ipu3', 'mali-c55', 'rkisp1', 'rpi/pisp', 'rpi/vc4', 'soft', 'vimc'], description : 'Select which IPA modules to build') diff --git a/src/ipa/meson.build b/src/ipa/meson.build index c583c7efd..2ec9d7c4b 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -30,7 +30,7 @@ supported_ipas = { 'rkisp1': 'rkisp1', 'rpi/pisp': 'rpi/pisp', 'rpi/vc4': 'rpi/vc4', - 'simple': 'simple', + 'simple': 'soft', 'vimc': 'vimc' } diff --git a/src/ipa/simple/algorithms/adjust.cpp b/src/ipa/soft/algorithms/adjust.cpp similarity index 100% rename from src/ipa/simple/algorithms/adjust.cpp rename to src/ipa/soft/algorithms/adjust.cpp diff --git a/src/ipa/simple/algorithms/adjust.h b/src/ipa/soft/algorithms/adjust.h similarity index 100% rename from src/ipa/simple/algorithms/adjust.h rename to src/ipa/soft/algorithms/adjust.h diff --git a/src/ipa/simple/algorithms/agc.cpp b/src/ipa/soft/algorithms/agc.cpp similarity index 100% rename from src/ipa/simple/algorithms/agc.cpp rename to src/ipa/soft/algorithms/agc.cpp diff --git a/src/ipa/simple/algorithms/agc.h b/src/ipa/soft/algorithms/agc.h similarity index 100% rename from src/ipa/simple/algorithms/agc.h rename to src/ipa/soft/algorithms/agc.h diff --git a/src/ipa/simple/algorithms/algorithm.h b/src/ipa/soft/algorithms/algorithm.h similarity index 100% rename from src/ipa/simple/algorithms/algorithm.h rename to src/ipa/soft/algorithms/algorithm.h diff --git a/src/ipa/simple/algorithms/awb.cpp b/src/ipa/soft/algorithms/awb.cpp similarity index 98% rename from src/ipa/simple/algorithms/awb.cpp rename to src/ipa/soft/algorithms/awb.cpp index 05155c83d..35b6e28f1 100644 --- a/src/ipa/simple/algorithms/awb.cpp +++ b/src/ipa/soft/algorithms/awb.cpp @@ -15,7 +15,7 @@ #include #include "libipa/colours.h" -#include "simple/ipa_context.h" +#include "soft/ipa_context.h" namespace libcamera { diff --git a/src/ipa/simple/algorithms/awb.h b/src/ipa/soft/algorithms/awb.h similarity index 100% rename from src/ipa/simple/algorithms/awb.h rename to src/ipa/soft/algorithms/awb.h diff --git a/src/ipa/simple/algorithms/blc.cpp b/src/ipa/soft/algorithms/blc.cpp similarity index 100% rename from src/ipa/simple/algorithms/blc.cpp rename to src/ipa/soft/algorithms/blc.cpp diff --git a/src/ipa/simple/algorithms/blc.h b/src/ipa/soft/algorithms/blc.h similarity index 100% rename from src/ipa/simple/algorithms/blc.h rename to src/ipa/soft/algorithms/blc.h diff --git a/src/ipa/simple/algorithms/ccm.cpp b/src/ipa/soft/algorithms/ccm.cpp similarity index 100% rename from src/ipa/simple/algorithms/ccm.cpp rename to src/ipa/soft/algorithms/ccm.cpp diff --git a/src/ipa/simple/algorithms/ccm.h b/src/ipa/soft/algorithms/ccm.h similarity index 100% rename from src/ipa/simple/algorithms/ccm.h rename to src/ipa/soft/algorithms/ccm.h diff --git a/src/ipa/simple/algorithms/meson.build b/src/ipa/soft/algorithms/meson.build similarity index 100% rename from src/ipa/simple/algorithms/meson.build rename to src/ipa/soft/algorithms/meson.build diff --git a/src/ipa/simple/data/meson.build b/src/ipa/soft/data/meson.build similarity index 80% rename from src/ipa/simple/data/meson.build rename to src/ipa/soft/data/meson.build index 92795ee4c..f4b806083 100644 --- a/src/ipa/simple/data/meson.build +++ b/src/ipa/soft/data/meson.build @@ -6,5 +6,5 @@ conf_files = files([ # The install_dir must match the name from the IPAModuleInfo install_data(conf_files, - install_dir : ipa_data_dir / 'simple', + install_dir : ipa_data_dir / 'soft', install_tag : 'runtime') diff --git a/src/ipa/simple/data/uncalibrated.yaml b/src/ipa/soft/data/uncalibrated.yaml similarity index 100% rename from src/ipa/simple/data/uncalibrated.yaml rename to src/ipa/soft/data/uncalibrated.yaml diff --git a/src/ipa/simple/ipa_context.cpp b/src/ipa/soft/ipa_context.cpp similarity index 100% rename from src/ipa/simple/ipa_context.cpp rename to src/ipa/soft/ipa_context.cpp diff --git a/src/ipa/simple/ipa_context.h b/src/ipa/soft/ipa_context.h similarity index 100% rename from src/ipa/simple/ipa_context.h rename to src/ipa/soft/ipa_context.h diff --git a/src/ipa/simple/meson.build b/src/ipa/soft/meson.build similarity index 100% rename from src/ipa/simple/meson.build rename to src/ipa/soft/meson.build diff --git a/src/ipa/simple/module.h b/src/ipa/soft/module.h similarity index 100% rename from src/ipa/simple/module.h rename to src/ipa/soft/module.h diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/soft/soft_simple.cpp similarity index 99% rename from src/ipa/simple/soft_simple.cpp rename to src/ipa/soft/soft_simple.cpp index d4ab91e30..887a1586e 100644 --- a/src/ipa/simple/soft_simple.cpp +++ b/src/ipa/soft/soft_simple.cpp @@ -342,7 +342,7 @@ extern "C" { const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 0, - "simple", + "soft", }; IPAInterface *ipaCreate() diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 25fc11989..d92cb5347 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -844,8 +844,8 @@ void PipelineHandler::disconnect() * * 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. + * name instead of relying on the fact that the IPA module matches the IPA + * proxy's type name. * * \return A newly created IPA proxy, or nullptr if no matching IPA module is * found or if the IPA proxy fails to initialize @@ -858,7 +858,7 @@ void PipelineHandler::disconnect() * \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 + * Create an IPA module using the IPA proxy's type name as the matching * identifier. This overload allows pipeline handler to create an IPA module * whose name matches the pipeline handler one. * diff --git a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl index d48b90dcf..c18c94c2c 100644 --- a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl +++ b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl @@ -40,6 +40,8 @@ class {{proxy_name}}Isolated; class {{proxy_name}} : public IPAProxy, public {{interface_name}}, public Object { public: + static constexpr const char *name() { return "{{module_name}}"; }; + using Threaded = {{proxy_name}}Threaded; using Isolated = {{proxy_name}}Isolated;