[v2,09/13] ipa: rkisp1: cproc: Convert to use Quantized types

24898 diff mbox series

Convert the Contrast and Saturuation helper functions to a Quantizer
type to support maintaining the data.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/ipa/rkisp1/algorithms/cproc.cpp | 36 +++++++++++------------------
 src/ipa/rkisp1/ipa_context.h        | 20 +++++++++++-----
 2 files changed, 28 insertions(+), 28 deletions(-)

Quoting Kieran Bingham (2025-10-29 17:24:34)
> Convert the Contrast and Saturuation helper functions to a Quantizer
> type to support maintaining the data.
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> ---
>  src/ipa/rkisp1/algorithms/cproc.cpp | 36 +++++++++++------------------
>  src/ipa/rkisp1/ipa_context.h        | 20 +++++++++++-----
>  2 files changed, 28 insertions(+), 28 deletions(-)
> 
> diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp
> index d1fff6990d37..4637a824af03 100644
> --- a/src/ipa/rkisp1/algorithms/cproc.cpp
> +++ b/src/ipa/rkisp1/algorithms/cproc.cpp
> @@ -14,6 +14,8 @@
>  
>  #include <libcamera/control_ids.h>
>  
> +#include "libipa/quantized.h"
> +
>  /**
>   * \file cproc.h
>   */
> @@ -39,16 +41,6 @@ constexpr float kDefaultBrightness = 0.0f;
>  constexpr float kDefaultContrast = 1.0f;
>  constexpr float kDefaultSaturation = 1.0f;
>  
> -int convertBrightness(const float v)
> -{
> -       return std::clamp<int>(std::lround(v * 128), -128, 127);
> -}
> -
> -int convertContrastOrSaturation(const float v)
> -{
> -       return std::clamp<int>(std::lround(v * 128), 0, 255);
> -}
> -
>  } /* namespace */
>  
>  /**
> @@ -74,9 +66,9 @@ int ColorProcessing::configure(IPAContext &context,
>  {
>         auto &cproc = context.activeState.cproc;
>  
> -       cproc.brightness = convertBrightness(kDefaultBrightness);
> -       cproc.contrast = convertContrastOrSaturation(kDefaultContrast);
> -       cproc.saturation = convertContrastOrSaturation(kDefaultSaturation);
> +       cproc.brightness = BrightnessQ(kDefaultBrightness);
> +       cproc.contrast = ContrastQ(kDefaultContrast);
> +       cproc.saturation = SaturationQ(kDefaultSaturation);
>  
>         return 0;
>  }
> @@ -97,35 +89,35 @@ void ColorProcessing::queueRequest(IPAContext &context,
>  
>         const auto &brightness = controls.get(controls::Brightness);
>         if (brightness) {
> -               int value = convertBrightness(*brightness);
> +               BrightnessQ value = *brightness;
>                 if (cproc.brightness != value) {
>                         cproc.brightness = value;
>                         update = true;
>                 }
>  
> -               LOG(RkISP1CProc, Debug) << "Set brightness to " << value;
> +               LOG(RkISP1CProc, Debug) << "Set brightness to " << value.value();
>         }
>  
>         const auto &contrast = controls.get(controls::Contrast);
>         if (contrast) {
> -               int value = convertContrastOrSaturation(*contrast);
> +               ContrastQ value = *contrast;
>                 if (cproc.contrast != value) {
>                         cproc.contrast = value;
>                         update = true;
>                 }
>  
> -               LOG(RkISP1CProc, Debug) << "Set contrast to " << value;
> +               LOG(RkISP1CProc, Debug) << "Set contrast to " << value.value();
>         }
>  
>         const auto saturation = controls.get(controls::Saturation);
>         if (saturation) {
> -               int value = convertContrastOrSaturation(*saturation);
> +               SaturationQ value = *saturation;
>                 if (cproc.saturation != value) {
>                         cproc.saturation = value;
>                         update = true;
>                 }
>  
> -               LOG(RkISP1CProc, Debug) << "Set saturation to " << value;
> +               LOG(RkISP1CProc, Debug) << "Set saturation to " << value.value();
>         }
>  
>         frameContext.cproc.brightness = cproc.brightness;
> @@ -148,9 +140,9 @@ void ColorProcessing::prepare([[maybe_unused]] IPAContext &context,
>  
>         auto config = params->block<BlockType::Cproc>();
>         config.setEnabled(true);
> -       config->brightness = frameContext.cproc.brightness;
> -       config->contrast = frameContext.cproc.contrast;
> -       config->sat = frameContext.cproc.saturation;
> +       config->brightness = frameContext.cproc.brightness.quantized();
> +       config->contrast = frameContext.cproc.contrast.quantized();
> +       config->sat = frameContext.cproc.saturation.quantized();
>  }
>  
>  REGISTER_IPA_ALGORITHM(ColorProcessing, "ColorProcessing")
> diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h
> index f85a130d9c23..0a5fb2769d31 100644
> --- a/src/ipa/rkisp1/ipa_context.h
> +++ b/src/ipa/rkisp1/ipa_context.h
> @@ -8,6 +8,7 @@
>  
>  #pragma once
>  
> +#include <algorithm>

This was from when I was adding clamps in here before I had these new
trait types - so can be removed now.

>  #include <memory>
>  
>  #include <linux/rkisp1-config.h>
> @@ -27,11 +28,17 @@
>  #include <libipa/camera_sensor_helper.h>
>  #include <libipa/fc_queue.h>
>  #include "libipa/agc_mean_luminance.h"
> +#include "libipa/fixedpoint.h"
>  
>  namespace libcamera {
>  
>  namespace ipa::rkisp1 {
>  
> +/* Fixed point types used by CPROC */
> +using BrightnessQ = Q1_7;
> +using ContrastQ = UQ1_7;
> +using SaturationQ = UQ1_7;
> +
>  struct IPAHwSettings {
>         unsigned int numAeCells;
>         unsigned int numHistogramBins;
> @@ -115,9 +122,9 @@ struct IPAActiveState {
>         } ccm;
>  
>         struct {
> -               int8_t brightness;
> -               uint8_t contrast;
> -               uint8_t saturation;
> +               BrightnessQ brightness;
> +               ContrastQ contrast;
> +               SaturationQ saturation;
>         } cproc;
>  
>         struct {
> @@ -169,9 +176,10 @@ struct IPAFrameContext : public FrameContext {
>         } awb;
>  
>         struct {
> -               int8_t brightness;
> -               uint8_t contrast;
> -               uint8_t saturation;
> +               BrightnessQ brightness;
> +               ContrastQ contrast;
> +               SaturationQ saturation;
> +
>                 bool update;
>         } cproc;
>  
> -- 
> 2.50.1
>