Patch Detail
Show a patch.
GET /api/1.1/patches/22622/?format=api
{ "id": 22622, "url": "https://patchwork.libcamera.org/api/1.1/patches/22622/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22622/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20250123114204.79321-8-stefan.klug@ideasonboard.com>", "date": "2025-01-23T11:40:57", "name": "[v2,07/17] ipa: rkisp1: Use grey world algorithm from libipa", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4cb5dc3adf0e9471998fb83830e6f0d17a79f9ca", "submitter": { "id": 184, "url": "https://patchwork.libcamera.org/api/1.1/people/184/?format=api", "name": "Stefan Klug", "email": "stefan.klug@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22622/mbox/", "series": [ { "id": 4966, "url": "https://patchwork.libcamera.org/api/1.1/series/4966/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4966", "date": "2025-01-23T11:40:50", "name": "Add Bayesian AWB algorithm to libipa and rkisp1", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4966/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22622/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22622/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 6E630BDE6B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 23 Jan 2025 11:42:35 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B538E6856F;\n\tThu, 23 Jan 2025 12:42:34 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 09E406856B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 Jan 2025 12:42:32 +0100 (CET)", "from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:c0a:33cd:b453:5d3f])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 86095465;\n\tThu, 23 Jan 2025 12:41:28 +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=\"VOo6mSz6\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1737632488;\n\tbh=81yB7+lofl9u90S3yCYFx/74zgR/+ZjsCRx9OIQ1eDI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=VOo6mSz651CyHRBc/tUVd1C3Peq/4VnUdmsvFG5+pYUqG0pTk3lRmWoxeYO5q+Fqs\n\tzB9KIBFSKy031iiGB6Srhk4iMXJyfBF/BM7tfIIbuqepeWe8JS9LrLOUBQrNUW6xuF\n\tEBeNWd9O8ZBbkW97oYpZt4PmrNqrkrxir80HTV/o=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>,\n\tPaul Elder <paul.elder@ideasonboard.com>,\n\tDaniel Scally <dan.scally@ideasonboard.com>", "Subject": "[PATCH v2 07/17] ipa: rkisp1: Use grey world algorithm from libipa", "Date": "Thu, 23 Jan 2025 12:40:57 +0100", "Message-ID": "<20250123114204.79321-8-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20250123114204.79321-1-stefan.klug@ideasonboard.com>", "References": "<20250123114204.79321-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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Now that libipa contains a grey world algorithm, use that.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\nReviewed-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Daniel Scally <dan.scally@ideasonboard.com>\n\n---\n\nChanges in v2:\n- Collected tags\n- Replaced r variable with awbResult\n---\n src/ipa/rkisp1/algorithms/awb.cpp | 73 ++++++++++++++++++++-----------\n src/ipa/rkisp1/algorithms/awb.h | 4 +-\n 2 files changed, 50 insertions(+), 27 deletions(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\nindex f6449565834b..b21d0d4c03bb 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -16,6 +16,7 @@\n \n #include <libcamera/ipa/core_ipa_interface.h>\n \n+#include \"libipa/awb_grey.h\"\n #include \"libipa/colours.h\"\n \n /**\n@@ -40,6 +41,28 @@ constexpr int32_t kDefaultColourTemperature = 5000;\n /* Minimum mean value below which AWB can't operate. */\n constexpr double kMeanMinThreshold = 2.0;\n \n+class RkISP1AwbStats : public AwbStats\n+{\n+public:\n+\tRkISP1AwbStats(const RGB<double> &rgbMeans)\n+\t\t: rgbMeans_(rgbMeans) {}\n+\n+\tdouble computeColourError([[maybe_unused]] const RGB<double> &gains) const override\n+\t{\n+\t\tLOG(RkISP1Awb, Error)\n+\t\t\t<< \"RkISP1AwbStats::computeColourError is not implemented\";\n+\t\treturn 0.0;\n+\t}\n+\n+\tRGB<double> getRGBMeans() const override\n+\t{\n+\t\treturn rgbMeans_;\n+\t};\n+\n+private:\n+\tRGB<double> rgbMeans_;\n+};\n+\n Awb::Awb()\n \t: rgbMode_(false)\n {\n@@ -55,15 +78,12 @@ int Awb::init(IPAContext &context, const YamlObject &tuningData)\n \t\t\t\t\t\t\t kMaxColourTemperature,\n \t\t\t\t\t\t\t kDefaultColourTemperature);\n \n-\tInterpolator<Vector<double, 2>> gainCurve;\n-\tint ret = gainCurve.readYaml(tuningData[\"colourGains\"], \"ct\", \"gains\");\n-\tif (ret < 0)\n-\t\tLOG(RkISP1Awb, Warning)\n-\t\t\t<< \"Failed to parse 'colourGains' \"\n-\t\t\t<< \"parameter from tuning file; \"\n-\t\t\t<< \"manual colour temperature will not work properly\";\n-\telse\n-\t\tcolourGainCurve_ = gainCurve;\n+\tawbAlgo_ = std::make_unique<AwbGrey>();\n+\tint ret = awbAlgo_->init(tuningData);\n+\tif (ret) {\n+\t\tLOG(RkISP1Awb, Error) << \"Failed to init awb algorithm\";\n+\t\treturn ret;\n+\t}\n \n \treturn 0;\n }\n@@ -128,10 +148,10 @@ void Awb::queueRequest(IPAContext &context,\n \t\t * This will be fixed with the bayes AWB algorithm.\n \t\t */\n \t\tupdate = true;\n-\t} else if (colourTemperature && colourGainCurve_) {\n-\t\tconst auto &gains = colourGainCurve_->getInterpolated(*colourTemperature);\n-\t\tawb.gains.manual.r() = gains[0];\n-\t\tawb.gains.manual.b() = gains[1];\n+\t} else if (colourTemperature) {\n+\t\tconst auto &gains = awbAlgo_->gainsFromColourTemperature(*colourTemperature);\n+\t\tawb.gains.manual.r() = gains.r();\n+\t\tawb.gains.manual.b() = gains.b();\n \t\tawb.temperatureK = *colourTemperature;\n \t\tupdate = true;\n \t}\n@@ -251,33 +271,34 @@ void Awb::process(IPAContext &context,\n \t rgbMeans.b() < kMeanMinThreshold)\n \t\treturn;\n \n-\tactiveState.awb.temperatureK = estimateCCT(rgbMeans);\n+\t/*\n+\t * \\Todo: Hardcode lux to a fixed value, until an estimation is\n+\t * implemented.\n+\t */\n+\tint lux = 1000;\n+\n+\tRkISP1AwbStats awbStats{ rgbMeans };\n+\tAwbResult awbResult = awbAlgo_->calculateAwb(awbStats, lux);\n+\n+\tactiveState.awb.temperatureK = awbResult.colourTemperature;\n \n \t/* Metadata shall contain the up to date measurement */\n \tmetadata.set(controls::ColourTemperature, activeState.awb.temperatureK);\n \n-\t/*\n-\t * Estimate the red and blue gains to apply in a grey world. The green\n-\t * gain is hardcoded to 1.0. Avoid divisions by zero by clamping the\n-\t * divisor to a minimum value of 1.0.\n-\t */\n-\tRGB<double> gains({ rgbMeans.g() / std::max(rgbMeans.r(), 1.0),\n-\t\t\t 1.0,\n-\t\t\t rgbMeans.g() / std::max(rgbMeans.b(), 1.0) });\n-\n \t/*\n \t * Clamp the gain values to the hardware, which expresses gains as Q2.8\n \t * unsigned integer values. Set the minimum just above zero to avoid\n \t * divisions by zero when computing the raw means in subsequent\n \t * iterations.\n \t */\n-\tgains = gains.max(1.0 / 256).min(1023.0 / 256);\n+\tawbResult.gains = awbResult.gains.max(1.0 / 256).min(1023.0 / 256);\n \n \t/* Filter the values to avoid oscillations. */\n \tdouble speed = 0.2;\n-\tgains = gains * speed + activeState.awb.gains.automatic * (1 - speed);\n+\tawbResult.gains = awbResult.gains * speed +\n+\t\t\t activeState.awb.gains.automatic * (1 - speed);\n \n-\tactiveState.awb.gains.automatic = gains;\n+\tactiveState.awb.gains.automatic = awbResult.gains;\n \n \tLOG(RkISP1Awb, Debug)\n \t\t<< std::showpoint\ndiff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h\nindex 2a64cb60d5f4..3382b2178567 100644\n--- a/src/ipa/rkisp1/algorithms/awb.h\n+++ b/src/ipa/rkisp1/algorithms/awb.h\n@@ -9,6 +9,7 @@\n \n #include <optional>\n \n+#include \"libipa/awb.h\"\n #include \"libipa/interpolator.h\"\n #include \"libipa/vector.h\"\n \n@@ -41,7 +42,8 @@ private:\n \tRGB<double> calculateRgbMeans(const IPAFrameContext &frameContext,\n \t\t\t\t const rkisp1_cif_isp_awb_stat *awb) const;\n \n-\tstd::optional<Interpolator<Vector<double, 2>>> colourGainCurve_;\n+\tstd::unique_ptr<AwbAlgorithm> awbAlgo_;\n+\n \tbool rgbMode_;\n };\n \n", "prefixes": [ "v2", "07/17" ] }