[libcamera-devel,1/2] ipa: rkisp1: Use YAML 1.1 for tuning data files
diff mbox series

Message ID 20220804132112.17604-2-laurent.pinchart@ideasonboard.com
State Accepted
Commit a55f9c34a7dd1eb3c009f1810d77d440d5d8aedc
Headers show
Series
  • Use YAML 1.1 for the time being
Related show

Commit Message

Laurent Pinchart Aug. 4, 2022, 1:21 p.m. UTC
YAML 1.2 support has been added in libyaml in version 0.2.3. Debian
stable ships version 0.2.2 of libyaml, which causes parse errors of the
tuning tuning data files due to the YAML 1.2 directive at the beginning.
As we don't use any feature of YAML 1.2, downgrade the data files to
YAML 1.1.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/ipa/rkisp1/data/imx219.yaml       | 2 +-
 src/ipa/rkisp1/data/ov5640.yaml       | 2 +-
 src/ipa/rkisp1/data/uncalibrated.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Florian Sylvestre Aug. 4, 2022, 2:14 p.m. UTC | #1
On Thu, 4 Aug 2022 at 15:21, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>
> YAML 1.2 support has been added in libyaml in version 0.2.3. Debian
> stable ships version 0.2.2 of libyaml, which causes parse errors of the
> tuning tuning data files due to the YAML 1.2 directive at the beginning.
> As we don't use any feature of YAML 1.2, downgrade the data files to
> YAML 1.1.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  src/ipa/rkisp1/data/imx219.yaml       | 2 +-
>  src/ipa/rkisp1/data/ov5640.yaml       | 2 +-
>  src/ipa/rkisp1/data/uncalibrated.yaml | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/ipa/rkisp1/data/imx219.yaml b/src/ipa/rkisp1/data/imx219.yaml
> index 232d8ae8d58b..ce3d547f780c 100644
> --- a/src/ipa/rkisp1/data/imx219.yaml
> +++ b/src/ipa/rkisp1/data/imx219.yaml
> @@ -1,5 +1,5 @@
>  # SPDX-License-Identifier: CC0-1.0
> -%YAML 1.2
> +%YAML 1.1
>  ---
>  version: 1
>  algorithms:
> diff --git a/src/ipa/rkisp1/data/ov5640.yaml b/src/ipa/rkisp1/data/ov5640.yaml
> index 93d7d1e709d3..45d4bb77f8ca 100644
> --- a/src/ipa/rkisp1/data/ov5640.yaml
> +++ b/src/ipa/rkisp1/data/ov5640.yaml
> @@ -1,5 +1,5 @@
>  # SPDX-License-Identifier: CC0-1.0
> -%YAML 1.2
> +%YAML 1.1
>  ---
>  version: 1
>  algorithms:
> diff --git a/src/ipa/rkisp1/data/uncalibrated.yaml b/src/ipa/rkisp1/data/uncalibrated.yaml
> index bdbd5fda7eaf..a7bbd8d84263 100644
> --- a/src/ipa/rkisp1/data/uncalibrated.yaml
> +++ b/src/ipa/rkisp1/data/uncalibrated.yaml
> @@ -1,5 +1,5 @@
>  # SPDX-License-Identifier: CC0-1.0
> -%YAML 1.2
> +%YAML 1.1
>  ---
>  version: 1
>  algorithms:
> --
> Regards,
>
> Laurent Pinchart
>
Reviewed-by: Florian Sylvestre <fsylvestre@baylibre.com>
Kieran Bingham Aug. 4, 2022, 2:57 p.m. UTC | #2
Quoting Laurent Pinchart via libcamera-devel (2022-08-04 14:21:11)
> YAML 1.2 support has been added in libyaml in version 0.2.3. Debian
> stable ships version 0.2.2 of libyaml, which causes parse errors of the
> tuning tuning data files due to the YAML 1.2 directive at the beginning.
> As we don't use any feature of YAML 1.2, downgrade the data files to
> YAML 1.1.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

This fixes my issues too. (albeit not in these files).

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

> ---
>  src/ipa/rkisp1/data/imx219.yaml       | 2 +-
>  src/ipa/rkisp1/data/ov5640.yaml       | 2 +-
>  src/ipa/rkisp1/data/uncalibrated.yaml | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/ipa/rkisp1/data/imx219.yaml b/src/ipa/rkisp1/data/imx219.yaml
> index 232d8ae8d58b..ce3d547f780c 100644
> --- a/src/ipa/rkisp1/data/imx219.yaml
> +++ b/src/ipa/rkisp1/data/imx219.yaml
> @@ -1,5 +1,5 @@
>  # SPDX-License-Identifier: CC0-1.0
> -%YAML 1.2
> +%YAML 1.1
>  ---
>  version: 1
>  algorithms:
> diff --git a/src/ipa/rkisp1/data/ov5640.yaml b/src/ipa/rkisp1/data/ov5640.yaml
> index 93d7d1e709d3..45d4bb77f8ca 100644
> --- a/src/ipa/rkisp1/data/ov5640.yaml
> +++ b/src/ipa/rkisp1/data/ov5640.yaml
> @@ -1,5 +1,5 @@
>  # SPDX-License-Identifier: CC0-1.0
> -%YAML 1.2
> +%YAML 1.1
>  ---
>  version: 1
>  algorithms:
> diff --git a/src/ipa/rkisp1/data/uncalibrated.yaml b/src/ipa/rkisp1/data/uncalibrated.yaml
> index bdbd5fda7eaf..a7bbd8d84263 100644
> --- a/src/ipa/rkisp1/data/uncalibrated.yaml
> +++ b/src/ipa/rkisp1/data/uncalibrated.yaml
> @@ -1,5 +1,5 @@
>  # SPDX-License-Identifier: CC0-1.0
> -%YAML 1.2
> +%YAML 1.1
>  ---
>  version: 1
>  algorithms:
> -- 
> Regards,
> 
> Laurent Pinchart
>

Patch
diff mbox series

diff --git a/src/ipa/rkisp1/data/imx219.yaml b/src/ipa/rkisp1/data/imx219.yaml
index 232d8ae8d58b..ce3d547f780c 100644
--- a/src/ipa/rkisp1/data/imx219.yaml
+++ b/src/ipa/rkisp1/data/imx219.yaml
@@ -1,5 +1,5 @@ 
 # SPDX-License-Identifier: CC0-1.0
-%YAML 1.2
+%YAML 1.1
 ---
 version: 1
 algorithms:
diff --git a/src/ipa/rkisp1/data/ov5640.yaml b/src/ipa/rkisp1/data/ov5640.yaml
index 93d7d1e709d3..45d4bb77f8ca 100644
--- a/src/ipa/rkisp1/data/ov5640.yaml
+++ b/src/ipa/rkisp1/data/ov5640.yaml
@@ -1,5 +1,5 @@ 
 # SPDX-License-Identifier: CC0-1.0
-%YAML 1.2
+%YAML 1.1
 ---
 version: 1
 algorithms:
diff --git a/src/ipa/rkisp1/data/uncalibrated.yaml b/src/ipa/rkisp1/data/uncalibrated.yaml
index bdbd5fda7eaf..a7bbd8d84263 100644
--- a/src/ipa/rkisp1/data/uncalibrated.yaml
+++ b/src/ipa/rkisp1/data/uncalibrated.yaml
@@ -1,5 +1,5 @@ 
 # SPDX-License-Identifier: CC0-1.0
-%YAML 1.2
+%YAML 1.1
 ---
 version: 1
 algorithms: