Patch Detail
Show a patch.
GET /api/1.1/patches/24644/?format=api
{ "id": 24644, "url": "https://patchwork.libcamera.org/api/1.1/patches/24644/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24644/", "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": "<20251014142427.3107490-5-stefan.klug@ideasonboard.com>", "date": "2025-10-14T14:24:19", "name": "[v1,4/4] ipa: libipa: agc_mean_luminance: Fix yTarget handling in constraints", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "40873d8d89b4c3b808d53829e40cc0bcea3f55e4", "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/24644/mbox/", "series": [ { "id": 5502, "url": "https://patchwork.libcamera.org/api/1.1/series/5502/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5502", "date": "2025-10-14T14:24:15", "name": "libipa: agc: Fix constraints yTarget handling and add PWL support", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5502/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24644/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24644/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 D5AEFBE080\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 14 Oct 2025 14:24:44 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8ACAA60609;\n\tTue, 14 Oct 2025 16:24:44 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 434A2605FE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 14 Oct 2025 16:24:43 +0200 (CEST)", "from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:61fb:8e55:ff1e:be62])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id B54B611DA; \n\tTue, 14 Oct 2025 16:23: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=\"rTvwV+8q\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1760451784;\n\tbh=YOPnK+KnhPDEHq3fPF5AcMw2cIJr38dzYQjRfsgPQus=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=rTvwV+8qd9j2VND1E8pqzQ0F8kOEDFAUg2WjqyyhHu1NkDzdKZWw+lWbJFsvzxZ4Q\n\tTWP6We6vznEFUXHMqAhgPMncZ1V3F0yef7+TZDfey+aIsgNn/aLqC+hMearaIqKcq9\n\tK89HVRQdt/IE2NQbUDM443sHiMc+taLJ7Q3P8EIc=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>", "Subject": "[PATCH v1 4/4] ipa: libipa: agc_mean_luminance: Fix yTarget handling\n\tin constraints", "Date": "Tue, 14 Oct 2025 16:24:19 +0200", "Message-ID": "<20251014142427.3107490-5-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.48.1", "In-Reply-To": "<20251014142427.3107490-1-stefan.klug@ideasonboard.com>", "References": "<20251014142427.3107490-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": "The yTarget loading code is broken and works neither for plain values\nnor for arrays of values to form a PWL. Fix this by supporting both\ncases. If a list is provided in the tuning file construct a PWL,\notherwise construct a single point PWL with the given value.\n\nFixes: 24247a12c7d3 (\"ipa: libipa: Add AgcMeanLuminance base class\")\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n src/ipa/libipa/agc_mean_luminance.cpp | 54 +++++++++++++++++++++------\n src/ipa/libipa/agc_mean_luminance.h | 5 +--\n src/ipa/rkisp1/algorithms/wdr.cpp | 3 +-\n 3 files changed, 46 insertions(+), 16 deletions(-)", "diff": "diff --git a/src/ipa/libipa/agc_mean_luminance.cpp b/src/ipa/libipa/agc_mean_luminance.cpp\nindex 62b1918a45a7..551f6515e849 100644\n--- a/src/ipa/libipa/agc_mean_luminance.cpp\n+++ b/src/ipa/libipa/agc_mean_luminance.cpp\n@@ -181,7 +181,7 @@ int AgcMeanLuminance::parseRelativeLuminanceTarget(const YamlObject &tuningData)\n \treturn 0;\n }\n \n-void AgcMeanLuminance::parseConstraint(const YamlObject &modeDict, int32_t id)\n+int AgcMeanLuminance::parseConstraint(const YamlObject &modeDict, int32_t id)\n {\n \tfor (const auto &[boundName, content] : modeDict.asDict()) {\n \t\tif (boundName != \"upper\" && boundName != \"lower\") {\n@@ -194,10 +194,27 @@ void AgcMeanLuminance::parseConstraint(const YamlObject &modeDict, int32_t id)\n \t\tAgcConstraint::Bound bound = static_cast<AgcConstraint::Bound>(idx);\n \t\tdouble qLo = content[\"qLo\"].get<double>().value_or(0.98);\n \t\tdouble qHi = content[\"qHi\"].get<double>().value_or(1.0);\n-\t\tdouble yTarget =\n-\t\t\tcontent[\"yTarget\"].getList<double>().value_or(std::vector<double>{ 0.5 }).at(0);\n+\t\tauto &target = content[\"yTarget\"];\n+\t\tPwl yTarget;\n+\t\tif (target.isValue()) {\n+\t\t\tauto v = target.get<double>();\n+\t\t\tif (!v) {\n+\t\t\t\tLOG(AgcMeanLuminance, Error)\n+\t\t\t\t\t<< \"Failed to parse single value yTarget\";\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\tyTarget.append(0, *v);\n+\t\t} else {\n+\t\t\tauto v = target.get<Pwl>();\n+\t\t\tif (!v) {\n+\t\t\t\tLOG(AgcMeanLuminance, Error)\n+\t\t\t\t\t<< \"Failed to parse PWL based yTarget\";\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\tyTarget.swap(*v);\n+\t\t}\n \n-\t\tAgcConstraint constraint = { bound, qLo, qHi, yTarget };\n+\t\tAgcConstraint constraint = { bound, qLo, qHi, std::move(yTarget) };\n \n \t\tif (!constraintModes_.count(id))\n \t\t\tconstraintModes_[id] = {};\n@@ -207,6 +224,8 @@ void AgcMeanLuminance::parseConstraint(const YamlObject &modeDict, int32_t id)\n \t\telse\n \t\t\tconstraintModes_[id].insert(constraintModes_[id].begin(), constraint);\n \t}\n+\n+\treturn 0;\n }\n \n int AgcMeanLuminance::parseConstraintModes(const YamlObject &tuningData)\n@@ -229,8 +248,11 @@ int AgcMeanLuminance::parseConstraintModes(const YamlObject &tuningData)\n \t\t\t\treturn -EINVAL;\n \t\t\t}\n \n-\t\t\tparseConstraint(modeDict,\n-\t\t\t\t\tAeConstraintModeNameValueMap.at(modeName));\n+\t\t\tint ret = parseConstraint(modeDict,\n+\t\t\t\t\t\t AeConstraintModeNameValueMap.at(modeName));\n+\t\t\tif (ret)\n+\t\t\t\treturn ret;\n+\n \t\t\tavailableConstraintModes.push_back(\n \t\t\t\tAeConstraintModeNameValueMap.at(modeName));\n \t\t}\n@@ -247,7 +269,7 @@ int AgcMeanLuminance::parseConstraintModes(const YamlObject &tuningData)\n \t\t\tAgcConstraint::Bound::Lower,\n \t\t\t0.98,\n \t\t\t1.0,\n-\t\t\t0.5\n+\t\t\t{ 0.0, 0.5 }\n \t\t};\n \n \t\tconstraintModes_[controls::ConstraintNormal].insert(\n@@ -360,8 +382,9 @@ void AgcMeanLuminance::configure(utils::Duration lineDuration,\n * the data in a specific format; the Agc algorithm's tuning data should contain\n * a dictionary called AeConstraintMode containing per-mode setting dictionaries\n * with the key being a value from \\ref controls::AeConstraintModeNameValueMap.\n- * Each mode dict may contain either a \"lower\" or \"upper\" key or both, for\n- * example:\n+ * The yTarget can either be provided as single value or as array in which case\n+ * it is interpreted as a PWL mapping lux levels to yTarget values. Each mode\n+ * dict may contain either a \"lower\" or \"upper\" key or both, for example:\n *\n * \\code{.unparsed}\n * algorithms:\n@@ -380,7 +403,7 @@ void AgcMeanLuminance::configure(utils::Duration lineDuration,\n * upper:\n * qLo: 0.98\n * qHi: 1.0\n- * yTarget: 0.8\n+ * yTarget: [ 100, 0.8, 20000, 0.5 ]\n *\n * \\endcode\n *\n@@ -536,8 +559,15 @@ double AgcMeanLuminance::constraintClampGain(uint32_t constraintModeIndex,\n \t\t\t\t\t const Histogram &hist,\n \t\t\t\t\t double gain)\n {\n-\tauto applyConstraint = [&gain, &hist](const AgcConstraint &constraint) {\n-\t\tdouble newGain = constraint.yTarget * hist.bins() /\n+\tauto applyConstraint = [this, &gain, &hist](const AgcConstraint &constraint) {\n+\t\tdouble lux = lux_;\n+\n+\t\tif (relativeLuminanceTarget_.size() > 1 && lux_ == 0)\n+\t\t\tlux = kDefaultLuxLevel;\n+\n+\t\tdouble target = constraint.yTarget.eval(\n+\t\t\tconstraint.yTarget.domain().clamp(lux));\n+\t\tdouble newGain = target * hist.bins() /\n \t\t\t\t hist.interQuantileMean(constraint.qLo, constraint.qHi);\n \n \t\tif (constraint.bound == AgcConstraint::Bound::Lower &&\ndiff --git a/src/ipa/libipa/agc_mean_luminance.h b/src/ipa/libipa/agc_mean_luminance.h\nindex 1fbff304a72b..d0d1fc139509 100644\n--- a/src/ipa/libipa/agc_mean_luminance.h\n+++ b/src/ipa/libipa/agc_mean_luminance.h\n@@ -40,7 +40,7 @@ public:\n \t\tBound bound;\n \t\tdouble qLo;\n \t\tdouble qHi;\n-\t\tdouble yTarget;\n+\t\tPwl yTarget;\n \t};\n \n \tvoid configure(utils::Duration lineDuration, const CameraSensorHelper *sensorHelper);\n@@ -88,8 +88,7 @@ public:\n private:\n \tvirtual double estimateLuminance(const double gain) const = 0;\n \tint parseRelativeLuminanceTarget(const YamlObject &tuningData);\n-\n-\tvoid parseConstraint(const YamlObject &modeDict, int32_t id);\n+\tint parseConstraint(const YamlObject &modeDict, int32_t id);\n \tint parseConstraintModes(const YamlObject &tuningData);\n \tint parseExposureModes(const YamlObject &tuningData);\n \tdouble estimateInitialGain() const;\ndiff --git a/src/ipa/rkisp1/algorithms/wdr.cpp b/src/ipa/rkisp1/algorithms/wdr.cpp\nindex 45144913dcd8..ed81628c032c 100644\n--- a/src/ipa/rkisp1/algorithms/wdr.cpp\n+++ b/src/ipa/rkisp1/algorithms/wdr.cpp\n@@ -175,7 +175,8 @@ int WideDynamicRange::configure(IPAContext &context,\n \tconstraint.bound = AgcMeanLuminance::AgcConstraint::Bound::Upper;\n \tconstraint.qHi = 1.0;\n \tconstraint.qLo = 1.0 - exposureConstraintMaxBrightPixels_;\n-\tconstraint.yTarget = exposureConstraintY_;\n+\tconstraint.yTarget.clear();\n+\tconstraint.yTarget.append(0, exposureConstraintY_);\n \treturn 0;\n }\n \n", "prefixes": [ "v1", "4/4" ] }