[PATCH] ipa: rkisp1: awb: Declare ControlInfo in AWB

[Kieran Bingham]

Quoting Paul Elder (2024-09-13 16:47:40)
> The ControlInfo information for AwbEnable and ColourGains were declared
> and exposed in the top-level IPA. These should instead be exposed by the
> AWB part of the IPA, as it doesn't make sense to support these controls
> when AWB is disabled, for example.
> 
> Move the declaration of these controls out of the top-level IPA and into
> AWB.
> 
> Signed-off-by: Paul Elder <paul.elder at ideasonboard.com>

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

> ---
>  src/ipa/rkisp1/algorithms/awb.cpp | 2 ++
>  src/ipa/rkisp1/rkisp1.cpp         | 2 --
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp
> index edd36ef47..13247762f 100644
> --- a/src/ipa/rkisp1/algorithms/awb.cpp
> +++ b/src/ipa/rkisp1/algorithms/awb.cpp
> @@ -52,6 +52,8 @@ int Awb::init(IPAContext &context, const YamlObject &tuningData)
>         cmap[&controls::ColourTemperature] = ControlInfo(kMinColourTemperature,
>                                                          kMaxColourTemperature,
>                                                          kDefaultColourTemperature);
> +       cmap[&controls::AwbEnable] = ControlInfo(false, true);
> +       cmap[&controls::ColourGains] = ControlInfo(0.0f, 3.996f, 1.0f);
>  
>         MatrixInterpolator<double, 2, 1> gains;
>         int ret = gains.readYaml(tuningData["gains"], "ct", "gains");
> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
> index 56541190a..a20b83c98 100644
> --- a/src/ipa/rkisp1/rkisp1.cpp
> +++ b/src/ipa/rkisp1/rkisp1.cpp
> @@ -116,8 +116,6 @@ const IPAHwSettings ipaHwSettingsV12{
>  
>  /* List of controls handled by the RkISP1 IPA */
>  const ControlInfoMap::Map rkisp1Controls{
> -       { &controls::AwbEnable, ControlInfo(false, true) },
> -       { &controls::ColourGains, ControlInfo(0.0f, 3.996f, 1.0f) },
>         { &controls::Sharpness, ControlInfo(0.0f, 10.0f, 1.0f) },
>         { &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) },
>  };
> -- 
> 2.39.2
>