From 0f1b1f40e5fb4bdb9cf4b42390e17dd92bdc7d78 Mon Sep 17 00:00:00 2001 From: "U. Artie Eoff" Date: Tue, 11 Feb 2020 00:38:40 -0800 Subject: [PATCH] libs: VA explicit color standard not supported until 1.2.0 VAProcColorStandardExplicit and associated VAProcColorProperties (primaries, transfer and matrix) are not supported until VA-API 1.2.0. Use VAProcColorStandardNone instead of VAProcColorStandardExplicit if VA-API < 1.2.0. Fixes #231 --- gst-libs/gst/vaapi/gstvaapifilter.c | 3 +++ gst-libs/gst/vaapi/gstvaapiutils.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/gst-libs/gst/vaapi/gstvaapifilter.c b/gst-libs/gst/vaapi/gstvaapifilter.c index 5f41726..a2f2cb8 100644 --- a/gst-libs/gst/vaapi/gstvaapifilter.c +++ b/gst-libs/gst/vaapi/gstvaapifilter.c @@ -1531,6 +1531,8 @@ fill_color_standard (GstVideoColorimetry * colorimetry, VAProcColorStandardType * type, VAProcColorProperties * properties) { *type = from_GstVideoColorimetry (colorimetry); + +#if VA_CHECK_VERSION(1,2,0) if (*type == VAProcColorStandardExplicit) { properties->colour_primaries = gst_video_color_primaries_to_iso (colorimetry->primaries); @@ -1539,6 +1541,7 @@ fill_color_standard (GstVideoColorimetry * colorimetry, properties->matrix_coefficients = gst_video_color_matrix_to_iso (colorimetry->matrix); } +#endif properties->color_range = from_GstVideoColorRange (colorimetry->range); } diff --git a/gst-libs/gst/vaapi/gstvaapiutils.c b/gst-libs/gst/vaapi/gstvaapiutils.c index 2a100ab..a3deff4 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils.c +++ b/gst-libs/gst/vaapi/gstvaapiutils.c @@ -983,7 +983,11 @@ from_GstVideoColorimetry (const GstVideoColorimetry * const colorimetry) GST_VIDEO_COLORIMETRY_SMPTE240M)) return VAProcColorStandardSMPTE240M; +#if VA_CHECK_VERSION(1,2,0) return VAProcColorStandardExplicit; +#else + return VAProcColorStandardNone; +#endif } /** -- 2.7.4