{"id":21363,"url":"https://patchwork.libcamera.org/api/patches/21363/?format=json","web_url":"https://patchwork.libcamera.org/patch/21363/","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":"<20240925095850.348259-11-mzamazal@redhat.com>","date":"2024-09-25T09:58:42","name":"[v4,10/15] config: Look up RkISP1 tuning file in configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6045e9109f7c65682ebfd76d5dd7238d33912210","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/21363/mbox/","series":[{"id":4623,"url":"https://patchwork.libcamera.org/api/series/4623/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4623","date":"2024-09-25T09:58:32","name":"Add global configuration file","version":4,"mbox":"https://patchwork.libcamera.org/series/4623/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21363/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21363/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 ECDB7C0F1B\n\tfor ;\n\tWed, 25 Sep 2024 09:59:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8AFEC63529;\n\tWed, 25 Sep 2024 11:59:37 +0200 (CEST)","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 B49656351D\n\tfor ;\n\tWed, 25 Sep 2024 11:59:29 +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-240-f_BOmQN2NMuRycPBG2V_rw-1;\n\tWed, 25 Sep 2024 05:59:25 -0400","from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (unknown\n\t[10.30.177.12])\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 EF5731955E8C; Wed, 25 Sep 2024 09:59:23 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.225.29])\n\tby mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 7148919560AD; Wed, 25 Sep 2024 09:59:22 +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=\"LOH3XLsp\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1727258368;\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=EOsClPwshLitKP3tW8DteLBQzgPVqNZ1omWohlypZcY=;\n\tb=LOH3XLspkp4IrgI6sfEcp3H97lWXkOGDP/d3qWS8VAv8Rus1ye6ohWX5PWw97aopWkgHek\n\tR3elSluCJwGSKsX5EsYbMm2tcevqHn6CrCTUPQkluIp/8V3OKoKcF3yIivdv++aGt7LAII\n\tZ8voefdFNvCDJzWMgB5gd2WhtSF1eS8=","X-MC-Unique":"f_BOmQN2NMuRycPBG2V_rw-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tKieran Bingham ,\n\tNaushir Patuck ","Subject":"[PATCH v4 10/15] config: Look up RkISP1 tuning file in configuration\n\tfile","Date":"Wed, 25 Sep 2024 11:58:42 +0200","Message-ID":"<20240925095850.348259-11-mzamazal@redhat.com>","In-Reply-To":"<20240925095850.348259-1-mzamazal@redhat.com>","References":"<20240925095850.348259-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.12","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 | 20 +++++++++++++++-----\n 1 file changed, 15 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex c02c7cf37..da94e41d5 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -35,6 +35,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@@ -348,12 +349,21 @@ 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+\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+\t\t * 'uncalibrated' configuration file.\n+\t\t */\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":["v4","10/15"]}