Patch Detail
Show a patch.
GET /api/patches/24311/?format=api
{ "id": 24311, "url": "https://patchwork.libcamera.org/api/patches/24311/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24311/", "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": "<20250911092945.16517-5-mzamazal@redhat.com>", "date": "2025-09-11T09:29:34", "name": "[v17,04/12] pipeline: rpi: Look up rpi configuration in the configuration file", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "0765e29b1bb962c07d2a80b42400e783dd6b72a2", "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/24311/mbox/", "series": [ { "id": 5431, "url": "https://patchwork.libcamera.org/api/series/5431/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5431", "date": "2025-09-11T09:29:30", "name": "Add global configuration file", "version": 17, "mbox": "https://patchwork.libcamera.org/series/5431/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24311/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24311/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 897ACC324E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 11 Sep 2025 09:30:15 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4AB0E69367;\n\tThu, 11 Sep 2025 11:30:15 +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 154F56935A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 11 Sep 2025 11:30:11 +0200 (CEST)", "from mx-prod-mc-05.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-529-8Ut1NG0bNKak4Uf_5aCC7Q-1;\n\tThu, 11 Sep 2025 05:30:06 -0400", "from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.12])\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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 815641955E88; Thu, 11 Sep 2025 09:30:05 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.34.98])\n\tby mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 3D3D319560BE; Thu, 11 Sep 2025 09:30:02 +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=\"DCbzIpex\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1757583010;\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=fo1jQO0iVdo6uMpU/eheH1m+fzefT0v95Feof2WkKm4=;\n\tb=DCbzIpexxBOdenKmeCHvcjnQHi+PspihN9FbsbUTsS3fOPiQlC2T9o5PURLUkgfhgl3ooj\n\tr4FMnLSf+m7DvcxX4hfgwr7tBDbokOgZiS2uCc0+YSlJsJuvMV91fhrCTTrJ9ZIqMzjsqj\n\tA5r0JrMEJD8G4yJmBzh1sp1KLAzU6iA=", "X-MC-Unique": "8Ut1NG0bNKak4Uf_5aCC7Q-1", "X-Mimecast-MFC-AGG-ID": "8Ut1NG0bNKak4Uf_5aCC7Q_1757583005", "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>, Paul Elder\n\t<paul.elder@ideasonboard.com>", "Subject": "[PATCH v17 04/12] pipeline: rpi: Look up rpi configuration in the\n\tconfiguration file", "Date": "Thu, 11 Sep 2025 11:29:34 +0200", "Message-ID": "<20250911092945.16517-5-mzamazal@redhat.com>", "In-Reply-To": "<20250911092945.16517-1-mzamazal@redhat.com>", "References": "<20250911092945.16517-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.12", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "_S1Gx-i7meslKFCYD9rpxFslrAJgmjRpeRo0hqlcyy0_1757583005", "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 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 pipelines:\n rpi:\n bcm2835:\n pipeline_handler:\n ...\n pisp:\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 <mzamazal@redhat.com>\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(-)", "diff": "diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex c209aa596..a4a018268 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 <libcamera/property_ids.h>\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@@ -1093,35 +1095,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<YamlObject> 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<YamlObject> 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<double> ver = (*root)[\"version\"].get<double>();\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<double> ver = (*root)[\"version\"].get<double>();\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<std::string> t = (*root)[\"target\"].get<std::string>();\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()[\"pipelines\"][\"rpi\"];\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@@ -1137,7 +1150,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)\ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h\nindex 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<YamlObject> &root) = 0;\n+\tvirtual int platformPipelineConfigure(const YamlObject &phConfig) = 0;\n \n \tstd::unique_ptr<ipa::RPi::IPAProxyRPi> ipa_;\n \ndiff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\nindex 082724c5a..0fb7c3fe8 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<YamlObject> &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<YamlObject> &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<YamlObject>\n \t\t.disableHdr = false,\n \t};\n \n-\tif (!root)\n+\tif (!phConfig)\n \t\treturn 0;\n \n-\tstd::optional<double> ver = (*root)[\"version\"].get<double>();\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<std::string> target = (*root)[\"target\"].get<std::string>();\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<unsigned int>(config_.numCfeConfigStatsBuffers);\n \tconfig_.numCfeConfigQueue =\ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex 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<YamlObject> &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<YamlObject> &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<double> ver = (*root)[\"version\"].get<double>();\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<std::string> target = (*root)[\"target\"].get<std::string>();\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<unsigned int>(config_.minUnicamBuffers);\n \tconfig_.minTotalUnicamBuffers =\n", "prefixes": [ "v17", "04/12" ] }