[libcamera-devel,v2] gstreamer: Check gstreamer version before using newer macros
diff mbox series

Message ID 20220912130509.184968-1-vedantparanjape160201@gmail.com
State Accepted
Commit 046f83e8df1ec0d58bc6ed80f71dc2ce6d8f7c58
Headers show
Series
  • [libcamera-devel,v2] gstreamer: Check gstreamer version before using newer macros
Related show

Commit Message

Vedant Paranjape Sept. 12, 2022, 1:05 p.m. UTC 
GST_VIDEO_TRANSFER_BT601 and GST_VIDEO_TRANSFER_BT2020_10 macros are
defined in GST Version 1.18.0.

Usage of these macros causes gstlibcamera compilation failure if
GST_VERSION < 1.18.0. These macros are used only if GST_VERSION >= 1.18.0.
Fix the following compilation error:

../src/gstreamer/gstlibcamera-utils.cpp:157:7: error: ‘GST_VIDEO_TRANSFER_BT601’ was not declared in this scope; did you mean ‘GST_VIDEO_TRANSFER_BT709’?
  157 |  case GST_VIDEO_TRANSFER_BT601:
      |       ^~~~~~~~~~~~~~~~~~~~~~~~
      |       GST_VIDEO_TRANSFER_BT709
../src/gstreamer/gstlibcamera-utils.cpp:159:7: error: ‘GST_VIDEO_TRANSFER_BT2020_10’ was not declared in this scope; did you mean ‘GST_VIDEO_TRANSFER_BT2020_12’?
  159 |  case GST_VIDEO_TRANSFER_BT2020_10:
      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |       GST_VIDEO_TRANSFER_BT2020_12

Signed-off-by: Vedant Paranjape <vedantparanjape160201@gmail.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
---
 src/gstreamer/gstlibcamera-utils.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Kieran Bingham Sept. 12, 2022, 2:23 p.m. UTC | #1 
Quoting Vedant Paranjape via libcamera-devel (2022-09-12 14:05:09)
> GST_VIDEO_TRANSFER_BT601 and GST_VIDEO_TRANSFER_BT2020_10 macros are
> defined in GST Version 1.18.0.
> 
> Usage of these macros causes gstlibcamera compilation failure if
> GST_VERSION < 1.18.0. These macros are used only if GST_VERSION >= 1.18.0.
> Fix the following compilation error:
> 
> ../src/gstreamer/gstlibcamera-utils.cpp:157:7: error: ‘GST_VIDEO_TRANSFER_BT601’ was not declared in this scope; did you mean ‘GST_VIDEO_TRANSFER_BT709’?
>   157 |  case GST_VIDEO_TRANSFER_BT601:
>       |       ^~~~~~~~~~~~~~~~~~~~~~~~
>       |       GST_VIDEO_TRANSFER_BT709
> ../src/gstreamer/gstlibcamera-utils.cpp:159:7: error: ‘GST_VIDEO_TRANSFER_BT2020_10’ was not declared in this scope; did you mean ‘GST_VIDEO_TRANSFER_BT2020_12’?
>   159 |  case GST_VIDEO_TRANSFER_BT2020_10:
>       |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |       GST_VIDEO_TRANSFER_BT2020_12
> 
> Signed-off-by: Vedant Paranjape <vedantparanjape160201@gmail.com>
> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>



These tags have been missed

Tested-by: Rishikesh Donadkar <rishikeshdonadkar@gmail.com>
Reviewed-by: Rishikesh Donadkar <rishikeshdonadkar@gmail.com>

And these can be added.

Fixes: fc9783acc608 ("gstreamer: Provide colorimetry <> ColorSpace mappings")
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  src/gstreamer/gstlibcamera-utils.cpp | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp
> index 4df5dd6c14fd..244a4a79845d 100644
> --- a/src/gstreamer/gstlibcamera-utils.cpp
> +++ b/src/gstreamer/gstlibcamera-utils.cpp
> @@ -154,9 +154,11 @@ colorspace_from_colorimetry(const GstVideoColorimetry &colorimetry)
>         case GST_VIDEO_TRANSFER_SRGB:
>                 colorspace->transferFunction = ColorSpace::TransferFunction::Srgb;
>                 break;
> +#if GST_CHECK_VERSION(1, 18, 0)
>         case GST_VIDEO_TRANSFER_BT601:
> -       case GST_VIDEO_TRANSFER_BT2020_12:
>         case GST_VIDEO_TRANSFER_BT2020_10:
> +#endif
> +       case GST_VIDEO_TRANSFER_BT2020_12:
>         case GST_VIDEO_TRANSFER_BT709:
>                 colorspace->transferFunction = ColorSpace::TransferFunction::Rec709;
>                 break;
> -- 
> 2.25.1
>
Laurent Pinchart Sept. 12, 2022, 2:29 p.m. UTC | #2 
Hi Vedant,

Thank you for the patch.

On Mon, Sep 12, 2022 at 06:35:09PM +0530, Vedant Paranjape via libcamera-devel wrote:
> GST_VIDEO_TRANSFER_BT601 and GST_VIDEO_TRANSFER_BT2020_10 macros are
> defined in GST Version 1.18.0.
> 
> Usage of these macros causes gstlibcamera compilation failure if
> GST_VERSION < 1.18.0. These macros are used only if GST_VERSION >= 1.18.0.
> Fix the following compilation error:
> 
> ../src/gstreamer/gstlibcamera-utils.cpp:157:7: error: ‘GST_VIDEO_TRANSFER_BT601’ was not declared in this scope; did you mean ‘GST_VIDEO_TRANSFER_BT709’?
>   157 |  case GST_VIDEO_TRANSFER_BT601:
>       |       ^~~~~~~~~~~~~~~~~~~~~~~~
>       |       GST_VIDEO_TRANSFER_BT709
> ../src/gstreamer/gstlibcamera-utils.cpp:159:7: error: ‘GST_VIDEO_TRANSFER_BT2020_10’ was not declared in this scope; did you mean ‘GST_VIDEO_TRANSFER_BT2020_12’?
>   159 |  case GST_VIDEO_TRANSFER_BT2020_10:
>       |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |       GST_VIDEO_TRANSFER_BT2020_12
> 
> Signed-off-by: Vedant Paranjape <vedantparanjape160201@gmail.com>
> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>

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

> ---
>  src/gstreamer/gstlibcamera-utils.cpp | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp
> index 4df5dd6c14fd..244a4a79845d 100644
> --- a/src/gstreamer/gstlibcamera-utils.cpp
> +++ b/src/gstreamer/gstlibcamera-utils.cpp
> @@ -154,9 +154,11 @@ colorspace_from_colorimetry(const GstVideoColorimetry &colorimetry)
>  	case GST_VIDEO_TRANSFER_SRGB:
>  		colorspace->transferFunction = ColorSpace::TransferFunction::Srgb;
>  		break;
> +#if GST_CHECK_VERSION(1, 18, 0)
>  	case GST_VIDEO_TRANSFER_BT601:
> -	case GST_VIDEO_TRANSFER_BT2020_12:
>  	case GST_VIDEO_TRANSFER_BT2020_10:
> +#endif
> +	case GST_VIDEO_TRANSFER_BT2020_12:
>  	case GST_VIDEO_TRANSFER_BT709:
>  		colorspace->transferFunction = ColorSpace::TransferFunction::Rec709;
>  		break;

Patch
diff mbox series 

diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp
index 4df5dd6c14fd..244a4a79845d 100644
--- a/src/gstreamer/gstlibcamera-utils.cpp
+++ b/src/gstreamer/gstlibcamera-utils.cpp
@@ -154,9 +154,11 @@  colorspace_from_colorimetry(const GstVideoColorimetry &colorimetry)
 	case GST_VIDEO_TRANSFER_SRGB:
 		colorspace->transferFunction = ColorSpace::TransferFunction::Srgb;
 		break;
+#if GST_CHECK_VERSION(1, 18, 0)
 	case GST_VIDEO_TRANSFER_BT601:
-	case GST_VIDEO_TRANSFER_BT2020_12:
 	case GST_VIDEO_TRANSFER_BT2020_10:
+#endif
+	case GST_VIDEO_TRANSFER_BT2020_12:
 	case GST_VIDEO_TRANSFER_BT709:
 		colorspace->transferFunction = ColorSpace::TransferFunction::Rec709;
 		break;