mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 23:48:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapidecode: caps negotiation checks

Browse source 
Check that GLUploadTexture is not negotatiated if gstreamer-vaapi is not
compiled with GL support.
This commit is contained in:
Víctor Manuel Jáquez Leal 2016-04-05 13:07:14 +02:00
parent c5c60e2a33
commit 3531dfa35e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/vaapi/gstvaapidecode.c
View file

@ -262,6 +262,12 @@ gst_vaapidecode_update_src_caps (GstVaapiDecode * decode)
if (feature == GST_VAAPI_CAPS_FEATURE_NOT_NEGOTIATED) if (feature == GST_VAAPI_CAPS_FEATURE_NOT_NEGOTIATED)
return FALSE; return FALSE;
#if (!USE_GLX && !USE_EGL)
/* This is a very pathological situation. Should not happen. */
if (feature == GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META)
return FALSE;
#endif
if ((feature == GST_VAAPI_CAPS_FEATURE_SYSTEM_MEMORY || if ((feature == GST_VAAPI_CAPS_FEATURE_SYSTEM_MEMORY ||
feature == GST_VAAPI_CAPS_FEATURE_VAAPI_SURFACE) feature == GST_VAAPI_CAPS_FEATURE_VAAPI_SURFACE)
&& format != GST_VIDEO_INFO_FORMAT (&decode->decoded_info)) { && format != GST_VIDEO_INFO_FORMAT (&decode->decoded_info)) {
@ -271,13 +277,11 @@ gst_vaapidecode_update_src_caps (GstVaapiDecode * decode)
} }
switch (feature) { switch (feature) {
#if (USE_GLX || USE_EGL)
case GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META: case GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META:
features = features =
gst_caps_features_new gst_caps_features_new
(GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, NULL); (GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, NULL);
break; break;
#endif
case GST_VAAPI_CAPS_FEATURE_VAAPI_SURFACE: case GST_VAAPI_CAPS_FEATURE_VAAPI_SURFACE:
features = features =
gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE, NULL); gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE, NULL);