Patch Detail
Show a patch.
GET /api/1.1/patches/22244/?format=api
{ "id": 22244, "url": "https://patchwork.libcamera.org/api/1.1/patches/22244/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22244/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20241206171148.1189292-8-mzamazal@redhat.com>", "date": "2024-12-06T17:11:38", "name": "[v6,07/16] config: Look up rpi paths in configuration file", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e5eb9acc7216cc2430aa184e67561710e5e27d70", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22244/mbox/", "series": [ { "id": 4861, "url": "https://patchwork.libcamera.org/api/1.1/series/4861/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4861", "date": "2024-12-06T17:11:31", "name": "Add global configuration file", "version": 6, "mbox": "https://patchwork.libcamera.org/series/4861/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22244/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22244/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 85143BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 6 Dec 2024 17:12:30 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 42BBC67E42;\n\tFri, 6 Dec 2024 18:12:30 +0100 (CET)", "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 4E3C767E43\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 6 Dec 2024 18:12:28 +0100 (CET)", "from mx-prod-mc-03.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-85-IPLKHpVxPP6NqFUSCqtPaA-1;\n\tFri, 06 Dec 2024 12:12:24 -0500", "from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id E29FA1955DA4; Fri, 6 Dec 2024 17:12:22 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.224.27])\n\tby mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 785FC300019E; Fri, 6 Dec 2024 17:12:20 +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=\"Y/Ct+oKh\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1733505147;\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=gFrvbuzQzOcSqlmQ/EiGhf9G2YDFCa5r07NQHNGFA9c=;\n\tb=Y/Ct+oKhxXd9Wz/OxFEFJlokerllx1aEPVNDlXEZ9I28k1PSD4Tzy+Uxa3zWuVj2z9O5fI\n\t6f73q+fnnLDs9vBS+EgTYDJ5uO4B3BGy70MrxFgVzWqRxLfKYwQOzV5z8irCBmlEohK4Vu\n\tUOpyddB6o3zZ91D3UeQhP+VFUcP9yh8=", "X-MC-Unique": "IPLKHpVxPP6NqFUSCqtPaA-1", "X-Mimecast-MFC-AGG-ID": "IPLKHpVxPP6NqFUSCqtPaA", "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>, Naushir Patuck\n\t<naush@raspberrypi.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<pobrn@protonmail.com>, Laurent Pinchart\n\t<laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v6 07/16] config: Look up rpi paths in configuration file", "Date": "Fri, 6 Dec 2024 18:11:38 +0100", "Message-ID": "<20241206171148.1189292-8-mzamazal@redhat.com>", "In-Reply-To": "<20241206171148.1189292-1-mzamazal@redhat.com>", "References": "<20241206171148.1189292-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.4", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "MVgl-F-miBqLtqpgmcYGWwPvIXrdcJdrU99rZzD-Df0_1733505143", "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": "It 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- These options point to other configuration files and it makes little\n sense to add another configuration file to the chain.\n\nThe configuration snippet:\n\n configuration:\n pipeline:\n rpi:\n config_file: FILENAME\n tuning_file: FILENAME\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n .../pipeline/rpi/common/pipeline_base.cpp | 18 ++++++++++++++----\n 1 file changed, 14 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex 6f278b29..12f9b2b3 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -20,6 +20,7 @@\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 \n@@ -1101,7 +1102,12 @@ int CameraData::loadPipelineConfiguration()\n \t/* Initial configuration of the platform, in case no config file is present */\n \tplatformPipelineConfigure({});\n \n-\tchar const *configFromEnv = utils::secure_getenv(\"LIBCAMERA_RPI_CONFIG_FILE\");\n+\tstd::optional<std::string> configFile =\n+\t\tGlobalConfiguration::envOption(\"LIBCAMERA_RPI_CONFIG_FILE\",\n+\t\t\t\t\t \"pipelines.rpi.config_file\");\n+\tif (!configFile.has_value())\n+\t\treturn 0;\n+\tchar const *configFromEnv = configFile.value().c_str();\n \tif (!configFromEnv || *configFromEnv == '\\0')\n \t\treturn 0;\n \n@@ -1160,14 +1166,18 @@ int CameraData::loadIPA(ipa::RPi::InitResult *result)\n \t * the environment variable overrides it.\n \t */\n \tstd::string configurationFile;\n-\tchar const *configFromEnv = utils::secure_getenv(\"LIBCAMERA_RPI_TUNING_FILE\");\n-\tif (!configFromEnv || *configFromEnv == '\\0') {\n+\tconst std::string confPath =\n+\t\tstd::string(\"pipelines.rpi.cameras.\") + sensor_->id() + std::string(\".tuning_file\");\n+\tstd::optional<std::string> configFromEnv =\n+\t\tGlobalConfiguration::envOption(\"LIBCAMERA_RPI_TUNING_FILE\",\n+\t\t\t\t\t confPath.c_str());\n+\tif (!configFromEnv.has_value() || configFromEnv.value().empty()) {\n \t\tstd::string model = sensor_->model();\n \t\tif (isMonoSensor(sensor_))\n \t\t\tmodel += \"_mono\";\n \t\tconfigurationFile = ipa_->configurationFile(model + \".json\");\n \t} else {\n-\t\tconfigurationFile = std::string(configFromEnv);\n+\t\tconfigurationFile = configFromEnv.value();\n \t}\n \n \tIPASettings settings(configurationFile, sensor_->model());\n", "prefixes": [ "v6", "07/16" ] }