{"id":23633,"url":"https://patchwork.libcamera.org/api/patches/23633/?format=json","web_url":"https://patchwork.libcamera.org/patch/23633/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20250624083612.27230-5-mzamazal@redhat.com>","date":"2025-06-24T08:36:01","name":"[v11,04/12] config: Look up rpi configuration in the configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"91ee8574cab72536aa033477e38c16173ae734d3","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23633/mbox/","series":[{"id":5243,"url":"https://patchwork.libcamera.org/api/series/5243/?format=json","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/23633/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23633/checks/","tags":{},"headers":{"Return-Path":"","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 9D25CC3237\n\tfor ;\n\tTue, 24 Jun 2025 08:36:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id ED18E68DF6;\n\tTue, 24 Jun 2025 10:36:39 +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 BAE6E68DE9\n\tfor ;\n\tTue, 24 Jun 2025 10:36:34 +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-61-Tz_JBOrHPKqcYibqcVjAhw-1;\n\tTue, 24 Jun 2025 04:36:29 -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 B91EB195605E; Tue, 24 Jun 2025 08:36:28 +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 3406B19560A3; Tue, 24 Jun 2025 08:36:26 +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=\"LKmElctl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1750754193;\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=wgBybnhaIO+zTmPCdjCucnL2p/QL5XIQjgA/j87NsNc=;\n\tb=LKmElctljR1lsAFOxFvwLKErMGHIUhSPj3mxbnULohN00aLQlUymk/2cz3jn4yxuVcZN4O\n\tuyxHeHMZnTvdr8zwtx31QGnu8Qb6lz6ArS9iyFcltKxitQ+3Y3FaunUbKFzE/JuodCzD4U\n\tCfCWKi3JiXhZ6Ml7dRnnEBIpSJd8j6c=","X-MC-Unique":"Tz_JBOrHPKqcYibqcVjAhw-1","X-Mimecast-MFC-AGG-ID":"Tz_JBOrHPKqcYibqcVjAhw_1750754188","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Kieran Bingham\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t, Laurent Pinchart\n\t","Subject":"[PATCH v11 04/12] config: Look up rpi configuration in the\n\tconfiguration file","Date":"Tue, 24 Jun 2025 10:36:01 +0200","Message-ID":"<20250624083612.27230-5-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":"9IKxYwbZ1zWUNGEb4WfjkatjznMsvtomqyqdgVONnHs_1750754188","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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Let's make rpi configuration available in the global configuration file.\nIt may be arguable whether pipeline specific configurations belong to\nthe global configuration file. But:\n\n- Having a single configuration file is generally easier for the user.\n- The original configuration via environment variables can be already\n considered global.\n- This option points to other configuration files and it makes little\n sense to add another configuration file to the chain.\n\nThe rpi configuration is currently placed in a separate file, specified\nby LIBCAMERA_RPI_CONFIG_FILE environment variable. Let's support the\ncontent of the file in the global configuration file. `version' field\nis omitted as the global configuration file has its own version and the\nrequired version in the original file has been 1.0 anyway.\n\nThe configuration snippet:\n\n configuration:\n pipeline:\n rpi:\n target: TARGET\n pipeline_handler:\n ...\n\nTo not break current user setups, LIBCAMERA_RPI_CONFIG_FILE environment\nvariable is still supported and works as before, pointing to a separate\nconfiguration file. Just the duplicate check for the configuration file\nversion in platformPipelineConfigure methods is removed.\n\nSigned-off-by: Milan Zamazal \n---\n .../pipeline/rpi/common/pipeline_base.cpp | 60 +++++++++++--------\n .../pipeline/rpi/common/pipeline_base.h | 2 +-\n src/libcamera/pipeline/rpi/pisp/pisp.cpp | 14 +----\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 14 +----\n 4 files changed, 42 insertions(+), 48 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex e14d3b913..a316ef297 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -20,8 +20,10 @@\n #include \n \n #include \"libcamera/internal/camera_lens.h\"\n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/v4l2_subdevice.h\"\n+#include \"libcamera/internal/yaml_parser.h\"\n \n using namespace std::chrono_literals;\n \n@@ -1085,37 +1087,42 @@ int CameraData::loadPipelineConfiguration()\n \t};\n \n \t/* Initial configuration of the platform, in case no config file is present */\n-\tplatformPipelineConfigure({});\n+\tstd::optional empty;\n+\tplatformPipelineConfigure({}, empty);\n \n+\tstd::unique_ptr root;\n \tchar const *configFromEnv = utils::secure_getenv(\"LIBCAMERA_RPI_CONFIG_FILE\");\n-\tif (!configFromEnv || *configFromEnv == '\\0')\n-\t\treturn 0;\n-\n-\tstd::string filename = std::string(configFromEnv);\n-\tFile file(filename);\n-\n-\tif (!file.open(File::OpenModeFlag::ReadOnly)) {\n-\t\tLOG(RPI, Warning) << \"Failed to open configuration file '\" << filename << \"'\"\n-\t\t\t\t << \", using defaults\";\n-\t\treturn 0;\n-\t}\n+\tif (configFromEnv && *configFromEnv != '\\0') {\n+\t\tstd::string filename = std::string(configFromEnv);\n+\t\tFile file(filename);\n+\n+\t\tif (!file.open(File::OpenModeFlag::ReadOnly)) {\n+\t\t\tLOG(RPI, Warning) << \"Failed to open configuration file '\" << filename << \"'\"\n+\t\t\t\t\t << \", using defaults\";\n+\t\t\treturn 0;\n+\t\t}\n \n-\tLOG(RPI, Info) << \"Using configuration file '\" << filename << \"'\";\n+\t\tLOG(RPI, Info) << \"Using configuration file '\" << filename << \"'\";\n \n-\tstd::unique_ptr root = YamlParser::parse(file);\n-\tif (!root) {\n-\t\tLOG(RPI, Warning) << \"Failed to parse configuration file, using defaults\";\n-\t\treturn 0;\n-\t}\n+\t\troot = YamlParser::parse(file);\n+\t\tif (!root) {\n+\t\t\tLOG(RPI, Warning) << \"Failed to parse configuration file, using defaults\";\n+\t\t\treturn 0;\n+\t\t}\n \n-\tstd::optional ver = (*root)[\"version\"].get();\n-\tif (!ver || *ver != 1.0) {\n-\t\tLOG(RPI, Warning) << \"Unexpected configuration file version reported: \"\n-\t\t\t\t << *ver;\n-\t\treturn 0;\n+\t\tstd::optional ver = (*root)[\"version\"].get();\n+\t\tif (!ver || *ver != 1.0) {\n+\t\t\tLOG(RPI, Warning) << \"Unexpected configuration file version reported: \"\n+\t\t\t\t\t << *ver;\n+\t\t\treturn 0;\n+\t\t}\n \t}\n \n-\tconst YamlObject &phConfig = (*root)[\"pipeline_handler\"];\n+\tGlobalConfiguration::Configuration config =\n+\t\tpipe()->cameraManager()->_d()->configuration().configuration()[\"pipeline\"][\"rpi\"];\n+\tconst YamlObject &phConfig = (root\n+\t\t\t\t\t ? (*root)[\"pipeline_handler\"]\n+\t\t\t\t\t : config[\"pipeline_handler\"]);\n \n \tif (phConfig.contains(\"disable_startup_frame_drops\"))\n \t\tLOG(RPI, Warning)\n@@ -1131,7 +1138,10 @@ int CameraData::loadPipelineConfiguration()\n \t\tfrontendDevice()->setDequeueTimeout(config_.cameraTimeoutValue * 1ms);\n \t}\n \n-\treturn platformPipelineConfigure(root);\n+\tstd::optional target = (root\n+\t\t\t\t\t\t ? (*root)[\"target\"].get()\n+\t\t\t\t\t\t : config.get(\"target\"));\n+\treturn platformPipelineConfigure(phConfig, target);\n }\n \n int CameraData::loadIPA(ipa::RPi::InitResult *result)\ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h\nindex 4c5743e04..34684d882 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.h\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n@@ -96,7 +96,7 @@ public:\n \tvirtual V4L2VideoDevice::Formats rawFormats() const = 0;\n \tvirtual V4L2VideoDevice *frontendDevice() = 0;\n \n-\tvirtual int platformPipelineConfigure(const std::unique_ptr &root) = 0;\n+\tvirtual int platformPipelineConfigure(const YamlObject &phConfig, std::optional &target) = 0;\n \n \tstd::unique_ptr ipa_;\n \ndiff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\nindex 2df91bacf..54d885c8a 100644\n--- a/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n+++ b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n@@ -743,7 +743,7 @@ public:\n \tCameraConfiguration::Status\n \tplatformValidate(RPi::RPiCameraConfiguration *rpiConfig) const override;\n \n-\tint platformPipelineConfigure(const std::unique_ptr &root) override;\n+\tint platformPipelineConfigure(const YamlObject &phConfig, std::optional &target) override;\n \n \tvoid platformStart() override;\n \tvoid platformStop() override;\n@@ -1331,7 +1331,7 @@ PiSPCameraData::platformValidate(RPi::RPiCameraConfiguration *rpiConfig) const\n \treturn status;\n }\n \n-int PiSPCameraData::platformPipelineConfigure(const std::unique_ptr &root)\n+int PiSPCameraData::platformPipelineConfigure(const YamlObject &phConfig, std::optional &target)\n {\n \tconfig_ = {\n \t\t.numCfeConfigStatsBuffers = 12,\n@@ -1340,23 +1340,15 @@ int PiSPCameraData::platformPipelineConfigure(const std::unique_ptr\n \t\t.disableHdr = false,\n \t};\n \n-\tif (!root)\n+\tif (!phConfig)\n \t\treturn 0;\n \n-\tstd::optional ver = (*root)[\"version\"].get();\n-\tif (!ver || *ver != 1.0) {\n-\t\tLOG(RPI, Error) << \"Unexpected configuration file version reported\";\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tstd::optional target = (*root)[\"target\"].get();\n \tif (target != \"pisp\") {\n \t\tLOG(RPI, Error) << \"Unexpected target reported: expected \\\"pisp\\\", got \"\n \t\t\t\t<< (target ? target->c_str() : \"(unknown)\");\n \t\treturn -EINVAL;\n \t}\n \n-\tconst YamlObject &phConfig = (*root)[\"pipeline_handler\"];\n \tconfig_.numCfeConfigStatsBuffers =\n \t\tphConfig[\"num_cfe_config_stats_buffers\"].get(config_.numCfeConfigStatsBuffers);\n \tconfig_.numCfeConfigQueue =\ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex e99a7edf8..714110c7e 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -67,7 +67,7 @@ public:\n \n \tCameraConfiguration::Status platformValidate(RPi::RPiCameraConfiguration *rpiConfig) const override;\n \n-\tint platformPipelineConfigure(const std::unique_ptr &root) override;\n+\tint platformPipelineConfigure(const YamlObject &phConfig, std::optional &target) override;\n \n \tvoid platformStart() override;\n \tvoid platformStop() override;\n@@ -493,30 +493,22 @@ CameraConfiguration::Status Vc4CameraData::platformValidate(RPi::RPiCameraConfig\n \treturn status;\n }\n \n-int Vc4CameraData::platformPipelineConfigure(const std::unique_ptr &root)\n+int Vc4CameraData::platformPipelineConfigure(const YamlObject &phConfig, std::optional &target)\n {\n \tconfig_ = {\n \t\t.minUnicamBuffers = 2,\n \t\t.minTotalUnicamBuffers = 4,\n \t};\n \n-\tif (!root)\n+\tif (!phConfig)\n \t\treturn 0;\n \n-\tstd::optional ver = (*root)[\"version\"].get();\n-\tif (!ver || *ver != 1.0) {\n-\t\tLOG(RPI, Error) << \"Unexpected configuration file version reported\";\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tstd::optional target = (*root)[\"target\"].get();\n \tif (target != \"bcm2835\") {\n \t\tLOG(RPI, Error) << \"Unexpected target reported: expected \\\"bcm2835\\\", got \"\n \t\t\t\t<< (target ? target->c_str() : \"(unknown)\");\n \t\treturn -EINVAL;\n \t}\n \n-\tconst YamlObject &phConfig = (*root)[\"pipeline_handler\"];\n \tconfig_.minUnicamBuffers =\n \t\tphConfig[\"min_unicam_buffers\"].get(config_.minUnicamBuffers);\n \tconfig_.minTotalUnicamBuffers =\n","prefixes":["v11","04/12"]}