{"id":23813,"url":"https://patchwork.libcamera.org/api/1.1/patches/23813/?format=json","web_url":"https://patchwork.libcamera.org/patch/23813/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250715081921.5522-7-mzamazal@redhat.com>","date":"2025-07-15T08:19:13","name":"[v14,06/12] config: Look up pipelines match list in configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"7a9d242f3b0ca41307ab1858b9de7f3488cb6bdf","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23813/mbox/","series":[{"id":5287,"url":"https://patchwork.libcamera.org/api/1.1/series/5287/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5287","date":"2025-07-15T08:19:08","name":"Add global configuration file","version":14,"mbox":"https://patchwork.libcamera.org/series/5287/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23813/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23813/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 23D41C3237\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 15 Jul 2025 08:20:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 69CAD68F6C;\n\tTue, 15 Jul 2025 10:20:01 +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 9C1E068F5A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 15 Jul 2025 10:19:45 +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-83-0A5GDgILNVisA7yD3jMYYQ-1;\n\tTue, 15 Jul 2025 04:19:41 -0400","from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.93])\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 17D43195608F; Tue, 15 Jul 2025 08:19:40 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.43.17.38])\n\tby mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 8554618002B1; Tue, 15 Jul 2025 08:19:38 +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=\"CBtqX3OF\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1752567584;\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=F+9W7S0q/VLWsHHozRq4Dht2K5JgFSm8rYfqPXJo+lA=;\n\tb=CBtqX3OFzab19FwaWLfGZrysEzb8FPNGZ2kEZsqfTRSq09UY7AJw/N7fEt/rpFkpFIychG\n\t7mqVYWBdJTiSMnqDknejFbMP7c0f2+M6bjpl2EnmfqqKN0iJNjpx6CeRwszAvJOTsFSg3m\n\td6OBNAcbk5RqAWvOeS1p5dqQhP9Q9fc=","X-MC-Unique":"0A5GDgILNVisA7yD3jMYYQ-1","X-Mimecast-MFC-AGG-ID":"0A5GDgILNVisA7yD3jMYYQ_1752567580","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<barnabas.pocze@ideasonboard.com>, Laurent Pinchart\n\t<laurent.pinchart@ideasonboard.com>","Subject":"[PATCH v14 06/12] config: Look up pipelines match list in\n\tconfiguration file","Date":"Tue, 15 Jul 2025 10:19:13 +0200","Message-ID":"<20250715081921.5522-7-mzamazal@redhat.com>","In-Reply-To":"<20250715081921.5522-1-mzamazal@redhat.com>","References":"<20250715081921.5522-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.93","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"0BmzQsfP38j9mSfzXik48BUxMiPSTLub8o0IpMTUn_M_1752567580","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":"Let's add a configuration file item for the pipelines match list.\n\nThe configuration snippet:\n\n  configuration:\n    pipelines_match_list: rkisp1,simple\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n include/libcamera/internal/global_configuration.h |  3 ++-\n src/libcamera/camera_manager.cpp                  | 10 ++++++----\n src/libcamera/global_configuration.cpp            |  6 ++++--\n 3 files changed, 12 insertions(+), 7 deletions(-)","diff":"diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h\nindex eb7a4ad98..ed620f55f 100644\n--- a/include/libcamera/internal/global_configuration.h\n+++ b/include/libcamera/internal/global_configuration.h\n@@ -48,7 +48,8 @@ public:\n \t\tconst std::initializer_list<std::string_view> confPath) const;\n \tstd::optional<std::vector<std::string>> envListOption(\n \t\tconst char *const envVariable,\n-\t\tconst std::initializer_list<std::string_view> confPath) const;\n+\t\tconst std::initializer_list<std::string_view> confPath,\n+\t\tconst std::string delimiter = \":\") const;\n \n private:\n \tbool loadFile(const std::filesystem::path &fileName);\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex c47fd3677..8123ae9e3 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -111,14 +111,16 @@ void CameraManager::Private::createPipelineHandlers()\n \t * file and only fallback on environment variable or all handlers, if\n \t * there is no configuration file.\n \t */\n-\tconst char *pipesList =\n-\t\tutils::secure_getenv(\"LIBCAMERA_PIPELINES_MATCH_LIST\");\n-\tif (pipesList) {\n+\tconst auto pipesList =\n+\t\tconfiguration().envListOption(\"LIBCAMERA_PIPELINES_MATCH_LIST\",\n+\t\t\t\t\t      { \"pipelines_match_list\" },\n+\t\t\t\t\t      \",\");\n+\tif (pipesList.has_value()) {\n \t\t/*\n \t\t * When a list of preferred pipelines is defined, iterate\n \t\t * through the ordered list to match the enumerated devices.\n \t\t */\n-\t\tfor (const auto &pipeName : utils::split(pipesList, \",\")) {\n+\t\tfor (const auto &pipeName : pipesList.value()) {\n \t\t\tconst PipelineHandlerFactoryBase *factory;\n \t\t\tfactory = PipelineHandlerFactoryBase::getFactoryByName(pipeName);\n \t\t\tif (!factory)\ndiff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp\nindex 0eab053b2..1d447e1e3 100644\n--- a/src/libcamera/global_configuration.cpp\n+++ b/src/libcamera/global_configuration.cpp\n@@ -175,6 +175,7 @@ std::optional<std::string> GlobalConfiguration::envOption(\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+ * \\param[in] delimiter Items separator in the environment variable\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@@ -191,11 +192,12 @@ std::optional<std::string> GlobalConfiguration::envOption(\n  */\n std::optional<std::vector<std::string>> GlobalConfiguration::envListOption(\n \tconst char *const envVariable,\n-\tconst std::initializer_list<std::string_view> confPath) const\n+\tconst std::initializer_list<std::string_view> confPath,\n+\tconst std::string delimiter) const\n {\n \tconst char *envValue = utils::secure_getenv(envVariable);\n \tif (envValue) {\n-\t\tauto items = utils::split(envValue, \":\");\n+\t\tauto items = utils::split(envValue, delimiter);\n \t\treturn std::vector<std::string>(items.begin(), items.end());\n \t}\n \treturn listOption(confPath);\n","prefixes":["v14","06/12"]}