ipa: rpi: awb_nn: Rename YamlObject to ValueNode
diff mbox series

Message ID 20260424164029.3373853-1-laurent.pinchart@ideasonboard.com
State New
Headers show
Series
  • ipa: rpi: awb_nn: Rename YamlObject to ValueNode
Related show

Commit Message

Laurent Pinchart April 24, 2026, 4:40 p.m. UTC 
The global rename of YamlObject to ValueNode in commit 554c5c7fa174
missed awb_nn.cpp. Fix it.

Fixes: 554c5c7fa174 ("libcamera: Rename YamlObject to ValueNode")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/ipa/rpi/controller/rpi/awb_nn.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


base-commit: 7227dd4b4013f0e24584b4d370154c7e55a0a384

Comments

Barnabás Pőcze April 24, 2026, 4:55 p.m. UTC | #1 
2026. 04. 24. 18:40 keltezéssel, Laurent Pinchart írta:
> The global rename of YamlObject to ValueNode in commit 554c5c7fa174
> missed awb_nn.cpp. Fix it.
> 
> Fixes: 554c5c7fa174 ("libcamera: Rename YamlObject to ValueNode")
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---

$ rg YamlObject | wc -l
4


Looks ok to me.

Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>


>   src/ipa/rpi/controller/rpi/awb_nn.cpp | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/ipa/rpi/controller/rpi/awb_nn.cpp b/src/ipa/rpi/controller/rpi/awb_nn.cpp
> index c382f63d5f21..6543d8cb9b69 100644
> --- a/src/ipa/rpi/controller/rpi/awb_nn.cpp
> +++ b/src/ipa/rpi/controller/rpi/awb_nn.cpp
> @@ -47,7 +47,7 @@ namespace RPiController {
>   
>   struct AwbNNConfig {
>   	AwbNNConfig() = default;
> -	int read(const libcamera::YamlObject &params, AwbConfig &config);
> +	int read(const libcamera::ValueNode &params, AwbConfig &config);
>   
>   	/* An empty model will check default locations for model.tflite */
>   	std::string model;
> @@ -67,7 +67,7 @@ public:
>   	~AwbNN();
>   	char const *name() const override;
>   	void initialise() override;
> -	int read(const libcamera::YamlObject &params) override;
> +	int read(const libcamera::ValueNode &params) override;
>   
>   protected:
>   	void doAwb() override;
> @@ -86,7 +86,7 @@ private:
>   	std::unique_ptr<tflite::Interpreter> interpreter_;
>   };
>   
> -int AwbNNConfig::read(const libcamera::YamlObject &params, AwbConfig &config)
> +int AwbNNConfig::read(const libcamera::ValueNode &params, AwbConfig &config)
>   {
>   	model = params["model"].get<std::string>("");
>   	minTemp = params["min_temp"].get<float>(2800.0);
> @@ -146,7 +146,7 @@ char const *AwbNN::name() const
>   	return NAME;
>   }
>   
> -int AwbNN::read(const libcamera::YamlObject &params)
> +int AwbNN::read(const libcamera::ValueNode &params)
>   {
>   	int ret;
>   
> 
> base-commit: 7227dd4b4013f0e24584b4d370154c7e55a0a384
Kieran Bingham April 24, 2026, 5:36 p.m. UTC | #2 
Quoting Barnabás Pőcze (2026-04-24 17:55:38)
> 2026. 04. 24. 18:40 keltezéssel, Laurent Pinchart írta:
> > The global rename of YamlObject to ValueNode in commit 554c5c7fa174
> > missed awb_nn.cpp. Fix it.
> > 
> > Fixes: 554c5c7fa174 ("libcamera: Rename YamlObject to ValueNode")
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> 
> $ rg YamlObject | wc -l
> 4

gg YamlObject
src/ipa/rpi/controller/rpi/awb_nn.cpp:  int read(const libcamera::YamlObject &params, AwbConfig &config);
src/ipa/rpi/controller/rpi/awb_nn.cpp:  int read(const libcamera::YamlObject &params) override;
src/ipa/rpi/controller/rpi/awb_nn.cpp:int AwbNNConfig::read(const libcamera::YamlObject &params, AwbConfig &config)
src/ipa/rpi/controller/rpi/awb_nn.cpp:int AwbNN::read(const libcamera::YamlObject &params)

Aha I see, yes and indeed these match this patch so:


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

> 
> 
> Looks ok to me.
> 
> Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> 
> 
> >   src/ipa/rpi/controller/rpi/awb_nn.cpp | 8 ++++----
> >   1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/src/ipa/rpi/controller/rpi/awb_nn.cpp b/src/ipa/rpi/controller/rpi/awb_nn.cpp
> > index c382f63d5f21..6543d8cb9b69 100644
> > --- a/src/ipa/rpi/controller/rpi/awb_nn.cpp
> > +++ b/src/ipa/rpi/controller/rpi/awb_nn.cpp
> > @@ -47,7 +47,7 @@ namespace RPiController {
> >   
> >   struct AwbNNConfig {
> >       AwbNNConfig() = default;
> > -     int read(const libcamera::YamlObject &params, AwbConfig &config);
> > +     int read(const libcamera::ValueNode &params, AwbConfig &config);
> >   
> >       /* An empty model will check default locations for model.tflite */
> >       std::string model;
> > @@ -67,7 +67,7 @@ public:
> >       ~AwbNN();
> >       char const *name() const override;
> >       void initialise() override;
> > -     int read(const libcamera::YamlObject &params) override;
> > +     int read(const libcamera::ValueNode &params) override;
> >   
> >   protected:
> >       void doAwb() override;
> > @@ -86,7 +86,7 @@ private:
> >       std::unique_ptr<tflite::Interpreter> interpreter_;
> >   };
> >   
> > -int AwbNNConfig::read(const libcamera::YamlObject &params, AwbConfig &config)
> > +int AwbNNConfig::read(const libcamera::ValueNode &params, AwbConfig &config)
> >   {
> >       model = params["model"].get<std::string>("");
> >       minTemp = params["min_temp"].get<float>(2800.0);
> > @@ -146,7 +146,7 @@ char const *AwbNN::name() const
> >       return NAME;
> >   }
> >   
> > -int AwbNN::read(const libcamera::YamlObject &params)
> > +int AwbNN::read(const libcamera::ValueNode &params)
> >   {
> >       int ret;
> >   
> > 
> > base-commit: 7227dd4b4013f0e24584b4d370154c7e55a0a384
>
Laurent Pinchart April 24, 2026, 7:40 p.m. UTC | #3 
On Fri, Apr 24, 2026 at 06:36:14PM +0100, Kieran Bingham wrote:
> Quoting Barnabás Pőcze (2026-04-24 17:55:38)
> > 2026. 04. 24. 18:40 keltezéssel, Laurent Pinchart írta:
> > > The global rename of YamlObject to ValueNode in commit 554c5c7fa174
> > > missed awb_nn.cpp. Fix it.
> > > 
> > > Fixes: 554c5c7fa174 ("libcamera: Rename YamlObject to ValueNode")
> > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > ---
> > 
> > $ rg YamlObject | wc -l
> > 4
> 
> gg YamlObject
> src/ipa/rpi/controller/rpi/awb_nn.cpp:  int read(const libcamera::YamlObject &params, AwbConfig &config);
> src/ipa/rpi/controller/rpi/awb_nn.cpp:  int read(const libcamera::YamlObject &params) override;
> src/ipa/rpi/controller/rpi/awb_nn.cpp:int AwbNNConfig::read(const libcamera::YamlObject &params, AwbConfig &config)
> src/ipa/rpi/controller/rpi/awb_nn.cpp:int AwbNN::read(const libcamera::YamlObject &params)
> 
> Aha I see, yes and indeed these match this patch so:
> 
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

I have merged the fix.

The breakage went unnoticed because we don't compile awb_nn.cpp in CI.
Fixing this is not straightforward as it depends on tensorflow-lite,
which is not packaged for Debian yet (there's an ongoing attempt to
package it for the next version, see
https://tracker.debian.org/pkg/tensorflow).

Naush, I'd like to extend CI coverage to avoid similar breakages in the
future. I assume Raspberry Pi has a tensorflow Debian package, how
difficult would it be to build and install it as part of the container
build step in the libcamera CI ?

> > Looks ok to me.
> > 
> > Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> > 
> > >   src/ipa/rpi/controller/rpi/awb_nn.cpp | 8 ++++----
> > >   1 file changed, 4 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/src/ipa/rpi/controller/rpi/awb_nn.cpp b/src/ipa/rpi/controller/rpi/awb_nn.cpp
> > > index c382f63d5f21..6543d8cb9b69 100644
> > > --- a/src/ipa/rpi/controller/rpi/awb_nn.cpp
> > > +++ b/src/ipa/rpi/controller/rpi/awb_nn.cpp
> > > @@ -47,7 +47,7 @@ namespace RPiController {
> > >   
> > >   struct AwbNNConfig {
> > >       AwbNNConfig() = default;
> > > -     int read(const libcamera::YamlObject &params, AwbConfig &config);
> > > +     int read(const libcamera::ValueNode &params, AwbConfig &config);
> > >   
> > >       /* An empty model will check default locations for model.tflite */
> > >       std::string model;
> > > @@ -67,7 +67,7 @@ public:
> > >       ~AwbNN();
> > >       char const *name() const override;
> > >       void initialise() override;
> > > -     int read(const libcamera::YamlObject &params) override;
> > > +     int read(const libcamera::ValueNode &params) override;
> > >   
> > >   protected:
> > >       void doAwb() override;
> > > @@ -86,7 +86,7 @@ private:
> > >       std::unique_ptr<tflite::Interpreter> interpreter_;
> > >   };
> > >   
> > > -int AwbNNConfig::read(const libcamera::YamlObject &params, AwbConfig &config)
> > > +int AwbNNConfig::read(const libcamera::ValueNode &params, AwbConfig &config)
> > >   {
> > >       model = params["model"].get<std::string>("");
> > >       minTemp = params["min_temp"].get<float>(2800.0);
> > > @@ -146,7 +146,7 @@ char const *AwbNN::name() const
> > >       return NAME;
> > >   }
> > >   
> > > -int AwbNN::read(const libcamera::YamlObject &params)
> > > +int AwbNN::read(const libcamera::ValueNode &params)
> > >   {
> > >       int ret;
> > >   
> > > 
> > > base-commit: 7227dd4b4013f0e24584b4d370154c7e55a0a384

Patch
diff mbox series 

diff --git a/src/ipa/rpi/controller/rpi/awb_nn.cpp b/src/ipa/rpi/controller/rpi/awb_nn.cpp
index c382f63d5f21..6543d8cb9b69 100644
--- a/src/ipa/rpi/controller/rpi/awb_nn.cpp
+++ b/src/ipa/rpi/controller/rpi/awb_nn.cpp
@@ -47,7 +47,7 @@  namespace RPiController {
 
 struct AwbNNConfig {
 	AwbNNConfig() = default;
-	int read(const libcamera::YamlObject &params, AwbConfig &config);
+	int read(const libcamera::ValueNode &params, AwbConfig &config);
 
 	/* An empty model will check default locations for model.tflite */
 	std::string model;
@@ -67,7 +67,7 @@  public:
 	~AwbNN();
 	char const *name() const override;
 	void initialise() override;
-	int read(const libcamera::YamlObject &params) override;
+	int read(const libcamera::ValueNode &params) override;
 
 protected:
 	void doAwb() override;
@@ -86,7 +86,7 @@  private:
 	std::unique_ptr<tflite::Interpreter> interpreter_;
 };
 
-int AwbNNConfig::read(const libcamera::YamlObject &params, AwbConfig &config)
+int AwbNNConfig::read(const libcamera::ValueNode &params, AwbConfig &config)
 {
 	model = params["model"].get<std::string>("");
 	minTemp = params["min_temp"].get<float>(2800.0);
@@ -146,7 +146,7 @@  char const *AwbNN::name() const
 	return NAME;
 }
 
-int AwbNN::read(const libcamera::YamlObject &params)
+int AwbNN::read(const libcamera::ValueNode &params)
 {
 	int ret;