Patch Detail
Show a patch.
GET /api/patches/24898/?format=api
{ "id": 24898, "url": "https://patchwork.libcamera.org/api/patches/24898/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24898/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20251029172439.1513907-10-kieran.bingham@ideasonboard.com>", "date": "2025-10-29T17:24:34", "name": "[v2,09/13] ipa: rkisp1: cproc: Convert to use Quantized types", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ddd362fac3182a33118887d278939fa035869a70", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/24898/mbox/", "series": [ { "id": 5544, "url": "https://patchwork.libcamera.org/api/series/5544/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5544", "date": "2025-10-29T17:24:25", "name": "libipa: Introduce a Quantized type", "version": 2, "mbox": "https://patchwork.libcamera.org/series/5544/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24898/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24898/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 ED4E8C3332\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 29 Oct 2025 17:25:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 70EC7608BC;\n\tWed, 29 Oct 2025 18:25:06 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 902596088F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 29 Oct 2025 18:24:48 +0100 (CET)", "from Monstersaurus.hippo-penny.ts.net\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 370874E58;\n\tWed, 29 Oct 2025 18:22:59 +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=\"HFKOrXas\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1761758579;\n\tbh=yyXZ2uF43fZaTf57oTb/Nr63Ep6X8BuetKHEskLMWyQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=HFKOrXasdxWNFS0JxbZOZcIRXZafWdxO6qOHgdAh8iJ5InT9Q2JvIFyecGPv1FRml\n\t/ezKQu0crjcw+oROH6vaG16I1k2QdtLpnnSu/eOM0H5qSZC5wnMJOY5GTVn17FCB/d\n\tPpChXZm0EKIW9Vt8+uKNmwal6dneg4Ae/lFZP5r0=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Cc": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "Subject": "[PATCH v2 09/13] ipa: rkisp1: cproc: Convert to use Quantized types", "Date": "Wed, 29 Oct 2025 17:24:34 +0000", "Message-ID": "<20251029172439.1513907-10-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.50.1", "In-Reply-To": "<20251029172439.1513907-1-kieran.bingham@ideasonboard.com>", "References": "<20251029172439.1513907-1-kieran.bingham@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": "Convert the Contrast and Saturuation helper functions to a Quantizer\ntype to support maintaining the data.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/ipa/rkisp1/algorithms/cproc.cpp | 36 +++++++++++------------------\n src/ipa/rkisp1/ipa_context.h | 20 +++++++++++-----\n 2 files changed, 28 insertions(+), 28 deletions(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\nindex d1fff6990d37..4637a824af03 100644\n--- a/src/ipa/rkisp1/algorithms/cproc.cpp\n+++ b/src/ipa/rkisp1/algorithms/cproc.cpp\n@@ -14,6 +14,8 @@\n \n #include <libcamera/control_ids.h>\n \n+#include \"libipa/quantized.h\"\n+\n /**\n * \\file cproc.h\n */\n@@ -39,16 +41,6 @@ constexpr float kDefaultBrightness = 0.0f;\n constexpr float kDefaultContrast = 1.0f;\n constexpr float kDefaultSaturation = 1.0f;\n \n-int convertBrightness(const float v)\n-{\n-\treturn std::clamp<int>(std::lround(v * 128), -128, 127);\n-}\n-\n-int convertContrastOrSaturation(const float v)\n-{\n-\treturn std::clamp<int>(std::lround(v * 128), 0, 255);\n-}\n-\n } /* namespace */\n \n /**\n@@ -74,9 +66,9 @@ int ColorProcessing::configure(IPAContext &context,\n {\n \tauto &cproc = context.activeState.cproc;\n \n-\tcproc.brightness = convertBrightness(kDefaultBrightness);\n-\tcproc.contrast = convertContrastOrSaturation(kDefaultContrast);\n-\tcproc.saturation = convertContrastOrSaturation(kDefaultSaturation);\n+\tcproc.brightness = BrightnessQ(kDefaultBrightness);\n+\tcproc.contrast = ContrastQ(kDefaultContrast);\n+\tcproc.saturation = SaturationQ(kDefaultSaturation);\n \n \treturn 0;\n }\n@@ -97,35 +89,35 @@ void ColorProcessing::queueRequest(IPAContext &context,\n \n \tconst auto &brightness = controls.get(controls::Brightness);\n \tif (brightness) {\n-\t\tint value = convertBrightness(*brightness);\n+\t\tBrightnessQ value = *brightness;\n \t\tif (cproc.brightness != value) {\n \t\t\tcproc.brightness = value;\n \t\t\tupdate = true;\n \t\t}\n \n-\t\tLOG(RkISP1CProc, Debug) << \"Set brightness to \" << value;\n+\t\tLOG(RkISP1CProc, Debug) << \"Set brightness to \" << value.value();\n \t}\n \n \tconst auto &contrast = controls.get(controls::Contrast);\n \tif (contrast) {\n-\t\tint value = convertContrastOrSaturation(*contrast);\n+\t\tContrastQ value = *contrast;\n \t\tif (cproc.contrast != value) {\n \t\t\tcproc.contrast = value;\n \t\t\tupdate = true;\n \t\t}\n \n-\t\tLOG(RkISP1CProc, Debug) << \"Set contrast to \" << value;\n+\t\tLOG(RkISP1CProc, Debug) << \"Set contrast to \" << value.value();\n \t}\n \n \tconst auto saturation = controls.get(controls::Saturation);\n \tif (saturation) {\n-\t\tint value = convertContrastOrSaturation(*saturation);\n+\t\tSaturationQ value = *saturation;\n \t\tif (cproc.saturation != value) {\n \t\t\tcproc.saturation = value;\n \t\t\tupdate = true;\n \t\t}\n \n-\t\tLOG(RkISP1CProc, Debug) << \"Set saturation to \" << value;\n+\t\tLOG(RkISP1CProc, Debug) << \"Set saturation to \" << value.value();\n \t}\n \n \tframeContext.cproc.brightness = cproc.brightness;\n@@ -148,9 +140,9 @@ void ColorProcessing::prepare([[maybe_unused]] IPAContext &context,\n \n \tauto config = params->block<BlockType::Cproc>();\n \tconfig.setEnabled(true);\n-\tconfig->brightness = frameContext.cproc.brightness;\n-\tconfig->contrast = frameContext.cproc.contrast;\n-\tconfig->sat = frameContext.cproc.saturation;\n+\tconfig->brightness = frameContext.cproc.brightness.quantized();\n+\tconfig->contrast = frameContext.cproc.contrast.quantized();\n+\tconfig->sat = frameContext.cproc.saturation.quantized();\n }\n \n REGISTER_IPA_ALGORITHM(ColorProcessing, \"ColorProcessing\")\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex f85a130d9c23..0a5fb2769d31 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -8,6 +8,7 @@\n \n #pragma once\n \n+#include <algorithm>\n #include <memory>\n \n #include <linux/rkisp1-config.h>\n@@ -27,11 +28,17 @@\n #include <libipa/camera_sensor_helper.h>\n #include <libipa/fc_queue.h>\n #include \"libipa/agc_mean_luminance.h\"\n+#include \"libipa/fixedpoint.h\"\n \n namespace libcamera {\n \n namespace ipa::rkisp1 {\n \n+/* Fixed point types used by CPROC */\n+using BrightnessQ = Q1_7;\n+using ContrastQ = UQ1_7;\n+using SaturationQ = UQ1_7;\n+\n struct IPAHwSettings {\n \tunsigned int numAeCells;\n \tunsigned int numHistogramBins;\n@@ -115,9 +122,9 @@ struct IPAActiveState {\n \t} ccm;\n \n \tstruct {\n-\t\tint8_t brightness;\n-\t\tuint8_t contrast;\n-\t\tuint8_t saturation;\n+\t\tBrightnessQ brightness;\n+\t\tContrastQ contrast;\n+\t\tSaturationQ saturation;\n \t} cproc;\n \n \tstruct {\n@@ -169,9 +176,10 @@ struct IPAFrameContext : public FrameContext {\n \t} awb;\n \n \tstruct {\n-\t\tint8_t brightness;\n-\t\tuint8_t contrast;\n-\t\tuint8_t saturation;\n+\t\tBrightnessQ brightness;\n+\t\tContrastQ contrast;\n+\t\tSaturationQ saturation;\n+\n \t\tbool update;\n \t} cproc;\n \n", "prefixes": [ "v2", "09/13" ] }