{"id":20445,"url":"https://patchwork.libcamera.org/api/patches/20445/?format=json","web_url":"https://patchwork.libcamera.org/patch/20445/","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":"<20240627145156.1094127-10-mzamazal@redhat.com>","date":"2024-06-27T14:51:46","name":"[v3,09/14] config: Look up RkISP1 tuning file in configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"07095615e764aa2066f142b41b928b2ec5238abf","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/20445/mbox/","series":[{"id":4426,"url":"https://patchwork.libcamera.org/api/series/4426/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4426","date":"2024-06-27T14:51:37","name":"Add global configuration file","version":3,"mbox":"https://patchwork.libcamera.org/series/4426/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20445/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20445/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 368ECBD87C\n\tfor ;\n\tThu, 27 Jun 2024 14:52:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D594963334;\n\tThu, 27 Jun 2024 16:52:56 +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 4E3ED62E18\n\tfor ;\n\tThu, 27 Jun 2024 16:52:51 +0200 (CEST)","from mx-prod-mc-04.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-387-s4iVzdmHMkODJPN4nGR5BQ-1;\n\tThu, 27 Jun 2024 10:52:48 -0400","from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.15])\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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id ACBF71955F36; Thu, 27 Jun 2024 14:52:47 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.225.47])\n\tby mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 11F7C1955BD4; Thu, 27 Jun 2024 14:52:45 +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=\"LxG5uYCc\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1719499970;\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=6DEQiEX5fOPklDgBQb3aOaVo6i+RgJCENFDxlNYV3Ik=;\n\tb=LxG5uYCcXsUFY9mKXb3PsIzjhPdlViBEQdZzVdGMdsjbv1vT1hKIdjIMKlY0USUfna/LVR\n\tdHGfMQx0y/KdliIE9mrVocEcwNAVLdeaoXJCOdtlKWeDZl2PqBl5bRz6D2ExVlWmLH4LUc\n\tjWt6CjNetdGdQ1xhbXyNDehDsG9MW0Q=","X-MC-Unique":"s4iVzdmHMkODJPN4nGR5BQ-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tKieran Bingham ","Subject":"[PATCH v3 09/14] config: Look up RkISP1 tuning file in configuration\n\tfile","Date":"Thu, 27 Jun 2024 16:51:46 +0200","Message-ID":"<20240627145156.1094127-10-mzamazal@redhat.com>","In-Reply-To":"<20240627145156.1094127-1-mzamazal@redhat.com>","References":"<20240627145156.1094127-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.15","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 | 11 ++++++++---\n 1 file changed, 8 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 4cbf105d..c244ac6e 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,12 @@ 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 std::string confPath =\n+\t\tstd::string(\"pipelines.rkisp1.cameras.\") + sensor_->id() + std::string(\".tuning_file\");\n+\tconst auto confTuningFile =\n+\t\tGlobalConfiguration::envOption(\n+\t\t\t\"LIBCAMERA_RKISP1_TUNING_FILE\", confPath.c_str());\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 +364,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":["v3","09/14"]}