{"id":22246,"url":"https://patchwork.libcamera.org/api/patches/22246/?format=json","web_url":"https://patchwork.libcamera.org/patch/22246/","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":"<20241206171148.1189292-10-mzamazal@redhat.com>","date":"2024-12-06T17:11:40","name":"[v6,09/16] config: Look up RkISP1 tuning file in configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ca200c280c5a757bcda297f4f493684d27a4c5ad","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/22246/mbox/","series":[{"id":4861,"url":"https://patchwork.libcamera.org/api/series/4861/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4861","date":"2024-12-06T17:11:31","name":"Add global configuration file","version":6,"mbox":"https://patchwork.libcamera.org/series/4861/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22246/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22246/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 EFE7CBF415\n\tfor ;\n\tFri, 6 Dec 2024 17:12:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7F13267E48;\n\tFri, 6 Dec 2024 18:12:36 +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 07D7667E2E\n\tfor ;\n\tFri, 6 Dec 2024 18:12:33 +0100 (CET)","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-47-T1xREvdwO-COtTXQSfasgw-1;\n\tFri, 06 Dec 2024 12:12:30 -0500","from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\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 F02AB1955F40; Fri, 6 Dec 2024 17:12:28 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.224.27])\n\tby mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 90E9F300019E; Fri, 6 Dec 2024 17:12:26 +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=\"iGEc3Ut9\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1733505153;\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=l56VQUit0RiZWzbn01z5NRFZ9h60jvB0DUpBnzufxTY=;\n\tb=iGEc3Ut9YZnYC7SSrkZ7ADYa89RmPK+IwWDtkSwqsDcGAS9Heizel6vcbWeZ2PLO2C0Nxf\n\t72uBPSXdTmtv8BcpHbksx15cH61DtH+nLpijF36Xpepag31WKuqKgW6HBjDhW8grkOYw6H\n\tNDIuk14bri3p+AU/IefC3OVqPNsixmU=","X-MC-Unique":"T1xREvdwO-COtTXQSfasgw-1","X-Mimecast-MFC-AGG-ID":"T1xREvdwO-COtTXQSfasgw","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 v6 09/16] config: Look up RkISP1 tuning file in configuration\n\tfile","Date":"Fri, 6 Dec 2024 18:11:40 +0100","Message-ID":"<20241206171148.1189292-10-mzamazal@redhat.com>","In-Reply-To":"<20241206171148.1189292-1-mzamazal@redhat.com>","References":"<20241206171148.1189292-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.4","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"Yno0KuIU9VlyOuxTO3nqlM3HSFvUOs4LZLGQ5YJ3s-U_1733505149","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 | 18 +++++++++++-------\n 1 file changed, 11 insertions(+), 7 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 908724e2..92f6addd 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -39,6 +39,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@@ -376,13 +377,16 @@ 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-\t\tipaTuningFile =\n-\t\t\tipa_->configurationFile(sensor_->model() + \".yaml\", \"uncalibrated.yaml\");\n-\t} else {\n-\t\tipaTuningFile = std::string(configFromEnv);\n-\t}\n+\tconst std::string confPath =\n+\t\tstd::string(\"pipelines.rkisp1.cameras.\") + sensor_->id() + \".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\t\t\t\t\t\"uncalibrated.yaml\");\n+\telse\n+\t\tipaTuningFile = confTuningFile.value();\n \n \tIPACameraSensorInfo sensorInfo{};\n \tint ret = sensor_->sensorInfo(&sensorInfo);\n","prefixes":["v6","09/16"]}