{"id":22219,"url":"https://patchwork.libcamera.org/api/patches/22219/?format=json","web_url":"https://patchwork.libcamera.org/patch/22219/","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":"<20241206145242.827886-3-stefan.klug@ideasonboard.com>","date":"2024-12-06T14:52:22","name":"[v5,2/8] ipa: rkisp1: awb: Load white balance gains from tuning file","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5b3658b6875fb05f73f41211e0611fa5d294958a","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22219/mbox/","series":[{"id":4857,"url":"https://patchwork.libcamera.org/api/series/4857/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4857","date":"2024-12-06T14:52:20","name":"rkisp1: Add manual colour temperature control","version":5,"mbox":"https://patchwork.libcamera.org/series/4857/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22219/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22219/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 36355BF415\n\tfor ;\n\tFri, 6 Dec 2024 14:52:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D9D1866179;\n\tFri, 6 Dec 2024 15:52:54 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2EA9B6614C\n\tfor ;\n\tFri, 6 Dec 2024 15:52:53 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:3543:aebe:e043:ef86])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id ADC85641;\n\tFri, 6 Dec 2024 15:52:23 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"v9ab/kEx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1733496743;\n\tbh=ZIZFnD6KTrmdNF7FrJ8iqLM05F3FdPGrBhUxffIHhJU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=v9ab/kEx6FXx/GqJmVXW+W6Yhpl7IOo3xSIP5sfC0V53h96i2heFKiIuhx4LCVPf5\n\tiAdoXFLyZEqSTKGH7u2rZQTzBymgdJyJxroT6NAXOz/NF54ATlfjr2gnre//8ljVut\n\tVOxwfaP1bc3Xi1bidGyxT5PBg7prnaipTjujF27s=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ,\n\tKieran Bingham ,\n\tPaul Elder ,\n\tLaurent Pinchart ","Subject":"[PATCH v5 2/8] ipa: rkisp1: awb: Load white balance gains from\n\ttuning file","Date":"Fri, 6 Dec 2024 15:52:22 +0100","Message-ID":"<20241206145242.827886-3-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20241206145242.827886-1-stefan.klug@ideasonboard.com>","References":"<20241206145242.827886-1-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"For the implementation of a manual colour temperature setting, it is\nnecessary to read predefined colour gains per colour temperature from\nthe tuning file. Implement this in a backwards compatible way. If no\ngains are contained in the tuning file, loading just continues as\nbefore.\n\nSigned-off-by: Stefan Klug \nReviewed-by: Kieran Bingham \nReviewed-by: Paul Elder \nReviewed-by: Laurent Pinchart \n\n---\nChanges in v5:\n- Replace Interpolator with Interpolator\n---\n src/ipa/rkisp1/algorithms/awb.cpp | 18 ++++++++++++++++++\n src/ipa/rkisp1/algorithms/awb.h | 7 +++++++\n 2 files changed, 25 insertions(+)","diff":"diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\nindex 4bb4f5b88375..23a81e75d3d3 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -41,6 +41,24 @@ Awb::Awb()\n {\n }\n \n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::init\n+ */\n+int Awb::init([[maybe_unused]] IPAContext &context, const YamlObject &tuningData)\n+{\n+\tInterpolator> gains;\n+\tint ret = gains.readYaml(tuningData[\"gains\"], \"ct\", \"gains\");\n+\tif (ret < 0)\n+\t\tLOG(RkISP1Awb, Warning)\n+\t\t\t<< \"Failed to parse 'gains' \"\n+\t\t\t<< \"parameter from tuning file; \"\n+\t\t\t<< \"manual colour temperature will not work properly\";\n+\telse\n+\t\tgains_ = gains;\n+\n+\treturn 0;\n+}\n+\n /**\n * \\copydoc libcamera::ipa::Algorithm::configure\n */\ndiff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h\nindex 6ac3a5c3838b..a7e0537c66d9 100644\n--- a/src/ipa/rkisp1/algorithms/awb.h\n+++ b/src/ipa/rkisp1/algorithms/awb.h\n@@ -7,6 +7,11 @@\n \n #pragma once\n \n+#include \n+\n+#include \"libipa/interpolator.h\"\n+#include \"libipa/vector.h\"\n+\n #include \"algorithm.h\"\n \n namespace libcamera {\n@@ -19,6 +24,7 @@ public:\n \tAwb();\n \t~Awb() = default;\n \n+\tint init(IPAContext &context, const YamlObject &tuningData) override;\n \tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n \tvoid queueRequest(IPAContext &context, const uint32_t frame,\n \t\t\t IPAFrameContext &frameContext,\n@@ -32,6 +38,7 @@ public:\n \t\t ControlList &metadata) override;\n \n private:\n+\tstd::optional>> gains_;\n \tbool rgbMode_;\n };\n \n","prefixes":["v5","2/8"]}