[libcamera-devel] ipa: rpi: tunings: Add missing short and long exposure profiles
diff mbox series

Message ID 20230607114807.18897-1-naush@raspberrypi.com
State Accepted
Commit c6ff999053cef89813d6b2f4601b9ec5d2590167
Headers show
Series
  • [libcamera-devel] ipa: rpi: tunings: Add missing short and long exposure profiles
Related show

Commit Message

Naushir Patuck June 7, 2023, 11:48 a.m. UTC 
Some sensor tuning files were missing the short and/or long exposure
mode profiles. Add the missing items to the relevant files.

As a drive-by, rename the "sport" exposure profile to "short" for the
IMX290 tuning.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/ipa/rpi/vc4/data/imx290.json           |  7 ++++++-
 src/ipa/rpi/vc4/data/imx296.json           |  5 +++++
 src/ipa/rpi/vc4/data/imx296_mono.json      |  5 +++++
 src/ipa/rpi/vc4/data/imx378.json           |  5 +++++
 src/ipa/rpi/vc4/data/imx519.json           |  5 +++++
 src/ipa/rpi/vc4/data/imx708.json           |  5 +++++
 src/ipa/rpi/vc4/data/imx708_noir.json      |  5 +++++
 src/ipa/rpi/vc4/data/imx708_wide.json      |  5 +++++
 src/ipa/rpi/vc4/data/imx708_wide_noir.json |  5 +++++
 src/ipa/rpi/vc4/data/ov9281_mono.json      | 10 ++++++++++
 src/ipa/rpi/vc4/data/se327m12.json         |  5 +++++
 src/ipa/rpi/vc4/data/uncalibrated.json     | 10 ++++++++++
 12 files changed, 71 insertions(+), 1 deletion(-)

Comments

Laurent Pinchart June 7, 2023, 2:57 p.m. UTC | #1 
Hi Naush,

Thank you for the patch.

On Wed, Jun 07, 2023 at 12:48:07PM +0100, Naushir Patuck via libcamera-devel wrote:
> Some sensor tuning files were missing the short and/or long exposure
> mode profiles. Add the missing items to the relevant files.
> 
> As a drive-by, rename the "sport" exposure profile to "short" for the
> IMX290 tuning.
> 
> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

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

> ---
>  src/ipa/rpi/vc4/data/imx290.json           |  7 ++++++-
>  src/ipa/rpi/vc4/data/imx296.json           |  5 +++++
>  src/ipa/rpi/vc4/data/imx296_mono.json      |  5 +++++
>  src/ipa/rpi/vc4/data/imx378.json           |  5 +++++
>  src/ipa/rpi/vc4/data/imx519.json           |  5 +++++
>  src/ipa/rpi/vc4/data/imx708.json           |  5 +++++
>  src/ipa/rpi/vc4/data/imx708_noir.json      |  5 +++++
>  src/ipa/rpi/vc4/data/imx708_wide.json      |  5 +++++
>  src/ipa/rpi/vc4/data/imx708_wide_noir.json |  5 +++++
>  src/ipa/rpi/vc4/data/ov9281_mono.json      | 10 ++++++++++
>  src/ipa/rpi/vc4/data/se327m12.json         |  5 +++++
>  src/ipa/rpi/vc4/data/uncalibrated.json     | 10 ++++++++++
>  12 files changed, 71 insertions(+), 1 deletion(-)
> 
> diff --git a/src/ipa/rpi/vc4/data/imx290.json b/src/ipa/rpi/vc4/data/imx290.json
> index ace68d0ebf1c..8a7cadba38a2 100644
> --- a/src/ipa/rpi/vc4/data/imx290.json
> +++ b/src/ipa/rpi/vc4/data/imx290.json
> @@ -70,10 +70,15 @@
>                          "shutter": [ 10, 30000, 60000 ],
>                          "gain": [ 1.0, 2.0, 8.0 ]
>                      },
> -                    "sport":
> +                    "short":
>                      {
>                          "shutter": [ 10, 5000, 10000, 20000, 120000 ],
>                          "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/imx296.json b/src/ipa/rpi/vc4/data/imx296.json
> index ae8722c46a85..9330d0a9c81f 100644
> --- a/src/ipa/rpi/vc4/data/imx296.json
> +++ b/src/ipa/rpi/vc4/data/imx296.json
> @@ -157,6 +157,11 @@
>                      {
>                          "shutter": [ 100, 5000, 10000, 20000, 30000 ],
>                          "gain": [ 1.0, 2.0, 4.0, 8.0, 16.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/imx296_mono.json b/src/ipa/rpi/vc4/data/imx296_mono.json
> index db020550d70e..955af43cccff 100644
> --- a/src/ipa/rpi/vc4/data/imx296_mono.json
> +++ b/src/ipa/rpi/vc4/data/imx296_mono.json
> @@ -60,6 +60,11 @@
>                      {
>                          "shutter": [ 100, 5000, 10000, 20000, 120000 ],
>                          "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/imx378.json b/src/ipa/rpi/vc4/data/imx378.json
> index 8b4ed22504b5..f7b68011b634 100644
> --- a/src/ipa/rpi/vc4/data/imx378.json
> +++ b/src/ipa/rpi/vc4/data/imx378.json
> @@ -155,6 +155,11 @@
>                      {
>                          "shutter": [ 100, 5000, 10000, 20000, 120000 ],
>                          "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/imx519.json b/src/ipa/rpi/vc4/data/imx519.json
> index 8ccfd3a631ff..1b0a77476aab 100644
> --- a/src/ipa/rpi/vc4/data/imx519.json
> +++ b/src/ipa/rpi/vc4/data/imx519.json
> @@ -155,6 +155,11 @@
>                      {
>                          "shutter": [ 100, 5000, 10000, 20000, 120000 ],
>                          "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/imx708.json b/src/ipa/rpi/vc4/data/imx708.json
> index b9830a3bf692..6b26d0a19609 100644
> --- a/src/ipa/rpi/vc4/data/imx708.json
> +++ b/src/ipa/rpi/vc4/data/imx708.json
> @@ -165,6 +165,11 @@
>                      {
>                          "shutter": [ 100, 5000, 10000, 20000, 120000 ],
>                          "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/imx708_noir.json b/src/ipa/rpi/vc4/data/imx708_noir.json
> index 075f70355cec..8d498153833b 100644
> --- a/src/ipa/rpi/vc4/data/imx708_noir.json
> +++ b/src/ipa/rpi/vc4/data/imx708_noir.json
> @@ -165,6 +165,11 @@
>                      {
>                          "shutter": [ 100, 5000, 10000, 20000, 120000 ],
>                          "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/imx708_wide.json b/src/ipa/rpi/vc4/data/imx708_wide.json
> index b772efee3b96..14bc918e7823 100644
> --- a/src/ipa/rpi/vc4/data/imx708_wide.json
> +++ b/src/ipa/rpi/vc4/data/imx708_wide.json
> @@ -155,6 +155,11 @@
>                      {
>                          "shutter": [ 100, 5000, 10000, 20000, 120000 ],
>                          "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/imx708_wide_noir.json b/src/ipa/rpi/vc4/data/imx708_wide_noir.json
> index c5f6b53dca7a..49442c0f9d81 100644
> --- a/src/ipa/rpi/vc4/data/imx708_wide_noir.json
> +++ b/src/ipa/rpi/vc4/data/imx708_wide_noir.json
> @@ -155,6 +155,11 @@
>                      {
>                          "shutter": [ 100, 5000, 10000, 20000, 120000 ],
>                          "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/ov9281_mono.json b/src/ipa/rpi/vc4/data/ov9281_mono.json
> index 37944c63ad92..2b7292ec7e20 100644
> --- a/src/ipa/rpi/vc4/data/ov9281_mono.json
> +++ b/src/ipa/rpi/vc4/data/ov9281_mono.json
> @@ -44,6 +44,16 @@
>                      {
>                          "shutter": [ 100, 15000, 30000, 60000, 120000 ],
>                          "gain": [ 1.0, 2.0, 3.0, 4.0, 8.0 ]
> +                    },
> +                    "short":
> +                    {
> +                        "shutter": [ 100, 5000, 10000, 20000, 30000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/se327m12.json b/src/ipa/rpi/vc4/data/se327m12.json
> index ee69caea50c0..8552ed92bce6 100644
> --- a/src/ipa/rpi/vc4/data/se327m12.json
> +++ b/src/ipa/rpi/vc4/data/se327m12.json
> @@ -155,6 +155,11 @@
>                      {
>                          "shutter": [ 100, 5000, 10000, 20000, 120000 ],
>                          "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":
> diff --git a/src/ipa/rpi/vc4/data/uncalibrated.json b/src/ipa/rpi/vc4/data/uncalibrated.json
> index 13eb3f177302..7654defa6dfe 100644
> --- a/src/ipa/rpi/vc4/data/uncalibrated.json
> +++ b/src/ipa/rpi/vc4/data/uncalibrated.json
> @@ -31,6 +31,16 @@
>                      {
>                          "shutter": [ 100, 15000, 30000, 60000, 120000 ],
>                          "gain": [ 1.0, 2.0, 3.0, 4.0, 6.0 ]
> +                    },
> +                    "short":
> +                    {
> +                        "shutter": [ 100, 5000, 10000, 20000, 30000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
> +                    },
> +                    "long":
> +                    {
> +                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
> +                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
>                      }
>                  },
>                  "constraint_modes":

Patch
diff mbox series 

diff --git a/src/ipa/rpi/vc4/data/imx290.json b/src/ipa/rpi/vc4/data/imx290.json
index ace68d0ebf1c..8a7cadba38a2 100644
--- a/src/ipa/rpi/vc4/data/imx290.json
+++ b/src/ipa/rpi/vc4/data/imx290.json
@@ -70,10 +70,15 @@ 
                         "shutter": [ 10, 30000, 60000 ],
                         "gain": [ 1.0, 2.0, 8.0 ]
                     },
-                    "sport":
+                    "short":
                     {
                         "shutter": [ 10, 5000, 10000, 20000, 120000 ],
                         "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/imx296.json b/src/ipa/rpi/vc4/data/imx296.json
index ae8722c46a85..9330d0a9c81f 100644
--- a/src/ipa/rpi/vc4/data/imx296.json
+++ b/src/ipa/rpi/vc4/data/imx296.json
@@ -157,6 +157,11 @@ 
                     {
                         "shutter": [ 100, 5000, 10000, 20000, 30000 ],
                         "gain": [ 1.0, 2.0, 4.0, 8.0, 16.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/imx296_mono.json b/src/ipa/rpi/vc4/data/imx296_mono.json
index db020550d70e..955af43cccff 100644
--- a/src/ipa/rpi/vc4/data/imx296_mono.json
+++ b/src/ipa/rpi/vc4/data/imx296_mono.json
@@ -60,6 +60,11 @@ 
                     {
                         "shutter": [ 100, 5000, 10000, 20000, 120000 ],
                         "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/imx378.json b/src/ipa/rpi/vc4/data/imx378.json
index 8b4ed22504b5..f7b68011b634 100644
--- a/src/ipa/rpi/vc4/data/imx378.json
+++ b/src/ipa/rpi/vc4/data/imx378.json
@@ -155,6 +155,11 @@ 
                     {
                         "shutter": [ 100, 5000, 10000, 20000, 120000 ],
                         "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/imx519.json b/src/ipa/rpi/vc4/data/imx519.json
index 8ccfd3a631ff..1b0a77476aab 100644
--- a/src/ipa/rpi/vc4/data/imx519.json
+++ b/src/ipa/rpi/vc4/data/imx519.json
@@ -155,6 +155,11 @@ 
                     {
                         "shutter": [ 100, 5000, 10000, 20000, 120000 ],
                         "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/imx708.json b/src/ipa/rpi/vc4/data/imx708.json
index b9830a3bf692..6b26d0a19609 100644
--- a/src/ipa/rpi/vc4/data/imx708.json
+++ b/src/ipa/rpi/vc4/data/imx708.json
@@ -165,6 +165,11 @@ 
                     {
                         "shutter": [ 100, 5000, 10000, 20000, 120000 ],
                         "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/imx708_noir.json b/src/ipa/rpi/vc4/data/imx708_noir.json
index 075f70355cec..8d498153833b 100644
--- a/src/ipa/rpi/vc4/data/imx708_noir.json
+++ b/src/ipa/rpi/vc4/data/imx708_noir.json
@@ -165,6 +165,11 @@ 
                     {
                         "shutter": [ 100, 5000, 10000, 20000, 120000 ],
                         "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/imx708_wide.json b/src/ipa/rpi/vc4/data/imx708_wide.json
index b772efee3b96..14bc918e7823 100644
--- a/src/ipa/rpi/vc4/data/imx708_wide.json
+++ b/src/ipa/rpi/vc4/data/imx708_wide.json
@@ -155,6 +155,11 @@ 
                     {
                         "shutter": [ 100, 5000, 10000, 20000, 120000 ],
                         "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/imx708_wide_noir.json b/src/ipa/rpi/vc4/data/imx708_wide_noir.json
index c5f6b53dca7a..49442c0f9d81 100644
--- a/src/ipa/rpi/vc4/data/imx708_wide_noir.json
+++ b/src/ipa/rpi/vc4/data/imx708_wide_noir.json
@@ -155,6 +155,11 @@ 
                     {
                         "shutter": [ 100, 5000, 10000, 20000, 120000 ],
                         "gain": [ 1.0, 2.0, 4.0, 6.0, 6.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/ov9281_mono.json b/src/ipa/rpi/vc4/data/ov9281_mono.json
index 37944c63ad92..2b7292ec7e20 100644
--- a/src/ipa/rpi/vc4/data/ov9281_mono.json
+++ b/src/ipa/rpi/vc4/data/ov9281_mono.json
@@ -44,6 +44,16 @@ 
                     {
                         "shutter": [ 100, 15000, 30000, 60000, 120000 ],
                         "gain": [ 1.0, 2.0, 3.0, 4.0, 8.0 ]
+                    },
+                    "short":
+                    {
+                        "shutter": [ 100, 5000, 10000, 20000, 30000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/se327m12.json b/src/ipa/rpi/vc4/data/se327m12.json
index ee69caea50c0..8552ed92bce6 100644
--- a/src/ipa/rpi/vc4/data/se327m12.json
+++ b/src/ipa/rpi/vc4/data/se327m12.json
@@ -155,6 +155,11 @@ 
                     {
                         "shutter": [ 100, 5000, 10000, 20000, 120000 ],
                         "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":
diff --git a/src/ipa/rpi/vc4/data/uncalibrated.json b/src/ipa/rpi/vc4/data/uncalibrated.json
index 13eb3f177302..7654defa6dfe 100644
--- a/src/ipa/rpi/vc4/data/uncalibrated.json
+++ b/src/ipa/rpi/vc4/data/uncalibrated.json
@@ -31,6 +31,16 @@ 
                     {
                         "shutter": [ 100, 15000, 30000, 60000, 120000 ],
                         "gain": [ 1.0, 2.0, 3.0, 4.0, 6.0 ]
+                    },
+                    "short":
+                    {
+                        "shutter": [ 100, 5000, 10000, 20000, 30000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 8.0 ]
+                    },
+                    "long":
+                    {
+                        "shutter": [ 1000, 30000, 60000, 90000, 120000 ],
+                        "gain": [ 1.0, 2.0, 4.0, 6.0, 12.0 ]
                     }
                 },
                 "constraint_modes":