mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 15:56:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

glfilter: prefer passthrough for non-sysmem caps

Browse source
This commit is contained in:
Matthew Waters 2014-06-25 21:50:40 +10:00
parent 7797b15de7
commit a2bd2ce83b
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst-libs/gst/gl/gstglfilter.c
View file

@ -728,10 +728,6 @@ gst_gl_filter_transform_caps (GstBaseTransform * bt,
{ {
GstCaps *tmp = NULL; GstCaps *tmp = NULL;
GstCaps *result = NULL; GstCaps *result = NULL;
tmp = gst_caps_new_empty ();
if (direction == GST_PAD_SINK) {
GstCaps *glcaps = gst_gl_filter_set_caps_features (caps, GstCaps *glcaps = gst_gl_filter_set_caps_features (caps,
GST_CAPS_FEATURE_MEMORY_GL_MEMORY); GST_CAPS_FEATURE_MEMORY_GL_MEMORY);
#if GST_GL_HAVE_PLATFORM_EGL #if GST_GL_HAVE_PLATFORM_EGL
@ -740,13 +736,18 @@ gst_gl_filter_transform_caps (GstBaseTransform * bt,
#endif #endif
GstCaps *uploadcaps = gst_gl_filter_set_caps_features (caps, GstCaps *uploadcaps = gst_gl_filter_set_caps_features (caps,
GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META); GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META);
GstCaps *raw_caps =
gst_caps_from_string (GST_VIDEO_CAPS_MAKE (GST_GL_COLOR_CONVERT_FORMATS));
GstCapsFeatures *f;
tmp = gst_caps_new_empty ();
tmp = gst_caps_merge (tmp, glcaps); tmp = gst_caps_merge (tmp, glcaps);
#if GST_GL_HAVE_PLATFORM_EGL #if GST_GL_HAVE_PLATFORM_EGL
tmp = gst_caps_merge (tmp, eglcaps); tmp = gst_caps_merge (tmp, eglcaps);
#endif #endif
tmp = gst_caps_merge (tmp, uploadcaps); tmp = gst_caps_merge (tmp, uploadcaps);
} tmp = gst_caps_merge (tmp, raw_caps);
tmp = gst_caps_merge (tmp, gst_gl_filter_caps_remove_format_info (caps)); tmp = gst_caps_merge (tmp, gst_gl_filter_caps_remove_format_info (caps));
@ -758,7 +759,11 @@ gst_gl_filter_transform_caps (GstBaseTransform * bt,
} }
/* if output still intersects input then prefer the intersection */ /* if output still intersects input then prefer the intersection */
if (direction == GST_PAD_SINK) { f = gst_caps_get_features (caps, 0);
if (!gst_caps_features_is_any (f)
&& !gst_caps_features_is_equal (f,
GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)) {
tmp = gst_caps_intersect_full (result, caps, GST_CAPS_INTERSECT_FIRST); tmp = gst_caps_intersect_full (result, caps, GST_CAPS_INTERSECT_FIRST);
result = gst_caps_merge (tmp, result); result = gst_caps_merge (tmp, result);
} }