Patch Detail
Show a patch.
GET /api/patches/23634/?format=api
{ "id": 23634, "url": "https://patchwork.libcamera.org/api/patches/23634/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23634/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20250624083612.27230-6-mzamazal@redhat.com>", "date": "2025-06-24T08:36:02", "name": "[v11,05/12] config: Look up IPA configurables in configuration file", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "382228df7ed05a2d65a15f7a635859192bde42e6", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/23634/mbox/", "series": [ { "id": 5243, "url": "https://patchwork.libcamera.org/api/series/5243/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5243", "date": "2025-06-24T08:35:59", "name": "Add global configuration file", "version": 11, "mbox": "https://patchwork.libcamera.org/series/5243/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23634/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23634/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id CE0F2C3237\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 24 Jun 2025 08:36:44 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7C72568DFA;\n\tTue, 24 Jun 2025 10:36:44 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 154DA68DF3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 24 Jun 2025 10:36:36 +0200 (CEST)", "from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-665-deZ82d5HOtK1adtQXF7HFg-1;\n\tTue, 24 Jun 2025 04:36:32 -0400", "from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.40])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 0DA471956058; Tue, 24 Jun 2025 08:36:31 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.43.17.27])\n\tby mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 7578319560B0; Tue, 24 Jun 2025 08:36:28 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"Pge+VP5A\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1750754196;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=8HdgfpiadbMEfPqIOrlxVHTfT6x/O44HRUgLgYdPz0o=;\n\tb=Pge+VP5AnW27jPgGGJEVWHl0+gszhtSGoZ0MAfwvEHAFNeJCPpxmsEj1S23CJMd4AIy7lK\n\tu72ufCREa+B3IWo5V8nIG0LEssZ2vJFDDg9aaPd4e1yIi/jtWKi56iK+SLstrGTtkniS+i\n\tBLGK8LJ1+w0Iy/siftHwvLHELfi9JnQ=", "X-MC-Unique": "deZ82d5HOtK1adtQXF7HFg-1", "X-Mimecast-MFC-AGG-ID": "deZ82d5HOtK1adtQXF7HFg_1750754191", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>, Kieran Bingham\n\t<kieran.bingham@ideasonboard.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<pobrn@protonmail.com>, Laurent Pinchart\n\t<laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v11 05/12] config: Look up IPA configurables in configuration\n\tfile", "Date": "Tue, 24 Jun 2025 10:36:02 +0200", "Message-ID": "<20250624083612.27230-6-mzamazal@redhat.com>", "In-Reply-To": "<20250624083612.27230-1-mzamazal@redhat.com>", "References": "<20250624083612.27230-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.40", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "UZmP_XFRk6LPbJf6HNHufDtJesAWwLavi-Sqw4oT03s_1750754191", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "content-type": "text/plain; charset=\"US-ASCII\"; x-default=true", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This patch adds configuration options for environment variables used in\nthe IPA proxy. Two utility functions configuration retrieval functions\nare added, to retrieve lists of values.\n\nThe configuration snippet:\n\n configuration:\n ipa:\n config_paths:\n - config path 1\n - config path 2\n - ...\n module_paths:\n - module path 1\n - module path 2\n - ...\n proxy_paths:\n - proxy path 1\n - proxy path 2\n - ...\n force_isolation: BOOL\n ipas:\n IPA_NAME:\n tuning_file: TUNING FILE\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n .../libcamera/internal/global_configuration.h | 35 ++++++++-\n include/libcamera/internal/ipa_manager.h | 8 ++-\n include/libcamera/internal/ipa_proxy.h | 5 +-\n src/libcamera/camera_manager.cpp | 2 +-\n src/libcamera/global_configuration.cpp | 47 +++++++++++-\n src/libcamera/ipa_manager.cpp | 37 ++++++----\n src/libcamera/ipa_proxy.cpp | 72 ++++++++++---------\n src/libcamera/pipeline/ipu3/ipu3.cpp | 3 +-\n src/libcamera/pipeline/mali-c55/mali-c55.cpp | 2 +\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 +-\n .../pipeline/rpi/common/pipeline_base.cpp | 3 +-\n src/libcamera/pipeline/vimc/vimc.cpp | 3 +-\n src/libcamera/software_isp/software_isp.cpp | 4 +-\n test/ipa/ipa_interface_test.cpp | 3 +-\n .../module_ipa_proxy.cpp.tmpl | 4 +-\n .../module_ipa_proxy.h.tmpl | 2 +-\n 16 files changed, 169 insertions(+), 65 deletions(-)", "diff": "diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h\nindex 357119628..cc436703e 100644\n--- a/include/libcamera/internal/global_configuration.h\n+++ b/include/libcamera/internal/global_configuration.h\n@@ -11,6 +11,8 @@\n #include <optional>\n #include <string>\n \n+#include <libcamera/base/utils.h>\n+\n #include \"libcamera/internal/yaml_parser.h\"\n \n namespace libcamera {\n@@ -24,9 +26,40 @@ public:\n \n \tunsigned int version() const;\n \tConfiguration configuration() const;\n-\tstd::optional<std::string> option(const std::string &confPath) const;\n+\n+#ifndef __DOXYGEN__\n+\ttemplate<typename T,\n+\t\t std::enable_if_t<\n+\t\t\t std::is_same_v<bool, T> ||\n+\t\t\t std::is_same_v<double, T> ||\n+\t\t\t std::is_same_v<int8_t, T> ||\n+\t\t\t std::is_same_v<uint8_t, T> ||\n+\t\t\t std::is_same_v<int16_t, T> ||\n+\t\t\t std::is_same_v<uint16_t, T> ||\n+\t\t\t std::is_same_v<int32_t, T> ||\n+\t\t\t std::is_same_v<uint32_t, T> ||\n+\t\t\t std::is_same_v<std::string, T> ||\n+\t\t\t std::is_same_v<Size, T>> * = nullptr>\n+#else\n+\ttemplate<typename T>\n+#endif\n+\tstd::optional<T> option(const std::string &confPath) const\n+\t{\n+\t\tconst YamlObject *c = &configuration();\n+\t\tfor (auto part : utils::split(confPath, \"/\")) {\n+\t\t\tc = &(*c)[part];\n+\t\t\tif (!*c)\n+\t\t\t\treturn {};\n+\t\t}\n+\t\treturn c->get<T>();\n+\t}\n+\n+\tstd::vector<std::string> listOption(const std::string &confPath) const;\n \tstd::optional<std::string> envOption(const char *const envVariable,\n \t\t\t\t\t const std::string &confPath) const;\n+\tstd::vector<std::string> envListOption(\n+\t\tconst char *const envVariable,\n+\t\tconst std::string &confPath) const;\n \n private:\n \tbool loadFile(const std::filesystem::path &fileName);\ndiff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h\nindex a0d448cf9..8ad717919 100644\n--- a/include/libcamera/internal/ipa_manager.h\n+++ b/include/libcamera/internal/ipa_manager.h\n@@ -17,6 +17,7 @@\n #include <libcamera/ipa/ipa_module_info.h>\n \n #include \"libcamera/internal/camera_manager.h\"\n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/ipa_module.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n #include \"libcamera/internal/pub_key.h\"\n@@ -28,7 +29,7 @@ LOG_DECLARE_CATEGORY(IPAManager)\n class IPAManager\n {\n public:\n-\tIPAManager();\n+\tIPAManager(const GlobalConfiguration &configuration);\n \t~IPAManager();\n \n \ttemplate<typename T>\n@@ -42,7 +43,8 @@ public:\n \t\tif (!m)\n \t\t\treturn nullptr;\n \n-\t\tstd::unique_ptr<T> proxy = std::make_unique<T>(m, !self->isSignatureValid(m));\n+\t\tconst GlobalConfiguration &configuration = cm->_d()->configuration();\n+\t\tstd::unique_ptr<T> proxy = std::make_unique<T>(m, !self->isSignatureValid(m, configuration), configuration);\n \t\tif (!proxy->isValid()) {\n \t\t\tLOG(IPAManager, Error) << \"Failed to load proxy\";\n \t\t\treturn nullptr;\n@@ -66,7 +68,7 @@ private:\n \tIPAModule *module(PipelineHandler *pipe, uint32_t minVersion,\n \t\t\t uint32_t maxVersion);\n \n-\tbool isSignatureValid(IPAModule *ipa) const;\n+\tbool isSignatureValid(IPAModule *ipa, const GlobalConfiguration &configuration) const;\n \n \tstd::vector<std::unique_ptr<IPAModule>> modules_;\n \ndiff --git a/include/libcamera/internal/ipa_proxy.h b/include/libcamera/internal/ipa_proxy.h\nindex 983bcc5fa..01cc5deff 100644\n--- a/include/libcamera/internal/ipa_proxy.h\n+++ b/include/libcamera/internal/ipa_proxy.h\n@@ -11,6 +11,8 @@\n \n #include <libcamera/ipa/ipa_interface.h>\n \n+#include \"libcamera/internal/global_configuration.h\"\n+\n namespace libcamera {\n \n class IPAModule;\n@@ -30,10 +32,11 @@ public:\n \tbool isValid() const { return valid_; }\n \n \tstd::string configurationFile(const std::string &name,\n+\t\t\t\t const GlobalConfiguration &configuration,\n \t\t\t\t const std::string &fallbackName = std::string()) const;\n \n protected:\n-\tstd::string resolvePath(const std::string &file) const;\n+\tstd::string resolvePath(const std::string &file, const GlobalConfiguration &configuration) const;\n \n \tbool valid_;\n \tProxyState state_;\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex f3b4ec708..c47fd3677 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -41,7 +41,7 @@ LOG_DEFINE_CATEGORY(Camera)\n CameraManager::Private::Private()\n \t: initialized_(false)\n {\n-\tipaManager_ = std::make_unique<IPAManager>();\n+\tipaManager_ = std::make_unique<IPAManager>(this->configuration());\n }\n \n int CameraManager::Private::start()\ndiff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp\nindex 068ddd5a5..f7c69890c 100644\n--- a/src/libcamera/global_configuration.cpp\n+++ b/src/libcamera/global_configuration.cpp\n@@ -9,9 +9,11 @@\n \n #include <filesystem>\n #include <memory>\n+#include <optional>\n #include <string>\n #include <string_view>\n #include <sys/types.h>\n+#include <vector>\n \n #include <libcamera/base/file.h>\n #include <libcamera/base/log.h>\n@@ -116,13 +118,22 @@ GlobalConfiguration::GlobalConfiguration()\n */\n \n /**\n+ * \\fn std::optional<T> GlobalConfiguration::option(const std::string &confPath) const\n * \\brief Return value of the configuration option identified by \\a confPath\n * \\param[in] confPath Sequence of the YAML section names (excluding\n * `configuration') leading to the requested option separated by slashes\n * \\return A value if an item corresponding to \\a confPath exists in the\n * configuration file, no value otherwise\n */\n-std::optional<std::string> GlobalConfiguration::option(const std::string &confPath) const\n+\n+/**\n+ * \\brief Return values of the configuration option identified by \\a confPath\n+ * \\tparam T The type of the retrieved configuration value\n+ * \\param[in] confPath Sequence of the YAML section names (excluding\n+ * `configuration') leading to the requested list option, separated by dots\n+ * \\return A vector of strings (empty one if the option is not found)\n+ */\n+std::vector<std::string> GlobalConfiguration::listOption(const std::string &confPath) const\n {\n \tconst YamlObject *c = &configuration();\n \tfor (auto part : utils::split(confPath, \"/\")) {\n@@ -130,7 +141,7 @@ std::optional<std::string> GlobalConfiguration::option(const std::string &confPa\n \t\tif (!*c)\n \t\t\treturn {};\n \t}\n-\treturn c->get<std::string>();\n+\treturn c->getList<std::string>().value_or(std::vector<std::string>());\n }\n \n /**\n@@ -157,7 +168,37 @@ std::optional<std::string> GlobalConfiguration::envOption(\n \tconst char *envValue = utils::secure_getenv(envVariable);\n \tif (envValue)\n \t\treturn std::optional{ std::string{ envValue } };\n-\treturn option(confPath);\n+\treturn option<std::string>(confPath);\n+}\n+\n+/**\n+ * \\brief Return values of the configuration option from a file or environment\n+ * \\param[in] envVariable Environment variable to get the value from\n+ * \\param[in] confPath The same as in GlobalConfiguration::option\n+ *\n+ * This helper looks first at the given environment variable and if it is\n+ * defined (even if it is empty) then it splits its value by semicolons and\n+ * returns the resulting list of strings. Otherwise it looks for \\a confPath the\n+ * same way as in GlobalConfiguration::option, value of which must be a list of\n+ * strings.\n+ *\n+ * \\note Support for using environment variables to configure libcamera behavior\n+ * is provided here mostly for backward compatibility reasons. Introducing new\n+ * configuration environment variables is discouraged.\n+ *\n+ * \\return A vector of strings retrieved from the given environment option or\n+ * configuration file (an empty vector is returned if nothing is found)\n+ */\n+std::vector<std::string> GlobalConfiguration::envListOption(\n+\tconst char *const envVariable,\n+\tconst std::string &confPath) const\n+{\n+\tconst char *envValue = utils::secure_getenv(envVariable);\n+\tif (envValue) {\n+\t\tauto items = utils::split(envValue, \":\");\n+\t\treturn std::vector<std::string>(items.begin(), items.end());\n+\t}\n+\treturn listOption(confPath);\n }\n \n /**\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex 830750dcc..67c1b23d2 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -9,6 +9,7 @@\n \n #include <algorithm>\n #include <dirent.h>\n+#include <numeric>\n #include <string.h>\n #include <sys/types.h>\n \n@@ -16,6 +17,7 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n \n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/ipa_module.h\"\n #include \"libcamera/internal/ipa_proxy.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n@@ -101,7 +103,7 @@ LOG_DEFINE_CATEGORY(IPAManager)\n * The IPAManager class is meant to only be instantiated once, by the\n * CameraManager.\n */\n-IPAManager::IPAManager()\n+IPAManager::IPAManager(const GlobalConfiguration &configuration)\n {\n #if HAVE_IPA_PUBKEY\n \tif (!pubKey_.isValid())\n@@ -111,18 +113,25 @@ IPAManager::IPAManager()\n \tunsigned int ipaCount = 0;\n \n \t/* User-specified paths take precedence. */\n-\tconst char *modulePaths = utils::secure_getenv(\"LIBCAMERA_IPA_MODULE_PATH\");\n-\tif (modulePaths) {\n-\t\tfor (const auto &dir : utils::split(modulePaths, \":\")) {\n-\t\t\tif (dir.empty())\n-\t\t\t\tcontinue;\n+\tconst auto modulePaths =\n+\t\tconfiguration.envListOption(\n+\t\t\t\"LIBCAMERA_IPA_MODULE_PATH\", \"ipa/module_paths\");\n+\tfor (const auto &dir : modulePaths) {\n+\t\tif (dir.empty())\n+\t\t\tcontinue;\n \n-\t\t\tipaCount += addDir(dir.c_str());\n-\t\t}\n+\t\tipaCount += addDir(dir.c_str());\n+\t}\n \n-\t\tif (!ipaCount)\n-\t\t\tLOG(IPAManager, Warning)\n-\t\t\t\t<< \"No IPA found in '\" << modulePaths << \"'\";\n+\tif (!ipaCount) {\n+\t\tstd::string paths;\n+\t\tif (!modulePaths.empty()) {\n+\t\t\tpaths = std::accumulate(std::next(modulePaths.begin()),\n+\t\t\t\t\t\tmodulePaths.end(),\n+\t\t\t\t\t\tmodulePaths[0],\n+\t\t\t\t\t\t[](std::string s1, std::string s2) { return s1 + \":\" + s2; });\n+\t\t}\n+\t\tLOG(IPAManager, Warning) << \"No IPA found in '\" << paths << \"'\";\n \t}\n \n \t/*\n@@ -276,11 +285,13 @@ IPAModule *IPAManager::module(PipelineHandler *pipe, uint32_t minVersion,\n */\n #endif\n \n-bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const\n+bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa, const GlobalConfiguration &configuration) const\n {\n #if HAVE_IPA_PUBKEY\n \tchar *force = utils::secure_getenv(\"LIBCAMERA_IPA_FORCE_ISOLATION\");\n-\tif (force && force[0] != '\\0') {\n+\tif ((force && force[0] != '\\0') ||\n+\t (!force && configuration.option<bool>(\"ipa/force_isolation\")\n+\t\t\t .value_or(false))) {\n \t\tLOG(IPAManager, Debug)\n \t\t\t<< \"Isolation of IPA module \" << ipa->path()\n \t\t\t<< \" forced through environment variable\";\ndiff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp\nindex 9907b9615..77927b0d4 100644\n--- a/src/libcamera/ipa_proxy.cpp\n+++ b/src/libcamera/ipa_proxy.cpp\n@@ -14,6 +14,7 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n \n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/ipa_module.h\"\n \n /**\n@@ -71,6 +72,7 @@ IPAProxy::~IPAProxy()\n /**\n * \\brief Retrieve the absolute path to an IPA configuration file\n * \\param[in] name The configuration file name\n+ * \\param[in] configuration The global configuration\n * \\param[in] fallbackName The name of a fallback configuration file\n *\n * This function locates the configuration file for an IPA and returns its\n@@ -96,6 +98,7 @@ IPAProxy::~IPAProxy()\n * no configuration file can be found\n */\n std::string IPAProxy::configurationFile(const std::string &name,\n+\t\t\t\t\tconst GlobalConfiguration &configuration,\n \t\t\t\t\tconst std::string &fallbackName) const\n {\n \t/*\n@@ -105,37 +108,37 @@ std::string IPAProxy::configurationFile(const std::string &name,\n \tconst std::string ipaName = ipam_->info().name;\n \n \t/*\n-\t * Start with any user override through the module-specific environment\n-\t * variable. Use the name of the IPA module up to the first '/' to\n-\t * construct the variable name.\n+\t * Start with any user override through the module-specific configuration or\n+\t * environment variable. Use the name of the IPA module up to the first '/'\n+\t * to construct the configuration and variable names.\n \t */\n-\tstd::string ipaEnvName = ipaName.substr(0, ipaName.find('/'));\n+\tstd::string ipaBaseName = ipaName.substr(0, ipaName.find('/'));\n+\tstd::string ipaConfigName = \"ipa/ipas/\" + ipaBaseName + \"/tuning_file\";\n+\tstd::string ipaEnvName = ipaBaseName;\n \tstd::transform(ipaEnvName.begin(), ipaEnvName.end(), ipaEnvName.begin(),\n \t\t [](unsigned char c) { return std::toupper(c); });\n \tipaEnvName = \"LIBCAMERA_\" + ipaEnvName + \"_TUNING_FILE\";\n \n-\tchar const *configFromEnv = utils::secure_getenv(ipaEnvName.c_str());\n-\tif (configFromEnv && *configFromEnv != '\\0')\n-\t\treturn { configFromEnv };\n+\tauto config = configuration.envOption(ipaEnvName.c_str(), ipaConfigName);\n+\tif (config)\n+\t\treturn { config.value() };\n \n \tstruct stat statbuf;\n \tint ret;\n \n \t/*\n-\t * Check the directory pointed to by the IPA config path environment\n-\t * variable next.\n+\t * Check the directory pointed to by the IPA config path next.\n \t */\n-\tconst char *confPaths = utils::secure_getenv(\"LIBCAMERA_IPA_CONFIG_PATH\");\n-\tif (confPaths) {\n-\t\tfor (const auto &dir : utils::split(confPaths, \":\")) {\n-\t\t\tif (dir.empty())\n-\t\t\t\tcontinue;\n-\n-\t\t\tstd::string confPath = dir + \"/\" + ipaName + \"/\" + name;\n-\t\t\tret = stat(confPath.c_str(), &statbuf);\n-\t\t\tif (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)\n-\t\t\t\treturn confPath;\n-\t\t}\n+\tauto confPaths =\n+\t\tconfiguration.envListOption(\n+\t\t\t\"LIBCAMERA_IPA_CONFIG_PATH\", \"ipa/config_paths\");\n+\tfor (const auto &dir : confPaths) {\n+\t\tif (dir.empty())\n+\t\t\tcontinue;\n+\t\tstd::string confPath = dir + \"/\" + ipaName + \"/\" + name;\n+\t\tret = stat(confPath.c_str(), &statbuf);\n+\t\tif (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)\n+\t\t\treturn confPath;\n \t}\n \n \tstd::string root = utils::libcameraSourcePath();\n@@ -178,12 +181,13 @@ std::string IPAProxy::configurationFile(const std::string &name,\n \t\t<< \"Configuration file '\" << name\n \t\t<< \"' not found for IPA module '\" << ipaName\n \t\t<< \"', falling back to '\" << fallbackName << \"'\";\n-\treturn configurationFile(fallbackName);\n+\treturn configurationFile(fallbackName, configuration);\n }\n \n /**\n * \\brief Find a valid full path for a proxy worker for a given executable name\n * \\param[in] file File name of proxy worker executable\n+ * \\param[in] configuration The global configuration\n *\n * A proxy worker's executable could be found in either the global installation\n * directory, or in the paths specified by the environment variable\n@@ -195,22 +199,22 @@ std::string IPAProxy::configurationFile(const std::string &name,\n * \\return The full path to the proxy worker executable, or an empty string if\n * no valid executable path\n */\n-std::string IPAProxy::resolvePath(const std::string &file) const\n+std::string IPAProxy::resolvePath(const std::string &file, const GlobalConfiguration &configuration) const\n {\n \tstd::string proxyFile = \"/\" + file;\n \n-\t/* Check env variable first. */\n-\tconst char *execPaths = utils::secure_getenv(\"LIBCAMERA_IPA_PROXY_PATH\");\n-\tif (execPaths) {\n-\t\tfor (const auto &dir : utils::split(execPaths, \":\")) {\n-\t\t\tif (dir.empty())\n-\t\t\t\tcontinue;\n-\n-\t\t\tstd::string proxyPath = dir;\n-\t\t\tproxyPath += proxyFile;\n-\t\t\tif (!access(proxyPath.c_str(), X_OK))\n-\t\t\t\treturn proxyPath;\n-\t\t}\n+\t/* Check the configuration first. */\n+\tconst auto execPaths =\n+\t\tconfiguration.envListOption(\n+\t\t\t\"LIBCAMERA_IPA_PROXY_PATH\", \"ipa/proxy_paths\");\n+\tfor (const auto &dir : execPaths) {\n+\t\tif (dir.empty())\n+\t\t\tcontinue;\n+\n+\t\tstd::string proxyPath = dir;\n+\t\tproxyPath += proxyFile;\n+\t\tif (!access(proxyPath.c_str(), X_OK))\n+\t\t\treturn proxyPath;\n \t}\n \n \t/*\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex e31e3879d..723f7665b 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1183,8 +1183,9 @@ int IPU3CameraData::loadIPA()\n \t * The API tuning file is made from the sensor name. If the tuning file\n \t * isn't found, fall back to the 'uncalibrated' file.\n \t */\n+\tconst GlobalConfiguration &configuration = pipe()->cameraManager()->_d()->configuration();\n \tstd::string ipaTuningFile =\n-\t\tipa_->configurationFile(sensor->model() + \".yaml\", \"uncalibrated.yaml\");\n+\t\tipa_->configurationFile(sensor->model() + \".yaml\", configuration, \"uncalibrated.yaml\");\n \n \tret = ipa_->init(IPASettings{ ipaTuningFile, sensor->model() },\n \t\t\t sensorInfo, sensor->controls(), &ipaControls_);\ndiff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\nindex 4acc091bd..d346fa25f 100644\n--- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n+++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n@@ -388,7 +388,9 @@ int MaliC55CameraData::loadIPA()\n \n \tipa_->setSensorControls.connect(this, &MaliC55CameraData::setSensorControls);\n \n+\tconst GlobalConfiguration &configuration = pipe()->cameraManager()->_d()->configuration();\n \tstd::string ipaTuningFile = ipa_->configurationFile(sensor_->model() + \".yaml\",\n+\t\t\t\t\t\t\t configuration,\n \t\t\t\t\t\t\t \"uncalibrated.yaml\");\n \n \t/* We need to inform the IPA of the sensor configuration */\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 675f0a749..aded4cb43 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -40,6 +40,7 @@\n #include \"libcamera/internal/delayed_controls.h\"\n #include \"libcamera/internal/device_enumerator.h\"\n #include \"libcamera/internal/framebuffer.h\"\n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/media_pipeline.h\"\n@@ -383,8 +384,9 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n \tipa_->metadataReady.connect(this, &RkISP1CameraData::metadataReady);\n \n \t/* The IPA tuning file is made from the sensor name. */\n+\tconst GlobalConfiguration &configuration = pipe()->cameraManager()->_d()->configuration();\n \tstd::string ipaTuningFile =\n-\t\tipa_->configurationFile(sensor_->model() + \".yaml\", \"uncalibrated.yaml\");\n+\t\tipa_->configurationFile(sensor_->model() + \".yaml\", configuration, \"uncalibrated.yaml\");\n \n \tIPACameraSensorInfo sensorInfo{};\n \tint ret = sensor_->sensorInfo(&sensorInfo);\ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex a316ef297..3da919ee7 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -1157,7 +1157,8 @@ int CameraData::loadIPA(ipa::RPi::InitResult *result)\n \tstd::string model = sensor_->model();\n \tif (isMonoSensor(sensor_))\n \t\tmodel += \"_mono\";\n-\tstd::string configurationFile = ipa_->configurationFile(model + \".json\");\n+\tconst GlobalConfiguration &configuration = pipe()->cameraManager()->_d()->configuration();\n+\tstd::string configurationFile = ipa_->configurationFile(model + \".json\", configuration);\n \n \tIPASettings settings(configurationFile, sensor_->model());\n \tipa::RPi::InitParams params;\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 07273bd2b..555d51bb6 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -494,7 +494,8 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n \n \tdata->ipa_->paramsComputed.connect(data.get(), &VimcCameraData::paramsComputed);\n \n-\tstd::string conf = data->ipa_->configurationFile(\"vimc.conf\");\n+\tconst GlobalConfiguration &configuration = manager_->_d()->configuration();\n+\tstd::string conf = data->ipa_->configurationFile(\"vimc.conf\", configuration);\n \tFlags<ipa::vimc::TestFlag> inFlags = ipa::vimc::TestFlag::Flag2;\n \tFlags<ipa::vimc::TestFlag> outFlags;\n \tdata->ipa_->init(IPASettings{ conf, data->sensor_->model() },\ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex 28e2a360e..3ce354111 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -21,6 +21,7 @@\n #include <libcamera/stream.h>\n \n #include \"libcamera/internal/framebuffer.h\"\n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/software_isp/debayer_params.h\"\n \n@@ -130,8 +131,9 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,\n \t * The API tuning file is made from the sensor name. If the tuning file\n \t * isn't found, fall back to the 'uncalibrated' file.\n \t */\n+\tconst GlobalConfiguration &configuration = pipe->cameraManager()->_d()->configuration();\n \tstd::string ipaTuningFile =\n-\t\tipa_->configurationFile(sensor->model() + \".yaml\", \"uncalibrated.yaml\");\n+\t\tipa_->configurationFile(sensor->model() + \".yaml\", configuration, \"uncalibrated.yaml\");\n \n \tIPACameraSensorInfo sensorInfo{};\n \tint ret = sensor->sensorInfo(&sensorInfo);\ndiff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\nindex b81783664..1afcbf106 100644\n--- a/test/ipa/ipa_interface_test.cpp\n+++ b/test/ipa/ipa_interface_test.cpp\n@@ -106,7 +106,8 @@ protected:\n \t\t}\n \n \t\t/* Test initialization of IPA module. */\n-\t\tstd::string conf = ipa_->configurationFile(\"vimc.conf\");\n+\t\tconst GlobalConfiguration configuration;\n+\t\tstd::string conf = ipa_->configurationFile(\"vimc.conf\", configuration);\n \t\tFlags<ipa::vimc::TestFlag> inFlags;\n \t\tFlags<ipa::vimc::TestFlag> outFlags;\n \t\tint ret = ipa_->init(IPASettings{ conf, \"vimc\" },\ndiff --git a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl\nindex 9a3aadbd2..71e920eb1 100644\n--- a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl\n+++ b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl\n@@ -45,7 +45,7 @@ namespace {{ns}} {\n {% endfor %}\n {%- endif %}\n \n-{{proxy_name}}::{{proxy_name}}(IPAModule *ipam, bool isolate)\n+{{proxy_name}}::{{proxy_name}}(IPAModule *ipam, bool isolate, const GlobalConfiguration &configuration)\n \t: IPAProxy(ipam), isolate_(isolate),\n \t controlSerializer_(ControlSerializer::Role::Proxy), seq_(0)\n {\n@@ -54,7 +54,7 @@ namespace {{ns}} {\n \t\t<< ipam->path();\n \n \tif (isolate_) {\n-\t\tconst std::string proxyWorkerPath = resolvePath(\"{{module_name}}_ipa_proxy\");\n+\t\tconst std::string proxyWorkerPath = resolvePath(\"{{module_name}}_ipa_proxy\", configuration);\n \t\tif (proxyWorkerPath.empty()) {\n \t\t\tLOG(IPAProxy, Error)\n \t\t\t\t<< \"Failed to get proxy worker path\";\ndiff --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\nindex a0312a7c1..057c3ab03 100644\n--- a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl\n+++ b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl\n@@ -37,7 +37,7 @@ namespace {{ns}} {\n class {{proxy_name}} : public IPAProxy, public {{interface_name}}, public Object\n {\n public:\n-\t{{proxy_name}}(IPAModule *ipam, bool isolate);\n+\t{{proxy_name}}(IPAModule *ipam, bool isolate, const GlobalConfiguration &configuration);\n \t~{{proxy_name}}();\n \n {% for method in interface_main.methods %}\n", "prefixes": [ "v11", "05/12" ] }