[{"id":37910,"web_url":"https://patchwork.libcamera.org/comment/37910/","msgid":"<176917767282.302817.4972468035199597613@localhost>","date":"2026-01-23T14:14:32","subject":"Re: [PATCH v6 09/16] ipa: rkisp1: cproc: Provide a Hue control","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nQuoting Kieran Bingham (2026-01-21 18:37:28)\n> The RKISP1 supports a configurable Hue as part of the colour processing\n> unit (cproc).\n> \n> Implement the new control converting to the hardware scale accordingly\n> and report the applied control in the completed request metadata.\n> \n> This is implemented as a phase shift of the chrominance values between\n> -90 and +87.188 degrees according to the datasheet however the type\n> itself would imply that this is a range between -90 and 89.2969.\n> \n> Moreover, the hardware applies the inverse phase shift to the operation\n> expected and documented by libcamera, so we apply a negative scale when\n> converting the libcamera control to the Q<1,7> type, resulting in a\n> range of -89.2969 to +90.0 degrees control.\n> \n> Reviewed-by: Isaac Scott \n> Tested-by: Barnabás Pőcze \n> Signed-off-by: Kieran Bingham \n> \n> ---\n> \n> v5:\n> - Use Q<1, 7> directly and handle scaling in cproc.cpp\n> - Use full string of quantized in debug log\n> - Invert/Negate the hardware hue direction\n> \n> Signed-off-by: Kieran Bingham \n> ---\n> src/ipa/rkisp1/algorithms/cproc.cpp | 28 ++++++++++++++++++++++++++++\n> src/ipa/rkisp1/ipa_context.h | 3 +++\n> 2 files changed, 31 insertions(+)\n> \n> diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\n> index e9e2b5444bc9..7484e4780094 100644\n> --- a/src/ipa/rkisp1/algorithms/cproc.cpp\n> +++ b/src/ipa/rkisp1/algorithms/cproc.cpp\n> @@ -37,8 +37,15 @@ namespace {\n> \n> constexpr float kDefaultBrightness = 0.0f;\n> constexpr float kDefaultContrast = 1.0f;\n> +constexpr float kDefaultHue = 0.0f;\n> constexpr float kDefaultSaturation = 1.0f;\n> \n> +/*\n> + * The Hue scale is negated as the hardware performs the opposite phase shift\n> + * to what is expected and defined from the libcamera Hue control value.\n> + */\n> +constexpr float kHueScale = -90.0f;\n> +\n> } /* namespace */\n> \n> /**\n> @@ -53,6 +60,11 @@ int ColorProcessing::init(IPAContext &context,\n> cmap[&controls::Contrast] = ControlInfo(0.0f, 1.993f, kDefaultContrast);\n> cmap[&controls::Saturation] = ControlInfo(0.0f, 1.993f, kDefaultSaturation);\n> \n> + /* Hue adjustment is negated by kHueScale, min/max are swapped */\n> + cmap[&controls::Hue] = ControlInfo(HueQ::TraitsType::max * kHueScale,\n> + HueQ::TraitsType::min * kHueScale,\n> + kDefaultHue);\n> +\n> return 0;\n> }\n> \n> @@ -66,6 +78,7 @@ int ColorProcessing::configure(IPAContext &context,\n> \n> cproc.brightness = BrightnessQ(kDefaultBrightness);\n> cproc.contrast = ContrastQ(kDefaultContrast);\n> + cproc.hue = HueQ(kDefaultHue);\n> cproc.saturation = SaturationQ(kDefaultSaturation);\n> \n> return 0;\n> @@ -107,6 +120,18 @@ void ColorProcessing::queueRequest(IPAContext &context,\n> LOG(RkISP1CProc, Debug) << \"Set contrast to \" << value;\n> }\n> \n> + const auto &hue = controls.get(controls::Hue);\n> + if (hue) {\n> + /* Scale the Hue from ]-90, +90] */\n> + HueQ value = *hue / kHueScale;\n\nHere the Quantized type really makes things way easier...\n\n> + if (cproc.hue != value) {\n> + cproc.hue = value;\n> + update = true;\n> + }\n> +\n> + LOG(RkISP1CProc, Debug) << \"Set hue to \" << value;\n> + }\n> +\n> const auto saturation = controls.get(controls::Saturation);\n> if (saturation) {\n> SaturationQ value = *saturation;\n> @@ -120,6 +145,7 @@ void ColorProcessing::queueRequest(IPAContext &context,\n> \n> frameContext.cproc.brightness = cproc.brightness;\n> frameContext.cproc.contrast = cproc.contrast;\n> + frameContext.cproc.hue = cproc.hue;\n> frameContext.cproc.saturation = cproc.saturation;\n> frameContext.cproc.update = update;\n> }\n> @@ -140,6 +166,7 @@ void ColorProcessing::prepare([[maybe_unused]] IPAContext &context,\n> config.setEnabled(true);\n> config->brightness = frameContext.cproc.brightness.quantized();\n> config->contrast = frameContext.cproc.contrast.quantized();\n> + config->hue = frameContext.cproc.hue.quantized();\n> config->sat = frameContext.cproc.saturation.quantized();\n> }\n> \n> @@ -154,6 +181,7 @@ void ColorProcessing::process([[maybe_unused]] IPAContext &context,\n> {\n> metadata.set(controls::Brightness, frameContext.cproc.brightness.value());\n> metadata.set(controls::Contrast, frameContext.cproc.contrast.value());\n> + metadata.set(controls::Hue, frameContext.cproc.hue.value() * kHueScale);\n\nI just realize that you now carry the kHueScale all over. This is\nbasically a similar problem like mapping float gains to sensor gain\nvalues. So in theory you could create specialized quantized traits that\ninclude the kHueScale. So maybe at some point we have a generalized\nScaledFixedPointQTraits... :-)\n\nWait this is interesting I need to write it...\n\ntemplate\nstruct ScaledQTraits {\n using QuantizedType = typename T::QuantizedType;\n\tstatic constexpr QuantizedType qMin = T::qMin;\n\tstatic constexpr QuantizedType qMax = T::qMax;\n\n\tstatic constexpr float toFloat(QuantizedType q)\n\t{\n\t\treturn T::toFloat(q) * S;\n\t}\n\n\tstatic constexpr float min = toFloat(qMin);\n\tstatic constexpr float max = toFloat(qMax);\n\n\tstatic QuantizedType fromFloat(float v)\n\t{\n\t\treturn T::fromFloat(v / S);\n\t}\n};\n\nusing HueQ = Quantized >>;\n\n\n\n... but requires C++-20 to compile due to the float template arg.\n\nReviewed-by: Stefan Klug \n\nCheers,\nStefan\n\n> metadata.set(controls::Saturation, frameContext.cproc.saturation.value());\n> }\n> \n> diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\n> index cdb9a17b5adc..80b035044cda 100644\n> --- a/src/ipa/rkisp1/ipa_context.h\n> +++ b/src/ipa/rkisp1/ipa_context.h\n> @@ -36,6 +36,7 @@ namespace ipa::rkisp1 {\n> /* Fixed point types used by CPROC */\n> using BrightnessQ = Q<1, 7>;\n> using ContrastQ = UQ<1, 7>;\n> +using HueQ = Q<1, 7>;\n> using SaturationQ = UQ<1, 7>;\n> \n> struct IPAHwSettings {\n> @@ -123,6 +124,7 @@ struct IPAActiveState {\n> struct {\n> BrightnessQ brightness;\n> ContrastQ contrast;\n> + HueQ hue;\n> SaturationQ saturation;\n> } cproc;\n> \n> @@ -181,6 +183,7 @@ struct IPAFrameContext : public FrameContext {\n> struct {\n> BrightnessQ brightness;\n> ContrastQ contrast;\n> + HueQ hue;\n> SaturationQ saturation;\n> \n> bool update;\n> -- \n> 2.52.0\n>","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 D9F7EBDCBF\n\tfor ;\n\tFri, 23 Jan 2026 14:14:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D944261FC9;\n\tFri, 23 Jan 2026 15:14:37 +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 6E9D1615B2\n\tfor ;\n\tFri, 23 Jan 2026 15:14:35 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:1d92:9f27:5dd1:dc89])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 0D3F81752; \n\tFri, 23 Jan 2026 15:14:02 +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=\"c6Lnp46P\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769177642;\n\tbh=iDt2UxWV1LZhYnwRYfwR1PZj9gZkVHRm8MuaeZudaVw=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=c6Lnp46Pqmw51p8BpR1uLLTNT+AFel9428s4ZxHQ0ruzPNMDWAowkhgiRaZMXUDBB\n\tLWwYDKkUDifQG59tDkG6CX8Gwz8pgiN1tw44ruauJYisSBkAy6YguFlTK343TNQlLb\n\t9ZhKoMTLLFQ/6r8sjnRoGIk3PaDObwbHpBKm5b5E=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20260121173737.376113-10-kieran.bingham@ideasonboard.com>","References":"<20260121173737.376113-1-kieran.bingham@ideasonboard.com>\n\t<20260121173737.376113-10-kieran.bingham@ideasonboard.com>","Subject":"Re: [PATCH v6 09/16] ipa: rkisp1: cproc: Provide a Hue control","From":"Stefan Klug ","Cc":"Kieran Bingham , Isaac Scott\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t","To":"Kieran Bingham ,\n\tlibcamera devel ","Date":"Fri, 23 Jan 2026 15:14:32 +0100","Message-ID":"<176917767282.302817.4972468035199597613@localhost>","User-Agent":"alot/0.12.dev8+g2c003385c862.d20250602","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\" "}},{"id":37919,"web_url":"https://patchwork.libcamera.org/comment/37919/","msgid":"<176918185721.1693075.3820109084860322213@ping.linuxembedded.co.uk>","date":"2026-01-23T15:24:17","subject":"Re: [PATCH v6 09/16] ipa: rkisp1: cproc: Provide a Hue control","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Stefan Klug (2026-01-23 14:14:32)\n> Hi Kieran,\n> \n> Thank you for the patch.\n> \n> Quoting Kieran Bingham (2026-01-21 18:37:28)\n> > The RKISP1 supports a configurable Hue as part of the colour processing\n> > unit (cproc).\n> > \n> > Implement the new control converting to the hardware scale accordingly\n> > and report the applied control in the completed request metadata.\n> > \n> > This is implemented as a phase shift of the chrominance values between\n> > -90 and +87.188 degrees according to the datasheet however the type\n> > itself would imply that this is a range between -90 and 89.2969.\n> > \n> > Moreover, the hardware applies the inverse phase shift to the operation\n> > expected and documented by libcamera, so we apply a negative scale when\n> > converting the libcamera control to the Q<1,7> type, resulting in a\n> > range of -89.2969 to +90.0 degrees control.\n> > \n> > Reviewed-by: Isaac Scott \n> > Tested-by: Barnabás Pőcze \n> > Signed-off-by: Kieran Bingham \n> > \n> > ---\n> > \n> > v5:\n> > - Use Q<1, 7> directly and handle scaling in cproc.cpp\n> > - Use full string of quantized in debug log\n> > - Invert/Negate the hardware hue direction\n> > \n> > Signed-off-by: Kieran Bingham \n> > ---\n> > src/ipa/rkisp1/algorithms/cproc.cpp | 28 ++++++++++++++++++++++++++++\n> > src/ipa/rkisp1/ipa_context.h | 3 +++\n> > 2 files changed, 31 insertions(+)\n> > \n> > diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\n> > index e9e2b5444bc9..7484e4780094 100644\n> > --- a/src/ipa/rkisp1/algorithms/cproc.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/cproc.cpp\n> > @@ -37,8 +37,15 @@ namespace {\n> > \n> > constexpr float kDefaultBrightness = 0.0f;\n> > constexpr float kDefaultContrast = 1.0f;\n> > +constexpr float kDefaultHue = 0.0f;\n> > constexpr float kDefaultSaturation = 1.0f;\n> > \n> > +/*\n> > + * The Hue scale is negated as the hardware performs the opposite phase shift\n> > + * to what is expected and defined from the libcamera Hue control value.\n> > + */\n> > +constexpr float kHueScale = -90.0f;\n> > +\n> > } /* namespace */\n> > \n> > /**\n> > @@ -53,6 +60,11 @@ int ColorProcessing::init(IPAContext &context,\n> > cmap[&controls::Contrast] = ControlInfo(0.0f, 1.993f, kDefaultContrast);\n> > cmap[&controls::Saturation] = ControlInfo(0.0f, 1.993f, kDefaultSaturation);\n> > \n> > + /* Hue adjustment is negated by kHueScale, min/max are swapped */\n> > + cmap[&controls::Hue] = ControlInfo(HueQ::TraitsType::max * kHueScale,\n> > + HueQ::TraitsType::min * kHueScale,\n> > + kDefaultHue);\n> > +\n> > return 0;\n> > }\n> > \n> > @@ -66,6 +78,7 @@ int ColorProcessing::configure(IPAContext &context,\n> > \n> > cproc.brightness = BrightnessQ(kDefaultBrightness);\n> > cproc.contrast = ContrastQ(kDefaultContrast);\n> > + cproc.hue = HueQ(kDefaultHue);\n> > cproc.saturation = SaturationQ(kDefaultSaturation);\n> > \n> > return 0;\n> > @@ -107,6 +120,18 @@ void ColorProcessing::queueRequest(IPAContext &context,\n> > LOG(RkISP1CProc, Debug) << \"Set contrast to \" << value;\n> > }\n> > \n> > + const auto &hue = controls.get(controls::Hue);\n> > + if (hue) {\n> > + /* Scale the Hue from ]-90, +90] */\n> > + HueQ value = *hue / kHueScale;\n> \n> Here the Quantized type really makes things way easier...\n> \n> > + if (cproc.hue != value) {\n> > + cproc.hue = value;\n> > + update = true;\n> > + }\n> > +\n> > + LOG(RkISP1CProc, Debug) << \"Set hue to \" << value;\n> > + }\n> > +\n> > const auto saturation = controls.get(controls::Saturation);\n> > if (saturation) {\n> > SaturationQ value = *saturation;\n> > @@ -120,6 +145,7 @@ void ColorProcessing::queueRequest(IPAContext &context,\n> > \n> > frameContext.cproc.brightness = cproc.brightness;\n> > frameContext.cproc.contrast = cproc.contrast;\n> > + frameContext.cproc.hue = cproc.hue;\n> > frameContext.cproc.saturation = cproc.saturation;\n> > frameContext.cproc.update = update;\n> > }\n> > @@ -140,6 +166,7 @@ void ColorProcessing::prepare([[maybe_unused]] IPAContext &context,\n> > config.setEnabled(true);\n> > config->brightness = frameContext.cproc.brightness.quantized();\n> > config->contrast = frameContext.cproc.contrast.quantized();\n> > + config->hue = frameContext.cproc.hue.quantized();\n> > config->sat = frameContext.cproc.saturation.quantized();\n> > }\n> > \n> > @@ -154,6 +181,7 @@ void ColorProcessing::process([[maybe_unused]] IPAContext &context,\n> > {\n> > metadata.set(controls::Brightness, frameContext.cproc.brightness.value());\n> > metadata.set(controls::Contrast, frameContext.cproc.contrast.value());\n> > + metadata.set(controls::Hue, frameContext.cproc.hue.value() * kHueScale);\n> \n> I just realize that you now carry the kHueScale all over. This is\n> basically a similar problem like mapping float gains to sensor gain\n> values. So in theory you could create specialized quantized traits that\n> include the kHueScale. So maybe at some point we have a generalized\n> ScaledFixedPointQTraits... :-)\n> \n> Wait this is interesting I need to write it...\n> \n> template\n> struct ScaledQTraits {\n> using QuantizedType = typename T::QuantizedType;\n> static constexpr QuantizedType qMin = T::qMin;\n> static constexpr QuantizedType qMax = T::qMax;\n> \n> static constexpr float toFloat(QuantizedType q)\n> {\n> return T::toFloat(q) * S;\n> }\n> \n> static constexpr float min = toFloat(qMin);\n> static constexpr float max = toFloat(qMax);\n> \n> static QuantizedType fromFloat(float v)\n> {\n> return T::fromFloat(v / S);\n> }\n> };\n> \n> using HueQ = Quantized >>;\n> \n\nYes, I implemented this already (without float scales) - but Laurent\nasked me to remove it:\n\n[v4,10/21] ipa: libipa: fixedpoint: Provide a ScaledFixedPoint type\n - https://patchwork.libcamera.org/patch/25040/\n[v4,11/21] test: libipa: Provide ScaledFixedPoint tests\n - https://patchwork.libcamera.org/patch/25041/\n\nusing HueQ = Quantized>;\n - https://patchwork.libcamera.org/patch/25045/\n\n\n> ... but requires C++-20 to compile due to the float template arg.\n\nPerhaps a future optimisation after we move to C++20 if there's other\nusers of scaled types.\n\n\n> Reviewed-by: Stefan Klug \n\nThanks\n\nKieran\n\n> \n> Cheers,\n> Stefan\n> \n> > metadata.set(controls::Saturation, frameContext.cproc.saturation.value());\n> > }\n> > \n> > diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\n> > index cdb9a17b5adc..80b035044cda 100644\n> > --- a/src/ipa/rkisp1/ipa_context.h\n> > +++ b/src/ipa/rkisp1/ipa_context.h\n> > @@ -36,6 +36,7 @@ namespace ipa::rkisp1 {\n> > /* Fixed point types used by CPROC */\n> > using BrightnessQ = Q<1, 7>;\n> > using ContrastQ = UQ<1, 7>;\n> > +using HueQ = Q<1, 7>;\n> > using SaturationQ = UQ<1, 7>;\n> > \n> > struct IPAHwSettings {\n> > @@ -123,6 +124,7 @@ struct IPAActiveState {\n> > struct {\n> > BrightnessQ brightness;\n> > ContrastQ contrast;\n> > + HueQ hue;\n> > SaturationQ saturation;\n> > } cproc;\n> > \n> > @@ -181,6 +183,7 @@ struct IPAFrameContext : public FrameContext {\n> > struct {\n> > BrightnessQ brightness;\n> > ContrastQ contrast;\n> > + HueQ hue;\n> > SaturationQ saturation;\n> > \n> > bool update;\n> > -- \n> > 2.52.0\n> >","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 9F848BDCBF\n\tfor ;\n\tFri, 23 Jan 2026 15:24:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 09A4D61FBB;\n\tFri, 23 Jan 2026 16:24:21 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B151B615B2\n\tfor ;\n\tFri, 23 Jan 2026 16:24:19 +0100 (CET)","from pendragon.ideasonboard.com\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 460529CE;\n\tFri, 23 Jan 2026 16:23:46 +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=\"jUO+EeYO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769181826;\n\tbh=pAGGplTdJwh/XJvAlVkSNdh8ovHR/GkXIb9DpTnDKAQ=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=jUO+EeYOrbxR+MeTDeUrXusHDzO8hp2vp1mD+xgXLllVaVAa4LqJj7B9+dI1ra1g5\n\t0CC9LMy6V/pnFMLzTY5dUGigClgW8w3C55txKGyfS5EaCFB7uwXW7YX40A85Jy1iX2\n\t1phivNOgm5gHgzai+8oYQwgIp3z/LLXXqE60IzuA=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<176917767282.302817.4972468035199597613@localhost>","References":"<20260121173737.376113-1-kieran.bingham@ideasonboard.com>\n\t<20260121173737.376113-10-kieran.bingham@ideasonboard.com>\n\t<176917767282.302817.4972468035199597613@localhost>","Subject":"Re: [PATCH v6 09/16] ipa: rkisp1: cproc: Provide a Hue control","From":"Kieran Bingham ","Cc":"Isaac Scott , =?utf-8?q?Barnab=C3=A1s_P?=\n\t=?utf-8?b?xZFjemU=?= ","To":"Stefan Klug ,\n\tlibcamera devel ","Date":"Fri, 23 Jan 2026 15:24:17 +0000","Message-ID":"<176918185721.1693075.3820109084860322213@ping.linuxembedded.co.uk>","User-Agent":"alot/0.9.1","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\" "}}]