[libcamera-devel,2/2] src: ipa: raspberrypi: Change 'sport' exposure mode name to 'short'
diff mbox series

Message ID 20201117093205.9521-3-david.plowman@raspberrypi.com
State Accepted
Commit 666905182511153f86d041dcc501f6fc37ba793b
Headers show
Series
  • Raspberry Pi control fixes
Related show

Commit Message

David Plowman Nov. 17, 2020, 9:32 a.m. UTC 
The names have to match for the setting to work. I've chosen to go
with the libcamera terminology (even though it touches more files).

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
---
 src/ipa/raspberrypi/data/imx219.json | 2 +-
 src/ipa/raspberrypi/data/imx477.json | 2 +-
 src/ipa/raspberrypi/data/ov5647.json | 2 +-
 utils/raspberrypi/ctt/ctt.py         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Comments

Naushir Patuck Nov. 17, 2020, 11:14 a.m. UTC | #1 
Hi David,


On Tue, 17 Nov 2020 at 09:32, David Plowman <david.plowman@raspberrypi.com>
wrote:

> The names have to match for the setting to work. I've chosen to go
> with the libcamera terminology (even though it touches more files).
>
> Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
>

Reviewed-by: Naushir Patuck <naush@raspberrypi.com>


> ---
>  src/ipa/raspberrypi/data/imx219.json | 2 +-
>  src/ipa/raspberrypi/data/imx477.json | 2 +-
>  src/ipa/raspberrypi/data/ov5647.json | 2 +-
>  utils/raspberrypi/ctt/ctt.py         | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/ipa/raspberrypi/data/imx219.json
> b/src/ipa/raspberrypi/data/imx219.json
> index ce7ff36f..b03a7beb 100644
> --- a/src/ipa/raspberrypi/data/imx219.json
> +++ b/src/ipa/raspberrypi/data/imx219.json
> @@ -140,7 +140,7 @@
>                      1.0, 2.0, 4.0, 6.0, 6.0
>                  ]
>              },
> -            "sport":
> +            "short":
>              {
>                  "shutter":
>                  [
> diff --git a/src/ipa/raspberrypi/data/imx477.json
> b/src/ipa/raspberrypi/data/imx477.json
> index 73ad1ae9..12fe2f41 100644
> --- a/src/ipa/raspberrypi/data/imx477.json
> +++ b/src/ipa/raspberrypi/data/imx477.json
> @@ -140,7 +140,7 @@
>                      1.0, 2.0, 4.0, 6.0, 6.0
>                  ]
>              },
> -            "sport":
> +            "short":
>              {
>                  "shutter":
>                  [
> diff --git a/src/ipa/raspberrypi/data/ov5647.json
> b/src/ipa/raspberrypi/data/ov5647.json
> index a2469059..3d8a7c8f 100644
> --- a/src/ipa/raspberrypi/data/ov5647.json
> +++ b/src/ipa/raspberrypi/data/ov5647.json
> @@ -140,7 +140,7 @@
>                      1.0, 2.0, 4.0, 6.0, 6.0
>                  ]
>              },
> -            "sport":
> +            "short":
>              {
>                  "shutter":
>                  [
> diff --git a/utils/raspberrypi/ctt/ctt.py b/utils/raspberrypi/ctt/ctt.py
> index 30d35ae4..15064634 100755
> --- a/utils/raspberrypi/ctt/ctt.py
> +++ b/utils/raspberrypi/ctt/ctt.py
> @@ -130,7 +130,7 @@ class Camera:
>                          "shutter": [100, 10000, 30000, 60000, 120000],
>                          "gain": [1.0, 2.0, 4.0, 6.0, 6.0]
>                      },
> -                    "sport": {
> +                    "short": {
>                          "shutter": [100, 5000, 10000, 20000, 120000],
>                          "gain": [1.0, 2.0, 4.0, 6.0, 6.0]
>                      }
> --
> 2.20.1
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
>
Kieran Bingham Nov. 18, 2020, 1:17 p.m. UTC | #2 
On 17/11/2020 09:32, David Plowman wrote:
> The names have to match for the setting to work. I've chosen to go
> with the libcamera terminology (even though it touches more files).

I hope short vs sport won't be too confusing. But looking at the
exposure modes, "Normal, Short, Long, Custom" I think this is the right
choice.

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

> 
> Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
> ---
>  src/ipa/raspberrypi/data/imx219.json | 2 +-
>  src/ipa/raspberrypi/data/imx477.json | 2 +-
>  src/ipa/raspberrypi/data/ov5647.json | 2 +-
>  utils/raspberrypi/ctt/ctt.py         | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/ipa/raspberrypi/data/imx219.json b/src/ipa/raspberrypi/data/imx219.json
> index ce7ff36f..b03a7beb 100644
> --- a/src/ipa/raspberrypi/data/imx219.json
> +++ b/src/ipa/raspberrypi/data/imx219.json
> @@ -140,7 +140,7 @@
>                      1.0, 2.0, 4.0, 6.0, 6.0
>                  ]
>              },
> -            "sport":
> +            "short":
>              {
>                  "shutter":
>                  [
> diff --git a/src/ipa/raspberrypi/data/imx477.json b/src/ipa/raspberrypi/data/imx477.json
> index 73ad1ae9..12fe2f41 100644
> --- a/src/ipa/raspberrypi/data/imx477.json
> +++ b/src/ipa/raspberrypi/data/imx477.json
> @@ -140,7 +140,7 @@
>                      1.0, 2.0, 4.0, 6.0, 6.0
>                  ]
>              },
> -            "sport":
> +            "short":
>              {
>                  "shutter":
>                  [
> diff --git a/src/ipa/raspberrypi/data/ov5647.json b/src/ipa/raspberrypi/data/ov5647.json
> index a2469059..3d8a7c8f 100644
> --- a/src/ipa/raspberrypi/data/ov5647.json
> +++ b/src/ipa/raspberrypi/data/ov5647.json
> @@ -140,7 +140,7 @@
>                      1.0, 2.0, 4.0, 6.0, 6.0
>                  ]
>              },
> -            "sport":
> +            "short":
>              {
>                  "shutter":
>                  [
> diff --git a/utils/raspberrypi/ctt/ctt.py b/utils/raspberrypi/ctt/ctt.py
> index 30d35ae4..15064634 100755
> --- a/utils/raspberrypi/ctt/ctt.py
> +++ b/utils/raspberrypi/ctt/ctt.py
> @@ -130,7 +130,7 @@ class Camera:
>                          "shutter": [100, 10000, 30000, 60000, 120000],
>                          "gain": [1.0, 2.0, 4.0, 6.0, 6.0]
>                      },
> -                    "sport": {
> +                    "short": {
>                          "shutter": [100, 5000, 10000, 20000, 120000],
>                          "gain": [1.0, 2.0, 4.0, 6.0, 6.0]
>                      }
>

Patch
diff mbox series 

diff --git a/src/ipa/raspberrypi/data/imx219.json b/src/ipa/raspberrypi/data/imx219.json
index ce7ff36f..b03a7beb 100644
--- a/src/ipa/raspberrypi/data/imx219.json
+++ b/src/ipa/raspberrypi/data/imx219.json
@@ -140,7 +140,7 @@ 
                     1.0, 2.0, 4.0, 6.0, 6.0
                 ]
             },
-            "sport":
+            "short":
             {
                 "shutter":
                 [
diff --git a/src/ipa/raspberrypi/data/imx477.json b/src/ipa/raspberrypi/data/imx477.json
index 73ad1ae9..12fe2f41 100644
--- a/src/ipa/raspberrypi/data/imx477.json
+++ b/src/ipa/raspberrypi/data/imx477.json
@@ -140,7 +140,7 @@ 
                     1.0, 2.0, 4.0, 6.0, 6.0
                 ]
             },
-            "sport":
+            "short":
             {
                 "shutter":
                 [
diff --git a/src/ipa/raspberrypi/data/ov5647.json b/src/ipa/raspberrypi/data/ov5647.json
index a2469059..3d8a7c8f 100644
--- a/src/ipa/raspberrypi/data/ov5647.json
+++ b/src/ipa/raspberrypi/data/ov5647.json
@@ -140,7 +140,7 @@ 
                     1.0, 2.0, 4.0, 6.0, 6.0
                 ]
             },
-            "sport":
+            "short":
             {
                 "shutter":
                 [
diff --git a/utils/raspberrypi/ctt/ctt.py b/utils/raspberrypi/ctt/ctt.py
index 30d35ae4..15064634 100755
--- a/utils/raspberrypi/ctt/ctt.py
+++ b/utils/raspberrypi/ctt/ctt.py
@@ -130,7 +130,7 @@  class Camera:
                         "shutter": [100, 10000, 30000, 60000, 120000],
                         "gain": [1.0, 2.0, 4.0, 6.0, 6.0]
                     },
-                    "sport": {
+                    "short": {
                         "shutter": [100, 5000, 10000, 20000, 120000],
                         "gain": [1.0, 2.0, 4.0, 6.0, 6.0]
                     }