Patch Detail
Show a patch.
GET /api/patches/25756/?format=api
{ "id": 25756, "url": "https://patchwork.libcamera.org/api/patches/25756/?format=api", "web_url": "https://patchwork.libcamera.org/patch/25756/", "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": "<20260113000808.15395-37-laurent.pinchart@ideasonboard.com>", "date": "2026-01-13T00:08:08", "name": "[36/36] pipeline: simple: Turn devices configuration option into dictionary", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "c675fe9f4c19ef9ab199be30c6d2db68d1419e5c", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/25756/mbox/", "series": [ { "id": 5703, "url": "https://patchwork.libcamera.org/api/series/5703/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5703", "date": "2026-01-13T00:07:32", "name": "libcamera: Global configuration file improvements", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5703/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/25756/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/25756/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 3E3BBC32C1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 13 Jan 2026 00:09:30 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D68DC62016;\n\tTue, 13 Jan 2026 01:09:29 +0100 (CET)", "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 7DAC26201E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 13 Jan 2026 01:09:28 +0100 (CET)", "from pendragon.ideasonboard.com (81-175-209-152.bb.dnainternet.fi\n\t[81.175.209.152])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id CF60C50A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 13 Jan 2026 01:09:02 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"qxmDYvT6\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1768262942;\n\tbh=W3sHbbdsGvkaqkKeqXqBvjANtmmt7NHoaPtTLcdrprU=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=qxmDYvT6IG1zyLHgDPm4ZjHTIwNEQQOiQh7kO91JfWjs1q8/AuYykglCjDhfeCvWJ\n\tj15FoJoT4756Il5eMBr2P+lrmlxMno5N8FO4wda63ddHKu3FF/YuCKe1g4wwfgLpRk\n\tIY/wpjD311C2nuM/X+xfqCdJzLMGZmVekus6SPWI=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[PATCH 36/36] pipeline: simple: Turn devices configuration option\n\tinto dictionary", "Date": "Tue, 13 Jan 2026 02:08:08 +0200", "Message-ID": "<20260113000808.15395-37-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.51.2", "In-Reply-To": "<20260113000808.15395-1-laurent.pinchart@ideasonboard.com>", "References": "<20260113000808.15395-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "The pipelines.simple.devices configuration option contains a list of\ndevices, each of them being a dictionary with a \"driver\" element that\nacts as a unique key to index the list. Turn it into a YAML dictionary\nto ensure uniqueness of the key, and simplify access in the pipeline\nhandler.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\nThis simplification will preclude indexing the list of devices with a\ncompound key. For instance, if we were to extend the simple pipeline\nhandler to match not only on a driver name but on a (driver, driver\nversion) pair, the current configuration file structure would allow\nexpressing this with\n\n pipelines:\n simple:\n devices:\n - driver: mxc-isi\n\t driver_version: 1\n\t software_isp: true\n - driver: mxc-isi\n\t driver_version: 2\n\t software_isp: false\n\nThe new structure would conceptually allow us to write\n\n pipelines:\n simple:\n devices:\n ? driver: mxc-isi\n\t driver_version: 1\n\t: software_isp: true\n ? driver: mxc-isi\n\t driver_version: 2\n\t: software_isp: false\n\nFor those not familiar with the explicit syntax for mappings, this would\ntranslate to the following Python data if dict objects were hashable in\nPython:\n\n{\n 'pipelines': {\n 'simple': {\n\t 'devices': {\n\t { 'driver': 'mxc-isi', 'driver_version': 1 }: {\n\t\t 'software_isp': True,\n\t\t},\n\t { 'driver': 'mxc-isi', 'driver_version': 2 }: {\n\t\t 'software_isp': False,\n\t\t},\n\t },\n\t},\n },\n}\n\nYes, YAML can use complex data as keys in mappings. I would really not\nwant to have to support that in libcamera though.\n\nOpinions will be appreciated.\n---\n Documentation/runtime_configuration.rst | 6 +++---\n src/libcamera/pipeline/simple/simple.cpp | 20 +++++++++-----------\n 2 files changed, 12 insertions(+), 14 deletions(-)", "diff": "diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst\nindex 19c2309ac94f..a904b09a1d35 100644\n--- a/Documentation/runtime_configuration.rst\n+++ b/Documentation/runtime_configuration.rst\n@@ -44,7 +44,7 @@ file structure:\n pipelines:\n simple:\n devices:\n- - driver: # driver name, e.g. `mxc-isi`\n+ # driver name, e.g. `mxc-isi`:\n software_isp: # true/false\n software_isp:\n copy_input_buffer: # true/false\n@@ -77,7 +77,7 @@ Configuration file example\n pipelines:\n simple:\n devices:\n- - driver: mxc-isi\n+ mxc-isi:\n software_isp: true\n software_isp:\n copy_input_buffer: false\n@@ -139,7 +139,7 @@ LIBCAMERA_<NAME>_TUNING_FILE\n \n Example value: ``/usr/local/share/libcamera/ipa/rpi/vc4/custom_sensor.json``\n \n-pipelines.simple.devices.driver, pipelines.simple.devices.software_isp\n+pipelines.simple.devices.<driver>.software_isp\n Override whether software ISP is enabled for the given driver.\n \n Example `driver` value: ``mxc-isi``\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 0ae9e081f01a..c949f3a69d16 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -1879,18 +1879,16 @@ bool SimplePipelineHandler::matchDevice(std::shared_ptr<MediaDevice> media,\n \t}\n \n \tswIspEnabled_ = info.swIspEnabled;\n+\n \tconst GlobalConfiguration &configuration = cameraManager()->_d()->configuration();\n-\tfor (GlobalConfiguration::Option entry :\n-\t configuration.configuration()[\"pipelines\"][\"simple\"][\"devices\"]\n-\t\t .asList()) {\n-\t\tauto name = entry[\"driver\"].get<std::string>();\n-\t\tif (name == info.driver) {\n-\t\t\tswIspEnabled_ = entry[\"software_isp\"].get<bool>().value_or(swIspEnabled_);\n-\t\t\tLOG(SimplePipeline, Debug)\n-\t\t\t\t<< \"Configuration file overrides software ISP for \"\n-\t\t\t\t<< info.driver << \" to \" << swIspEnabled_;\n-\t\t\tbreak;\n-\t\t}\n+\tGlobalConfiguration::Option &cfg =\n+\t\tconfiguration.configuration()[\"pipelines\"][\"simple\"][\"devices\"][info.driver];\n+\n+\tif (cfg) {\n+\t\tswIspEnabled_ = cfg[\"software_isp\"].get<bool>().value_or(swIspEnabled_);\n+\t\tLOG(SimplePipeline, Debug)\n+\t\t\t<< \"Configuration file overrides software ISP for \"\n+\t\t\t<< info.driver << \" to \" << swIspEnabled_;\n \t}\n \n \t/* Locate the sensors. */\n", "prefixes": [ "36/36" ] }