{"id":22753,"url":"https://patchwork.libcamera.org/api/patches/22753/?format=json","web_url":"https://patchwork.libcamera.org/patch/22753/","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":"<20250206161607.50738-8-mzamazal@redhat.com>","date":"2025-02-06T16:15:58","name":"[v7,07/15] config: Look up rpi config path in configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4a500ef5be786752794af95c7bd83499b35f728d","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/22753/mbox/","series":[{"id":4993,"url":"https://patchwork.libcamera.org/api/series/4993/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4993","date":"2025-02-06T16:15:51","name":"Add global configuration file","version":7,"mbox":"https://patchwork.libcamera.org/series/4993/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22753/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22753/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 1ADF5C32EF\n\tfor ;\n\tThu, 6 Feb 2025 16:16:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A145268607;\n\tThu, 6 Feb 2025 17:16:40 +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 662E0685FD\n\tfor ;\n\tThu, 6 Feb 2025 17:16:36 +0100 (CET)","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-653-zqbhJ9ZZM7eh_SrYCmuynw-1;\n\tThu, 06 Feb 2025 11:16:34 -0500","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.111])\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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id DF2471800987; Thu, 6 Feb 2025 16:16:32 +0000 (UTC)","from mzamazal-thinkpadp1gen3.tpbc.com (unknown [10.43.17.31])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 1001F180056F; Thu, 6 Feb 2025 16:16:30 +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=\"QjkPGwvc\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1738858595;\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=GvfN8GKc9ehkkBKOghzhSvX8p6TEglkWISferiiHIIg=;\n\tb=QjkPGwvcQSNIMUG+if7XzIT4t9P8Hy6zSOFueH/CETz6qKhGwkJc8E0SM6dnWLt2QMdIsw\n\tXJNUC0Qyoo2vAZhKxZaWP22l4hnsoO2ur6pNqsaIYlzp3auM7AiEEk4GKue/20hABMhG2e\n\tqlIMZANI60ZJ9uOP0l8FbEdwkiJjpH0=","X-MC-Unique":"zqbhJ9ZZM7eh_SrYCmuynw-1","X-Mimecast-MFC-AGG-ID":"zqbhJ9ZZM7eh_SrYCmuynw","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Kieran Bingham\n\t, Naushir Patuck\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t, Laurent Pinchart\n\t","Subject":"[PATCH v7 07/15] config: Look up rpi config path in configuration\n\tfile","Date":"Thu, 6 Feb 2025 17:15:58 +0100","Message-ID":"<20250206161607.50738-8-mzamazal@redhat.com>","In-Reply-To":"<20250206161607.50738-1-mzamazal@redhat.com>","References":"<20250206161607.50738-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"WOqXssYk2aEV-9GyZt0XseuXZKYc_Nwpn9EPiYT0XhY_1738858593","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 introduce a configuration option for rpi configuration file path.\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 configuration snippet:\n\n configuration:\n pipeline:\n rpi:\n config_file: FILENAME\n\nSigned-off-by: Milan Zamazal \n---\n src/libcamera/pipeline/rpi/common/pipeline_base.cpp | 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex 1f13e523..739dc61a 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 \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@@ -1102,7 +1103,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 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","prefixes":["v7","07/15"]}