{"id":19810,"url":"https://patchwork.libcamera.org/api/patches/19810/?format=json","web_url":"https://patchwork.libcamera.org/patch/19810/","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":"<20240326112419.503286-10-mzamazal@redhat.com>","date":"2024-03-26T11:24:12","name":"[RFC,09/11] config: Look up RkISP1 tuning file in configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"bee8b5625a0bdfc572a190bec30246246d8b95df","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/19810/mbox/","series":[{"id":4241,"url":"https://patchwork.libcamera.org/api/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/19810/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19810/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 53D3BC32C1\n\tfor ;\n\tTue, 26 Mar 2024 11:26:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CE68063360;\n\tTue, 26 Mar 2024 12:26:31 +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 D7D166332E\n\tfor ;\n\tTue, 26 Mar 2024 12:26:23 +0100 (CET)","from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n\t[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-499-vSLwvsv7Obq9EjtJn0BSPQ-1; Tue, 26 Mar 2024 07:26:21 -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 28B4F8007A3\n\tfor ;\n\tTue, 26 Mar 2024 11:26:21 +0000 (UTC)","from nuthatch.brq.redhat.com (unknown [10.43.17.39])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id AD3CA3C20;\n\tTue, 26 Mar 2024 11:26: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=\"KKkAVjjQ\"; 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=H5rObzSBGpbgDLgQyfdrfryihEhci/ELnlu2c5EUREA=;\n\tb=KKkAVjjQaOJXlSN2RmaSVGbuBlbWjvZRQBVt6FLdcfURMaUlA3vgWo8H5aZRDyraRCOkf1\n\tA1h3x2Kl8wVPrKcVQMgGkjp94H8prGlGH6aFC5BpO7d5AZ9nLZjlhuWJNGflTGT1RBtRes\n\tqTzPY4aWaon7dMbEVqPHou6ToPamLPY=","X-MC-Unique":"vSLwvsv7Obq9EjtJn0BSPQ-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ","Subject":"[RFC PATCH 09/11] config: Look up RkISP1 tuning file in\n\tconfiguration file","Date":"Tue, 26 Mar 2024 12:24:12 +0100","Message-ID":"<20240326112419.503286-10-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 rkisp1:\n tuning_file: FILE\n\nThis environment variable has not been documented.\n\nSigned-off-by: Milan Zamazal \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 9 ++++++---\n 1 file changed, 6 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex abb21968..5be25698 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -36,6 +36,7 @@\n #include \"libcamera/internal/delayed_controls.h\"\n #include \"libcamera/internal/device_enumerator.h\"\n #include \"libcamera/internal/framebuffer.h\"\n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n@@ -349,8 +350,10 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n \t * environment variable overrides it.\n \t */\n \tstd::string ipaTuningFile;\n-\tchar const *configFromEnv = utils::secure_getenv(\"LIBCAMERA_RKISP1_TUNING_FILE\");\n-\tif (!configFromEnv || *configFromEnv == '\\0') {\n+\tconst auto confTuningFile =\n+\t\tGlobalConfiguration::envOption(\n+\t\t\t\"LIBCAMERA_RKISP1_TUNING_FILE\", \"pipeline.rkisp1.tuning_file\");\n+\tif (!confTuningFile.has_value() || confTuningFile.value() == \"\") {\n \t\tipaTuningFile = ipa_->configurationFile(sensor_->model() + \".yaml\");\n \t\t/*\n \t\t * If the tuning file isn't found, fall back to the\n@@ -359,7 +362,7 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n \t\tif (ipaTuningFile.empty())\n \t\t\tipaTuningFile = ipa_->configurationFile(\"uncalibrated.yaml\");\n \t} else {\n-\t\tipaTuningFile = std::string(configFromEnv);\n+\t\tipaTuningFile = confTuningFile.value();\n \t}\n \n \tIPACameraSensorInfo sensorInfo{};\n","prefixes":["RFC","09/11"]}