[libcamera-devel] ipa: raspberrypi: awb: Fix typo in AWB mode conversion table
diff mbox series

Message ID 20220317150327.14073-1-david.plowman@raspberrypi.com
State Accepted
Commit b9b5e776f60ba5e679d744315df63378e2067dd4
Headers show
Series
  • [libcamera-devel] ipa: raspberrypi: awb: Fix typo in AWB mode conversion table
Related show

Commit Message

David Plowman March 17, 2022, 3:03 p.m. UTC
The AwbAuto mode is defined in all the JSON tuning files as "auto",
not "normal". The effect of this was that you couldn't switch back to
"auto" mode once you had switched away.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
---
 src/ipa/raspberrypi/raspberrypi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nicolas Dufresne via libcamera-devel March 17, 2022, 4:53 p.m. UTC | #1
Quoting David Plowman via libcamera-devel (2022-03-17 15:03:27)
> The AwbAuto mode is defined in all the JSON tuning files as "auto",
> not "normal". The effect of this was that you couldn't switch back to
> "auto" mode once you had switched away.
> 
> Signed-off-by: David Plowman <david.plowman@raspberrypi.com>

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

> ---
>  src/ipa/raspberrypi/raspberrypi.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
> index fd8fecb0..1bf4e270 100644
> --- a/src/ipa/raspberrypi/raspberrypi.cpp
> +++ b/src/ipa/raspberrypi/raspberrypi.cpp
> @@ -604,7 +604,7 @@ static const std::map<int32_t, std::string> ExposureModeTable = {
>  };
>  
>  static const std::map<int32_t, std::string> AwbModeTable = {
> -       { controls::AwbAuto, "normal" },
> +       { controls::AwbAuto, "auto" },
>         { controls::AwbIncandescent, "incandescent" },
>         { controls::AwbTungsten, "tungsten" },
>         { controls::AwbFluorescent, "fluorescent" },
> -- 
> 2.30.2
>
Laurent Pinchart March 22, 2022, 11:18 p.m. UTC | #2
Hi David,

Thank you for the patch.

On Thu, Mar 17, 2022 at 03:03:27PM +0000, David Plowman via libcamera-devel wrote:
> The AwbAuto mode is defined in all the JSON tuning files as "auto",
> not "normal". The effect of this was that you couldn't switch back to
> "auto" mode once you had switched away.
> 
> Signed-off-by: David Plowman <david.plowman@raspberrypi.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  src/ipa/raspberrypi/raspberrypi.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
> index fd8fecb0..1bf4e270 100644
> --- a/src/ipa/raspberrypi/raspberrypi.cpp
> +++ b/src/ipa/raspberrypi/raspberrypi.cpp
> @@ -604,7 +604,7 @@ static const std::map<int32_t, std::string> ExposureModeTable = {
>  };
>  
>  static const std::map<int32_t, std::string> AwbModeTable = {
> -	{ controls::AwbAuto, "normal" },
> +	{ controls::AwbAuto, "auto" },
>  	{ controls::AwbIncandescent, "incandescent" },
>  	{ controls::AwbTungsten, "tungsten" },
>  	{ controls::AwbFluorescent, "fluorescent" },

Patch
diff mbox series

diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index fd8fecb0..1bf4e270 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -604,7 +604,7 @@  static const std::map<int32_t, std::string> ExposureModeTable = {
 };
 
 static const std::map<int32_t, std::string> AwbModeTable = {
-	{ controls::AwbAuto, "normal" },
+	{ controls::AwbAuto, "auto" },
 	{ controls::AwbIncandescent, "incandescent" },
 	{ controls::AwbTungsten, "tungsten" },
 	{ controls::AwbFluorescent, "fluorescent" },