{"id":25023,"url":"https://patchwork.libcamera.org/api/patches/25023/?format=json","web_url":"https://patchwork.libcamera.org/patch/25023/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20251113122450.287633-11-kieran.bingham@ideasonboard.com>","date":"2025-11-13T12:24:45","name":"[v3,10/14] ipa: rkisp1: cproc: Convert to use Quantized types","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"90af4b82cf471cd1e36f7f8d34d2498f229ccc58","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25023/mbox/","series":[{"id":5587,"url":"https://patchwork.libcamera.org/api/series/5587/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5587","date":"2025-11-13T12:24:35","name":"libipa: Introduce a Quantized type","version":3,"mbox":"https://patchwork.libcamera.org/series/5587/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25023/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25023/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 6EF16C3332\n\tfor ;\n\tThu, 13 Nov 2025 12:25:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C4BAB60AA7;\n\tThu, 13 Nov 2025 13:25:10 +0100 (CET)","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 B5B4F60A86\n\tfor ;\n\tThu, 13 Nov 2025 13:24:56 +0100 (CET)","from Monstersaurus.infra.iob\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 961D718E5;\n\tThu, 13 Nov 2025 13:22:56 +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=\"X1dSNkFn\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1763036576;\n\tbh=tOzT49dSGZ7G2AxQMk+mpFikZ/5ugamSEPhrnaLKO24=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=X1dSNkFn6mUWwNXRcIBy1Zp+rVLNznUV1vpN/MJGcVZ0VKxmAx9dFetKahQtmOY7r\n\tAnnsYd9g3nKPMsKmJJwUFAJotHrL3n6HxmlX2ARI+5Q1MEKmS3XbIMuO5EdnDkEduf\n\teWpjtdI5v/UmbeQFTG1ENSgQmvHcKHkUQjRnSF2Q=","From":"Kieran Bingham ","To":"libcamera devel ","Cc":"Kieran Bingham ","Subject":"[PATCH v3 10/14] ipa: rkisp1: cproc: Convert to use Quantized types","Date":"Thu, 13 Nov 2025 12:24:45 +0000","Message-ID":"<20251113122450.287633-11-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20251113122450.287633-1-kieran.bingham@ideasonboard.com>","References":"<20251113122450.287633-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":"","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":"Convert the Contrast and Saturuation helper functions to a Quantizer\ntype to support maintaining the data.\n\nSigned-off-by: Kieran Bingham \n\n---\nv3:\n\n- Don't add into ipa_context.h anymore\n\n src/ipa/rkisp1/algorithms/cproc.cpp | 36 +++++++++++------------------\n src/ipa/rkisp1/ipa_context.h | 19 ++++++++++-----\n 2 files changed, 27 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 \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(std::lround(v * 128), -128, 127);\n-}\n-\n-int convertContrastOrSaturation(const float v)\n-{\n-\treturn std::clamp(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();\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..651558bdf42d 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -27,11 +27,17 @@\n #include \n #include \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 +121,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 +175,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":["v3","10/14"]}