[PATCH v3 3/6] ipa: rkisp1: Use centralised libipa helpers

[Kieran Bingham]

Quoting Daniel Scally (2024-11-15 07:46:25)
> Use the centralised libipa helpers instead of open-coding common
> functions.
> 
> Reviewed-by: Jacopo Mondi <jacopo.mondi at ideasonboard.com>
> Signed-off-by: Daniel Scally <dan.scally at ideasonboard.com>
> ---
> Changes in v3:
> 
>         - None
> 
> Changes in v2:
> 
>         - Dropped the ipa:: prefix for function calls
> 
>  src/ipa/rkisp1/algorithms/awb.cpp | 18 ++----------------
>  src/ipa/rkisp1/algorithms/awb.h   |  2 --
>  2 files changed, 2 insertions(+), 18 deletions(-)
> 
> diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp
> index b3c00bef..5c1d9511 100644
> --- a/src/ipa/rkisp1/algorithms/awb.cpp
> +++ b/src/ipa/rkisp1/algorithms/awb.cpp
> @@ -16,6 +16,8 @@
>  
>  #include <libcamera/ipa/core_ipa_interface.h>
>  
> +#include "libipa/colours.h"
> +


Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

>  /**
>   * \file awb.h
>   */
> @@ -178,22 +180,6 @@ void Awb::prepare(IPAContext &context, const uint32_t frame,
>         }
>  }
>  
> -uint32_t Awb::estimateCCT(double red, double green, double blue)
> -{
> -       /* Convert the RGB values to CIE tristimulus values (XYZ) */
> -       double X = (-0.14282) * (red) + (1.54924) * (green) + (-0.95641) * (blue);
> -       double Y = (-0.32466) * (red) + (1.57837) * (green) + (-0.73191) * (blue);
> -       double Z = (-0.68202) * (red) + (0.77073) * (green) + (0.56332) * (blue);
> -
> -       /* Calculate the normalized chromaticity values */
> -       double x = X / (X + Y + Z);
> -       double y = Y / (X + Y + Z);
> -
> -       /* Calculate CCT */
> -       double n = (x - 0.3320) / (0.1858 - y);
> -       return 449 * n * n * n + 3525 * n * n + 6823.3 * n + 5520.33;
> -}
> -
>  /**
>   * \copydoc libcamera::ipa::Algorithm::process
>   */
> diff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h
> index b3b2c0bb..6ac3a5c3 100644
> --- a/src/ipa/rkisp1/algorithms/awb.h
> +++ b/src/ipa/rkisp1/algorithms/awb.h
> @@ -32,8 +32,6 @@ public:
>                      ControlList &metadata) override;
>  
>  private:
> -       uint32_t estimateCCT(double red, double green, double blue);
> -
>         bool rgbMode_;
>  };
>  
> -- 
> 2.30.2
>