{"id":20282,"url":"https://patchwork.libcamera.org/api/1.1/patches/20282/?format=json","web_url":"https://patchwork.libcamera.org/patch/20282/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240613013944.23344-11-laurent.pinchart@ideasonboard.com>","date":"2024-06-13T01:39:43","name":"[10/11] ipa: rpi: controller: Replace Pwl::readYaml() with YamlObject::get()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"ce867176a5f517f9661ea3821ac5933a723a300e","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20282/mbox/","series":[{"id":4386,"url":"https://patchwork.libcamera.org/api/1.1/series/4386/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4386","date":"2024-06-13T01:39:33","name":"ipa: libipa: Vector and Pwl improvements","version":1,"mbox":"https://patchwork.libcamera.org/series/4386/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20282/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20282/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 AB459C32D0\n\tfor ;\n\tThu, 13 Jun 2024 01:40:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A17A165493;\n\tThu, 13 Jun 2024 03:40:31 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 36C3E6549B\n\tfor ;\n\tThu, 13 Jun 2024 03:40:18 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 77BBCE39;\n\tThu, 13 Jun 2024 03:40:04 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ucstaAus\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1718242804;\n\tbh=2MXmYmAqW1FhyNWiain1GT8MZZQ8izk1FG0fwfjn7hA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ucstaAusrvwdpCpNxyMjLWtY3gmQxbKGDVjwphBmAUv22tqiova6zmUAy4llR4NYb\n\tT0XgsvFtrtFMFQI7AXq1hMGPpfhG4+c6YhEpxV4DcNgAz+j7tCZGlSeR9RaU9zSxF6\n\t7CyC9w5tCN7bMA5qbm+V93IkL6XidfBnomGnvwT0=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder ,\n\tDavid Plowman ,\n\tNaushir Patuck ","Subject":"[PATCH 10/11] ipa: rpi: controller: Replace Pwl::readYaml() with\n\tYamlObject::get()","Date":"Thu, 13 Jun 2024 04:39:43 +0300","Message-ID":"<20240613013944.23344-11-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.44.2","In-Reply-To":"<20240613013944.23344-1-laurent.pinchart@ideasonboard.com>","References":"<20240613013944.23344-1-laurent.pinchart@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":"Now that deserializing a Pwl object from YAML data is possible using the\nYamlObject::get() function, replace all usage of Pwl::readYaml() to\nprepare for its removal.\n\nSigned-off-by: Laurent Pinchart \n---\n src/ipa/rpi/controller/rpi/af.cpp | 2 +-\n src/ipa/rpi/controller/rpi/agc_channel.cpp | 9 +++++----\n src/ipa/rpi/controller/rpi/awb.cpp | 3 ++-\n src/ipa/rpi/controller/rpi/ccm.cpp | 6 +++---\n src/ipa/rpi/controller/rpi/contrast.cpp | 4 +++-\n src/ipa/rpi/controller/rpi/geq.cpp | 6 +++---\n src/ipa/rpi/controller/rpi/hdr.cpp | 4 ++--\n src/ipa/rpi/controller/rpi/tonemap.cpp | 2 +-\n 8 files changed, 20 insertions(+), 16 deletions(-)","diff":"diff --git a/src/ipa/rpi/controller/rpi/af.cpp b/src/ipa/rpi/controller/rpi/af.cpp\nindex 304629d6d4e5..5ca76dd98b4b 100644\n--- a/src/ipa/rpi/controller/rpi/af.cpp\n+++ b/src/ipa/rpi/controller/rpi/af.cpp\n@@ -139,7 +139,7 @@ int Af::CfgParams::read(const libcamera::YamlObject ¶ms)\n \treadNumber(skipFrames, params, \"skip_frames\");\n \n \tif (params.contains(\"map\"))\n-\t\tmap.readYaml(params[\"map\"]);\n+\t\tmap = params[\"map\"].get(ipa::Pwl{});\n \telse\n \t\tLOG(RPiAf, Warning) << \"No map defined\";\n \ndiff --git a/src/ipa/rpi/controller/rpi/agc_channel.cpp b/src/ipa/rpi/controller/rpi/agc_channel.cpp\nindex a381dd972215..cf2565a83836 100644\n--- a/src/ipa/rpi/controller/rpi/agc_channel.cpp\n+++ b/src/ipa/rpi/controller/rpi/agc_channel.cpp\n@@ -130,7 +130,8 @@ int AgcConstraint::read(const libcamera::YamlObject ¶ms)\n \t\treturn -EINVAL;\n \tqHi = *value;\n \n-\treturn yTarget.readYaml(params[\"y_target\"]);\n+\tyTarget = params[\"y_target\"].get(ipa::Pwl{});\n+\treturn yTarget.empty() ? -EINVAL : 0;\n }\n \n static std::tuple\n@@ -237,9 +238,9 @@ int AgcConfig::read(const libcamera::YamlObject ¶ms)\n \t\t\treturn ret;\n \t}\n \n-\tret = yTarget.readYaml(params[\"y_target\"]);\n-\tif (ret)\n-\t\treturn ret;\n+\tyTarget = params[\"y_target\"].get(ipa::Pwl{});\n+\tif (yTarget.empty())\n+\t\treturn -EINVAL;\n \n \tspeed = params[\"speed\"].get(0.2);\n \tstartupFrames = params[\"startup_frames\"].get(10);\ndiff --git a/src/ipa/rpi/controller/rpi/awb.cpp b/src/ipa/rpi/controller/rpi/awb.cpp\nindex 603953d7d863..003c8fa137f3 100644\n--- a/src/ipa/rpi/controller/rpi/awb.cpp\n+++ b/src/ipa/rpi/controller/rpi/awb.cpp\n@@ -49,7 +49,8 @@ int AwbPrior::read(const libcamera::YamlObject ¶ms)\n \t\treturn -EINVAL;\n \tlux = *value;\n \n-\treturn prior.readYaml(params[\"prior\"]);\n+\tprior = params[\"prior\"].get(ipa::Pwl{});\n+\treturn prior.empty() ? -EINVAL : 0;\n }\n \n static int readCtCurve(ipa::Pwl &ctR, ipa::Pwl &ctB, const libcamera::YamlObject ¶ms)\ndiff --git a/src/ipa/rpi/controller/rpi/ccm.cpp b/src/ipa/rpi/controller/rpi/ccm.cpp\nindex 3272a1416ffa..e673964c1856 100644\n--- a/src/ipa/rpi/controller/rpi/ccm.cpp\n+++ b/src/ipa/rpi/controller/rpi/ccm.cpp\n@@ -71,9 +71,9 @@ int Ccm::read(const libcamera::YamlObject ¶ms)\n \tint ret;\n \n \tif (params.contains(\"saturation\")) {\n-\t\tret = config_.saturation.readYaml(params[\"saturation\"]);\n-\t\tif (ret)\n-\t\t\treturn ret;\n+\t\tconfig_.saturation = params[\"saturation\"].get(ipa::Pwl{});\n+\t\tif (config_.saturation.empty())\n+\t\t\treturn -EINVAL;\n \t}\n \n \tfor (auto &p : params[\"ccms\"].asList()) {\ndiff --git a/src/ipa/rpi/controller/rpi/contrast.cpp b/src/ipa/rpi/controller/rpi/contrast.cpp\nindex 66871a61ed28..9b37943ae9c9 100644\n--- a/src/ipa/rpi/controller/rpi/contrast.cpp\n+++ b/src/ipa/rpi/controller/rpi/contrast.cpp\n@@ -53,7 +53,9 @@ int Contrast::read(const libcamera::YamlObject ¶ms)\n \tconfig_.hiHistogram = params[\"hi_histogram\"].get(0.95);\n \tconfig_.hiLevel = params[\"hi_level\"].get(0.95);\n \tconfig_.hiMax = params[\"hi_max\"].get(2000);\n-\treturn config_.gammaCurve.readYaml(params[\"gamma_curve\"]);\n+\n+\tconfig_.gammaCurve = params[\"gamma_curve\"].get(ipa::Pwl{});\n+\treturn config_.gammaCurve.empty() ? -EINVAL : 0;\n }\n \n void Contrast::setBrightness(double brightness)\ndiff --git a/src/ipa/rpi/controller/rpi/geq.cpp b/src/ipa/rpi/controller/rpi/geq.cpp\nindex c9c38ebff5ba..40e7191ba16a 100644\n--- a/src/ipa/rpi/controller/rpi/geq.cpp\n+++ b/src/ipa/rpi/controller/rpi/geq.cpp\n@@ -44,9 +44,9 @@ int Geq::read(const libcamera::YamlObject ¶ms)\n \t}\n \n \tif (params.contains(\"strength\")) {\n-\t\tint ret = config_.strength.readYaml(params[\"strength\"]);\n-\t\tif (ret)\n-\t\t\treturn ret;\n+\t\tconfig_.strength = params[\"strength\"].get(ipa::Pwl{});\n+\t\tif (config_.strength.empty())\n+\t\t\treturn -EINVAL;\n \t}\n \n \treturn 0;\ndiff --git a/src/ipa/rpi/controller/rpi/hdr.cpp b/src/ipa/rpi/controller/rpi/hdr.cpp\nindex d533a4ea4e65..f3da8291bf5d 100644\n--- a/src/ipa/rpi/controller/rpi/hdr.cpp\n+++ b/src/ipa/rpi/controller/rpi/hdr.cpp\n@@ -42,7 +42,7 @@ void HdrConfig::read(const libcamera::YamlObject ¶ms, const std::string &mod\n \n \t/* Lens shading related parameters. */\n \tif (params.contains(\"spatial_gain_curve\")) {\n-\t\tspatialGainCurve.readYaml(params[\"spatial_gain_curve\"]);\n+\t\tspatialGainCurve = params[\"spatial_gain_curve\"].get(ipa::Pwl{});\n \t} else if (params.contains(\"spatial_gain\")) {\n \t\tdouble spatialGain = params[\"spatial_gain\"].get(2.0);\n \t\tspatialGainCurve.append(0.0, spatialGain);\n@@ -66,7 +66,7 @@ void HdrConfig::read(const libcamera::YamlObject ¶ms, const std::string &mod\n \tiirStrength = params[\"iir_strength\"].get(8.0);\n \tstrength = params[\"strength\"].get(1.5);\n \tif (tonemapEnable)\n-\t\ttonemap.readYaml(params[\"tonemap\"]);\n+\t\ttonemap = params[\"tonemap\"].get(ipa::Pwl{});\n \tspeed = params[\"speed\"].get(1.0);\n \tif (params.contains(\"hi_quantile_targets\")) {\n \t\thiQuantileTargets = params[\"hi_quantile_targets\"].getList().value();\ndiff --git a/src/ipa/rpi/controller/rpi/tonemap.cpp b/src/ipa/rpi/controller/rpi/tonemap.cpp\nindex 2dc50dfc8d2d..3422adfe7dee 100644\n--- a/src/ipa/rpi/controller/rpi/tonemap.cpp\n+++ b/src/ipa/rpi/controller/rpi/tonemap.cpp\n@@ -33,7 +33,7 @@ int Tonemap::read(const libcamera::YamlObject ¶ms)\n \tconfig_.detailSlope = params[\"detail_slope\"].get(0.1);\n \tconfig_.iirStrength = params[\"iir_strength\"].get(1.0);\n \tconfig_.strength = params[\"strength\"].get(1.0);\n-\tconfig_.tonemap.readYaml(params[\"tone_curve\"]);\n+\tconfig_.tonemap = params[\"tone_curve\"].get(ipa::Pwl{});\n \treturn 0;\n }\n \n","prefixes":["10/11"]}