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

[Kieran Bingham]

Quoting Kieran Bingham (2024-09-13 16:54:00)
> 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>

But it fails to apply. Maybe it needs rebasing?

./send-for-testing.sh 4590
git -C libcamera fetch --prune libcamera.org
git -C libcamera fetch --prune gl.fdo
git -C libcamera am --quit
fatal: Resolve operation not in progress, we are not resuming.
git -C libcamera reset --hard
HEAD is now at 7852d1bf0495 libcamera: debayer_cpu: Sync DMABUFs
git -C libcamera switch --detach
HEAD is now at 7852d1bf0495 libcamera: debayer_cpu: Sync DMABUFs
git -C libcamera checkout libcamera.org/master
Previous HEAD position was 7852d1bf0495 libcamera: debayer_cpu: Sync DMABUFs
HEAD is now at 66c9b157e95b libcamera: pipeline: simple: Use MediaLink string helper
Preparing patchwork/4590
git -C libcamera show-ref --verify --quiet refs/heads/patchwork/4590
git -C libcamera checkout -b patchwork/4590
Switched to a new branch 'patchwork/4590'
git -C libcamera pw series apply 4590 -s
Applying: ipa: rkisp1: awb: Declare ControlInfo in AWB
error: sha1 information is lacking or useless (src/ipa/rkisp1/algorithms/awb.cpp).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ipa: rkisp1: awb: Declare ControlInfo in AWB
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


--
Kieran

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