Patch Detail
Show a patch.
GET /api/1.1/patches/26001/?format=api
{ "id": 26001, "url": "https://patchwork.libcamera.org/api/1.1/patches/26001/?format=api", "web_url": "https://patchwork.libcamera.org/patch/26001/", "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": "<20260128114402.31570-9-mzamazal@redhat.com>", "date": "2026-01-28T11:43:55", "name": "[v5,08/15] libcamera: ipa: simple: Move contrast settings to adjust.cpp", "commit_ref": "e8e2bd39f938cd234f83e79be7c648b63188499d", "pull_url": null, "state": "accepted", "archived": false, "hash": "6ab6c1ae4d175a5393c05e8631e9a6d07c7c8f20", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/26001/mbox/", "series": [ { "id": 5748, "url": "https://patchwork.libcamera.org/api/1.1/series/5748/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5748", "date": "2026-01-28T11:43:47", "name": "Simple pipeline IPA cleanup", "version": 5, "mbox": "https://patchwork.libcamera.org/series/5748/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/26001/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/26001/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 19954C3200\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 28 Jan 2026 11:44:38 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 73C6361FD9;\n\tWed, 28 Jan 2026 12:44:37 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DEF1E61FD0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 28 Jan 2026 12:44:30 +0100 (CET)", "from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-417-AgLo-u-SNYCniMHZTITDrg-1;\n\tWed, 28 Jan 2026 06:44:28 -0500", "from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 7EB9B18005B6; Wed, 28 Jan 2026 11:44:27 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.34.236])\n\tby mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 79D8F19560B2; Wed, 28 Jan 2026 11:44:25 +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=\"QyhU1AYr\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1769600669;\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=iVS9VFGkuoeeiE6e0/fQyz9Mtv0pIkrBSDb8NCUYkwM=;\n\tb=QyhU1AYrAKcR39l//FPfK/XCmSdNIFtkg1UnTPzPrwiNRVRpAXtQGoqyobZ3oUFLqodzFz\n\ta3JQhg0AoNbpTCPpqXOygZgZeejjjgPIfvxyKUGtFJICQiwXBxUUAg9UtTuRRamSlZkkJI\n\twUyW5/+mE3rhvj+sROAKJ/JH4TTq3ss=", "X-MC-Unique": "AgLo-u-SNYCniMHZTITDrg-1", "X-Mimecast-MFC-AGG-ID": "AgLo-u-SNYCniMHZTITDrg_1769600667", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>, Kieran Bingham\n\t<kieran.bingham@ideasonboard.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<barnabas.pocze@ideasonboard.com>, Robert Mader\n\t<robert.mader@collabora.com>", "Subject": "[PATCH v5 08/15] libcamera: ipa: simple: Move contrast settings to\n\tadjust.cpp", "Date": "Wed, 28 Jan 2026 12:43:55 +0100", "Message-ID": "<20260128114402.31570-9-mzamazal@redhat.com>", "In-Reply-To": "<20260128114402.31570-1-mzamazal@redhat.com>", "References": "<20260128114402.31570-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-MFC-PROC-ID": "KUXgD2ui69lMm4Gv5ffM39r8KJ5Kn8p-t4xnc5y46Fc_1769600667", "X-Mimecast-Originator": "redhat.com", "Content-Type": "text/plain; charset=UTF-8", "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": "Let's move the contrast settings from lut.cpp to adjust.cpp, where they\nbelong, similarly to saturation.\n\nReviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\nReviewed-by: Robert Mader <robert.mader@collabora.com>\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n src/ipa/simple/algorithms/adjust.cpp | 14 +++++++++++\n src/ipa/simple/algorithms/lut.cpp | 35 +---------------------------\n src/ipa/simple/algorithms/lut.h | 11 ---------\n 3 files changed, 15 insertions(+), 45 deletions(-)", "diff": "diff --git a/src/ipa/simple/algorithms/adjust.cpp b/src/ipa/simple/algorithms/adjust.cpp\nindex 8ce0631e4..27ae2a53a 100644\n--- a/src/ipa/simple/algorithms/adjust.cpp\n+++ b/src/ipa/simple/algorithms/adjust.cpp\n@@ -23,6 +23,7 @@ LOG_DEFINE_CATEGORY(IPASoftAdjust)\n \n int Adjust::init(IPAContext &context, [[maybe_unused]] const YamlObject &tuningData)\n {\n+\tcontext.ctrlMap[&controls::Contrast] = ControlInfo(0.0f, 2.0f, 1.0f);\n \tif (context.ccmEnabled)\n \t\tcontext.ctrlMap[&controls::Saturation] = ControlInfo(0.0f, 2.0f, 1.0f);\n \treturn 0;\n@@ -31,6 +32,7 @@ int Adjust::init(IPAContext &context, [[maybe_unused]] const YamlObject &tuningD\n int Adjust::configure(IPAContext &context,\n \t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n {\n+\tcontext.activeState.knobs.contrast = std::optional<double>();\n \tcontext.activeState.knobs.saturation = std::optional<double>();\n \n \treturn 0;\n@@ -41,6 +43,12 @@ void Adjust::queueRequest(typename Module::Context &context,\n \t\t\t [[maybe_unused]] typename Module::FrameContext &frameContext,\n \t\t\t const ControlList &controls)\n {\n+\tconst auto &contrast = controls.get(controls::Contrast);\n+\tif (contrast.has_value()) {\n+\t\tcontext.activeState.knobs.contrast = contrast;\n+\t\tLOG(IPASoftAdjust, Debug) << \"Setting contrast to \" << contrast.value();\n+\t}\n+\n \tconst auto &saturation = controls.get(controls::Saturation);\n \tif (saturation.has_value()) {\n \t\tcontext.activeState.knobs.saturation = saturation;\n@@ -75,6 +83,8 @@ void Adjust::prepare(IPAContext &context,\n \t\t IPAFrameContext &frameContext,\n \t\t [[maybe_unused]] DebayerParams *params)\n {\n+\tframeContext.contrast = context.activeState.knobs.contrast;\n+\n \tif (!context.ccmEnabled)\n \t\treturn;\n \n@@ -95,6 +105,10 @@ void Adjust::process([[maybe_unused]] IPAContext &context,\n \t\t [[maybe_unused]] const SwIspStats *stats,\n \t\t ControlList &metadata)\n {\n+\tconst auto &contrast = frameContext.contrast;\n+\tif (contrast)\n+\t\tmetadata.set(controls::Contrast, contrast.value());\n+\n \tconst auto &saturation = frameContext.saturation;\n \tmetadata.set(controls::Saturation, saturation.value_or(1.0));\n }\ndiff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp\nindex 141ea17fa..3a00bf4ee 100644\n--- a/src/ipa/simple/algorithms/lut.cpp\n+++ b/src/ipa/simple/algorithms/lut.cpp\n@@ -24,36 +24,16 @@ LOG_DEFINE_CATEGORY(IPASoftLut)\n \n namespace ipa::soft::algorithms {\n \n-int Lut::init(IPAContext &context,\n-\t [[maybe_unused]] const YamlObject &tuningData)\n-{\n-\tcontext.ctrlMap[&controls::Contrast] = ControlInfo(0.0f, 2.0f, 1.0f);\n-\treturn 0;\n-}\n-\n int Lut::configure(IPAContext &context,\n \t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n {\n \t/* Gamma value is fixed */\n \tcontext.configuration.gamma = 1.0 / 2.2;\n-\tcontext.activeState.knobs.contrast = std::optional<double>();\n \tupdateGammaTable(context);\n \n \treturn 0;\n }\n \n-void Lut::queueRequest(typename Module::Context &context,\n-\t\t [[maybe_unused]] const uint32_t frame,\n-\t\t [[maybe_unused]] typename Module::FrameContext &frameContext,\n-\t\t const ControlList &controls)\n-{\n-\tconst auto &contrast = controls.get(controls::Contrast);\n-\tif (contrast.has_value()) {\n-\t\tcontext.activeState.knobs.contrast = contrast;\n-\t\tLOG(IPASoftLut, Debug) << \"Setting contrast to \" << contrast.value();\n-\t}\n-}\n-\n void Lut::updateGammaTable(IPAContext &context)\n {\n \tconst auto blackLevel = context.activeState.blc.level;\n@@ -96,11 +76,9 @@ int16_t Lut::matrixValue(unsigned int i, float ccm) const\n \n void Lut::prepare(IPAContext &context,\n \t\t [[maybe_unused]] const uint32_t frame,\n-\t\t IPAFrameContext &frameContext,\n+\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n \t\t DebayerParams *params)\n {\n-\tframeContext.contrast = context.activeState.knobs.contrast;\n-\n \t/*\n \t * Update the gamma table if needed. This means if black level changes\n \t * and since the black level gets updated only if a lower value is\n@@ -157,17 +135,6 @@ void Lut::prepare(IPAContext &context,\n \tparams->contrastExp = context.activeState.gamma.contrastExp;\n }\n \n-void Lut::process([[maybe_unused]] IPAContext &context,\n-\t\t [[maybe_unused]] const uint32_t frame,\n-\t\t [[maybe_unused]] IPAFrameContext &frameContext,\n-\t\t [[maybe_unused]] const SwIspStats *stats,\n-\t\t ControlList &metadata)\n-{\n-\tconst auto &contrast = frameContext.contrast;\n-\tif (contrast)\n-\t\tmetadata.set(controls::Contrast, contrast.value());\n-}\n-\n REGISTER_IPA_ALGORITHM(Lut, \"Lut\")\n \n } /* namespace ipa::soft::algorithms */\ndiff --git a/src/ipa/simple/algorithms/lut.h b/src/ipa/simple/algorithms/lut.h\nindex 0eafd0695..ad16d1e8e 100644\n--- a/src/ipa/simple/algorithms/lut.h\n+++ b/src/ipa/simple/algorithms/lut.h\n@@ -19,22 +19,11 @@ public:\n \tLut() = default;\n \t~Lut() = default;\n \n-\tint init(IPAContext &context, const YamlObject &tuningData) override;\n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n-\tvoid queueRequest(typename Module::Context &context,\n-\t\t\t const uint32_t frame,\n-\t\t\t typename Module::FrameContext &frameContext,\n-\t\t\t const ControlList &controls)\n-\t\toverride;\n \tvoid prepare(IPAContext &context,\n \t\t const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\n \t\t DebayerParams *params) override;\n-\tvoid process(IPAContext &context,\n-\t\t const uint32_t frame,\n-\t\t IPAFrameContext &frameContext,\n-\t\t const SwIspStats *stats,\n-\t\t ControlList &metadata) override;\n \n private:\n \tvoid updateGammaTable(IPAContext &context);\n", "prefixes": [ "v5", "08/15" ] }