mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstglcolorconvert: relax caps features check

Browse source 
Require caps to have the GST_CAPS_FEATURE_MEMORY_GL_MEMORY feature but allow
them to have more features.
This commit is contained in:
Alessandro Decina 2015-01-22 13:11:46 +11:00 committed by Tim-Philipp Müller
parent 66cec1c47a
commit 5c81a68eb1
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/gl/gstglcolorconvert.c
View file

@ -550,7 +550,7 @@ _gst_gl_color_convert_set_caps_unlocked (GstGLColorConvert * convert,
GstCaps * in_caps, GstCaps * out_caps) GstCaps * in_caps, GstCaps * out_caps)
{ {
GstVideoInfo in_info, out_info; GstVideoInfo in_info, out_info;
GstCapsFeatures *in_features, *out_features, *gl_features; GstCapsFeatures *in_features, *out_features;
g_return_val_if_fail (convert != NULL, FALSE); g_return_val_if_fail (convert != NULL, FALSE);
g_return_val_if_fail (in_caps, FALSE); g_return_val_if_fail (in_caps, FALSE);
@ -571,19 +571,16 @@ _gst_gl_color_convert_set_caps_unlocked (GstGLColorConvert * convert,
g_return_val_if_fail (GST_VIDEO_INFO_FORMAT (&out_info) != g_return_val_if_fail (GST_VIDEO_INFO_FORMAT (&out_info) !=
GST_VIDEO_FORMAT_ENCODED, FALSE); GST_VIDEO_FORMAT_ENCODED, FALSE);
gl_features =
gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY);
in_features = gst_caps_get_features (in_caps, 0); in_features = gst_caps_get_features (in_caps, 0);
out_features = gst_caps_get_features (out_caps, 0); out_features = gst_caps_get_features (out_caps, 0);
if (!gst_caps_features_is_equal (in_features, gl_features) if (!gst_caps_features_contains (in_features,
|| !gst_caps_features_is_equal (out_features, gl_features)) { GST_CAPS_FEATURE_MEMORY_GL_MEMORY)
gst_caps_features_free (gl_features); || !gst_caps_features_contains (out_features,
GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) {
return FALSE; return FALSE;
} }
gst_caps_features_free (gl_features);
if (gst_video_info_is_equal (&convert->in_info, &in_info) && if (gst_video_info_is_equal (&convert->in_info, &in_info) &&
gst_video_info_is_equal (&convert->out_info, &out_info)) gst_video_info_is_equal (&convert->out_info, &out_info))
return TRUE; return TRUE;