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

[Laurent Pinchart]

Hi Paul,

Thank you for the patch.

On Tue, May 13, 2025 at 01:58:45AM +0200, Paul Elder wrote:
> The ControlInfo information for AwbEnable and ColourGains were declared

s/were/are/

> 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>

Reviewed-by: Laurent Pinchart <laurent.pinchart 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 eafe93081..8991f9cfa 100644
> --- a/src/ipa/rkisp1/algorithms/awb.cpp
> +++ b/src/ipa/rkisp1/algorithms/awb.cpp
> @@ -90,6 +90,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);
>  
>  	if (!tuningData.contains("algorithm"))
>  		LOG(RkISP1Awb, Info) << "No AWB algorithm specified."
> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
> index 70ce0cba2..1ed7d7d92 100644
> --- a/src/ipa/rkisp1/rkisp1.cpp
> +++ b/src/ipa/rkisp1/rkisp1.cpp
> @@ -115,8 +115,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::DebugMetadataEnable, ControlInfo(false, true, false) },
>  	{ &controls::Sharpness, ControlInfo(0.0f, 10.0f, 1.0f) },
>  	{ &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) },

-- 
Regards,

Laurent Pinchart