{"id":21455,"url":"https://patchwork.libcamera.org/api/1.1/patches/21455/?format=json","web_url":"https://patchwork.libcamera.org/patch/21455/","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":"<20241001102810.479285-9-mzamazal@redhat.com>","date":"2024-10-01T10:28:00","name":"[v5,08/15] 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=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21455/mbox/","series":[{"id":4644,"url":"https://patchwork.libcamera.org/api/1.1/series/4644/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4644","date":"2024-10-01T10:27:52","name":"Add global configuration file","version":5,"mbox":"https://patchwork.libcamera.org/series/4644/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21455/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21455/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 ED945BD80A\n\tfor ;\n\tTue, 1 Oct 2024 10:28:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 721C86352B;\n\tTue, 1 Oct 2024 12:28:48 +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 24F4E63534\n\tfor ;\n\tTue, 1 Oct 2024 12:28:37 +0200 (CEST)","from mx-prod-mc-01.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-567-FpiDPwCNMxCCsQT2njCAgQ-1;\n\tTue, 01 Oct 2024 06:28:33 -0400","from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (unknown\n\t[10.30.177.40])\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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 24668196A110; Tue, 1 Oct 2024 10:28:32 +0000 (UTC)","from nuthatch.brq.redhat.com (unknown [10.43.17.37])\n\tby mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 64BC41956054; Tue, 1 Oct 2024 10:28: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=\"bD9ubYC2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1727778516;\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=SVagsyM2Pwzeomzxqlf07FJIo8ronPFgHExlF1mY+oM=;\n\tb=bD9ubYC2fNNLHdAl963uQWPj0yBsq/N3MVkWWLzucebVKjo9uOuIdDvWlJm7YZm4ZnTt15\n\tLUW6tqv8mCXGinYkVfaS7FFLxBR6ItsFwcWEqgnt+TTpS4g3mv0bHT0ACk3ZaYBTBMeL1M\n\t0irF9PCDZ3ikfJZ8EG9QpfWY10IsaZk=","X-MC-Unique":"FpiDPwCNMxCCsQT2njCAgQ-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tKieran Bingham ,\n\tNaushir Patuck ","Subject":"[PATCH v5 08/15] config: Look up rpi paths in configuration file","Date":"Tue, 1 Oct 2024 12:28:00 +0200","Message-ID":"<20241001102810.479285-9-mzamazal@redhat.com>","In-Reply-To":"<20241001102810.479285-1-mzamazal@redhat.com>","References":"<20241001102810.479285-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.40","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":"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 \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 3041fd1ed..6c9a39725 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@@ -1088,7 +1089,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@@ -1147,14 +1153,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 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":["v5","08/15"]}