[{"id":35205,"web_url":"https://patchwork.libcamera.org/comment/35205/","msgid":"<182e7801-fa21-4ab5-ae9e-5f4595bb3fe0@ideasonboard.com>","date":"2025-07-28T14:56:45","subject":"Re: [PATCH v15 04/12] config: Look up rpi configuration in the\n\tconfiguration file","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"content":"Hi\n\n2025. 07. 24. 12:38 keltezéssel, Milan Zamazal írta:\n> Let's make rpi configuration available in the global configuration file.\n> It may be arguable whether pipeline specific configurations belong to\n> the 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> \n> The rpi configuration is currently placed in a separate file, specified\n> by LIBCAMERA_RPI_CONFIG_FILE environment variable. Let's support the\n> content of the file in the global configuration file. `version' field\n> is omitted as the global configuration file has its own version and the\n> required version in the original file has been 1.0 anyway.\n> \n> The configuration snippet:\n> \n> configuration:\n> pipeline:\n\nThis should be \"pipelines\" (and below) to match the documentation and the \"simple\"\npipeline handler. Or vica versa.\n\n\n> rpi:\n> bcm2835:\n> pipeline_handler:\n> ...\n> pisp:\n> pipeline_handler:\n> ...\n> \n> To not break current user setups, LIBCAMERA_RPI_CONFIG_FILE environment\n> variable is still supported and works as before, pointing to a separate\n> configuration file. Just the duplicate check for the configuration file\n> version in platformPipelineConfigure methods is removed.\n> \n> Signed-off-by: Milan Zamazal \n> ---\n> .../pipeline/rpi/common/pipeline_base.cpp | 59 +++++++++++--------\n> .../pipeline/rpi/common/pipeline_base.h | 3 +-\n> src/libcamera/pipeline/rpi/pisp/pisp.cpp | 26 +++-----\n> src/libcamera/pipeline/rpi/vc4/vc4.cpp | 26 +++-----\n> 4 files changed, 56 insertions(+), 58 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n> index 563df198e..5b8544691 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> @@ -1091,35 +1093,46 @@ int CameraData::loadPipelineConfiguration()\n> \t/* Initial configuration of the platform, in case no config file is present */\n> \tplatformPipelineConfigure({});\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> +\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> -\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> +\t\tLOG(RPI, Info) << \"Using configuration file '\" << filename << \"'\";\n> \n> -\tLOG(RPI, Info) << \"Using configuration file '\" << filename << \"'\";\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::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\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> \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 t = (*root)[\"target\"].get();\n> +\t\tif (t != target()) {\n> +\t\t\tLOG(RPI, Error) << \"Unexpected target reported: expected \\\"\"\n> +\t\t\t\t\t<< target() << \"\\\", got \" << (t ? t->c_str() : \"(unknown)\");\n> +\t\t\treturn -EINVAL;\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\nAnd here as well.\n\n\nRegards,\nBarnabás Pőcze\n\n\n> +\tconst YamlObject &phConfig = (root\n> +\t\t\t\t\t ? (*root)[\"pipeline_handler\"]\n> +\t\t\t\t\t : config[target()][\"pipeline_handler\"]);\n> \n> \tif (phConfig.contains(\"disable_startup_frame_drops\"))\n> \t\tLOG(RPI, Warning)\n> @@ -1135,7 +1148,7 @@ int CameraData::loadPipelineConfiguration()\n> \t\tfrontendDevice()->setDequeueTimeout(config_.cameraTimeoutValue * 1ms);\n> \t}\n> \n> -\treturn platformPipelineConfigure(root);\n> +\treturn platformPipelineConfigure(phConfig);\n> }\n> \n> int CameraData::loadIPA(ipa::RPi::InitResult *result)\n> diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n> index 4bce4ec4f..ffbede798 100644\n> --- a/src/libcamera/pipeline/rpi/common/pipeline_base.h\n> +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n> @@ -95,8 +95,9 @@ public:\n> \tvirtual V4L2VideoDevice::Formats ispFormats() const = 0;\n> \tvirtual V4L2VideoDevice::Formats rawFormats() const = 0;\n> \tvirtual V4L2VideoDevice *frontendDevice() = 0;\n> +\tvirtual const std::string &target() const = 0;\n> \n> -\tvirtual int platformPipelineConfigure(const std::unique_ptr &root) = 0;\n> +\tvirtual int platformPipelineConfigure(const YamlObject &phConfig) = 0;\n> \n> \tstd::unique_ptr ipa_;\n> \n> diff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n> index 15dd95068..dfbf0b8cb 100644\n> --- a/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n> +++ b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n> @@ -740,10 +740,16 @@ public:\n> \t\treturn cfe_[Cfe::Output0].dev();\n> \t}\n> \n> +\tconst std::string &target() const override\n> +\t{\n> +\t\tstatic const std::string target = \"pisp\";\n> +\t\treturn target;\n> +\t}\n> +\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) override;\n> \n> \tvoid platformStart() override;\n> \tvoid platformStop() override;\n> @@ -1331,7 +1337,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)\n> {\n> \tconfig_ = {\n> \t\t.numCfeConfigStatsBuffers = 12,\n> @@ -1340,23 +1346,9 @@ 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 =\n> diff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n> index 99d43bd0a..71c425373 100644\n> --- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n> +++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n> @@ -61,13 +61,19 @@ public:\n> \t\treturn unicam_[Unicam::Image].dev();\n> \t}\n> \n> +\tconst std::string &target() const override\n> +\t{\n> +\t\tstatic const std::string target = \"bcm2835\";\n> +\t\treturn target;\n> +\t}\n> +\n> \tvoid platformFreeBuffers() override\n> \t{\n> \t}\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) override;\n> \n> \tvoid platformStart() override;\n> \tvoid platformStop() override;\n> @@ -493,30 +499,16 @@ 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)\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 =","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 1842DC3237\n\tfor ;\n\tMon, 28 Jul 2025 14:56:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DDF6E69189;\n\tMon, 28 Jul 2025 16:56:50 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8097569158\n\tfor ;\n\tMon, 28 Jul 2025 16:56:49 +0200 (CEST)","from [192.168.33.18] (185.221.140.39.nat.pool.zt.hu\n\t[185.221.140.39])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 30B84446;\n\tMon, 28 Jul 2025 16:56:07 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"aio1T3hX\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1753714567;\n\tbh=Ccc0OVhYkfYF2L2yJFvhFhsUpPKjep2NrbiXVyzQ77I=;\n\th=Date:Subject:To:Cc:References:From:In-Reply-To:From;\n\tb=aio1T3hXwrU8r+oiu8nfDYwV7xcxFlz5Jz4qdw14NCGC+wiGiKNly62HbcFEsmsn4\n\tbCcsONmbKTAl8IgTQ+zuTx7rr33i0cFNvf3IwIv7/m6GGRnspF9tGvPfJtiIyAM7RC\n\txlNteP+3AAhBa8DViYVZy1Qc89yedBEejIw0ep9E=","Message-ID":"<182e7801-fa21-4ab5-ae9e-5f4595bb3fe0@ideasonboard.com>","Date":"Mon, 28 Jul 2025 16:56:45 +0200","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH v15 04/12] config: Look up rpi configuration in the\n\tconfiguration file","To":"Milan Zamazal , libcamera-devel@lists.libcamera.org","Cc":"Kieran Bingham ,\n\tLaurent Pinchart ","References":"<20250724103834.54611-1-mzamazal@redhat.com>\n\t<20250724103834.54611-5-mzamazal@redhat.com>","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Content-Language":"en-US, hu-HU","In-Reply-To":"<20250724103834.54611-5-mzamazal@redhat.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"8bit","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\" "}}]