diff options
| author | Paul Elder <paul.elder@ideasonboard.com> | 2024-09-13 17:47:40 +0200 |
|---|---|---|
| committer | Paul Elder <paul.elder@ideasonboard.com> | 2025-05-13 11:57:24 +0200 |
| commit | d01342f1dc0e73c04526dfcb047d48227dde8e17 (patch) | |
| tree | 9da9a5c6e2e28e67524c9bfa03b13be128b1479e | |
| parent | 37dccb4584346b53b0f39184bb3a71eed9ca8d6c (diff) | |
ipa: rkisp1: awb: Declare ControlInfo in AWB
The ControlInfo information for AwbEnable and ColourGains are 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@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
| -rw-r--r-- | src/ipa/rkisp1/algorithms/awb.cpp | 2 | ||||
| -rw-r--r-- | 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 eafe9308..8991f9cf 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 70ce0cba..1ed7d7d9 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) }, |