{"id":19808,"url":"https://patchwork.libcamera.org/api/1.1/patches/19808/?format=json","web_url":"https://patchwork.libcamera.org/patch/19808/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240326112419.503286-8-mzamazal@redhat.com>","date":"2024-03-26T11:24:10","name":"[RFC,07/11] config: Look up rpi config path in configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"93d8ba412592351021676de2aa5b4b1bd4c27e63","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19808/mbox/","series":[{"id":4241,"url":"https://patchwork.libcamera.org/api/1.1/series/4241/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4241","date":"2024-03-26T11:24:03","name":"Add global configuration file","version":1,"mbox":"https://patchwork.libcamera.org/series/4241/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19808/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19808/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 D8FA2BD160\n\tfor ;\n\tTue, 26 Mar 2024 11:26:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 67E9763334;\n\tTue, 26 Mar 2024 12:26:29 +0100 (CET)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4CDA163352\n\tfor ;\n\tTue, 26 Mar 2024 12:26:23 +0100 (CET)","from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-382-EsqEbmrdNmeMXwuITtns_g-1;\n\tTue, 26 Mar 2024 07:26:20 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1])\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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id BF46E3C0D7BC\n\tfor ;\n\tTue, 26 Mar 2024 11:26:19 +0000 (UTC)","from nuthatch.brq.redhat.com (unknown [10.43.17.39])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 4D5A73C54;\n\tTue, 26 Mar 2024 11:26:19 +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=\"LLsgaIEo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1711452382;\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=MVGknVDHOYLDP9mCKW76NFv1VKmGr/3QBYY2Odjh9PM=;\n\tb=LLsgaIEoXduUdZy7RbIvEufoPBem6VF8ZrMfZn4iXfLYpWy8TZ0rMpWUnqtgfZWRaHFP2Q\n\tRPQZlPAEjLX+juDhNa0KtN7SAcCqVM6x9VM6N4cDdxRARvIo4NnIg4EfVhrbjJvTav31Xb\n\tmjb2V5h5y+8lT09C4u+yAOoCHk5LUaw=","X-MC-Unique":"EsqEbmrdNmeMXwuITtns_g-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ","Subject":"[RFC PATCH 07/11] config: Look up rpi config path in configuration\n\tfile","Date":"Tue, 26 Mar 2024 12:24:10 +0100","Message-ID":"<20240326112419.503286-8-mzamazal@redhat.com>","In-Reply-To":"<20240326112419.503286-1-mzamazal@redhat.com>","References":"<20240326112419.503286-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.1","X-Mimecast-Spam-Score":"0","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":"The 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 7e420b3f..8260a3ff 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@@ -1086,7 +1087,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 \"pipeline.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":["RFC","07/11"]}