mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

glupload: Detect overlay meta buffers correctly

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=745107
This commit is contained in:
Lubosz Sarnecki 2015-06-18 13:34:58 +02:00 committed by Tim-Philipp Müller
parent dc47e6d3c0
commit 076d0517c8
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst-libs/gst/gl/gstglupload.c
View file

@ -153,7 +153,8 @@ _gl_memory_upload_accept (gpointer impl, GstBuffer * buffer, GstCaps * in_caps,
GstCaps * out_caps) GstCaps * out_caps)
{ {
struct GLMemoryUpload *upload = impl; struct GLMemoryUpload *upload = impl;
GstCapsFeatures *features, *gl_features; GstCapsFeatures *features, *gl_features, *gl_overlay_features,
*system_memory_overlay_features;
gboolean ret = TRUE; gboolean ret = TRUE;
int i; int i;
@ -164,10 +165,23 @@ _gl_memory_upload_accept (gpointer impl, GstBuffer * buffer, GstCaps * in_caps,
if (!gst_caps_features_is_equal (features, gl_features)) if (!gst_caps_features_is_equal (features, gl_features))
ret = FALSE; ret = FALSE;
gl_overlay_features =
gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY ","
GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
if (gst_caps_features_is_equal (features, gl_overlay_features))
ret = TRUE;
features = gst_caps_get_features (in_caps, 0); features = gst_caps_get_features (in_caps, 0);
system_memory_overlay_features =
gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY ","
GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
if (!gst_caps_features_is_equal (features, gl_features) if (!gst_caps_features_is_equal (features, gl_features)
&& !gst_caps_features_is_equal (features, gl_overlay_features)
&& !gst_caps_features_is_equal (features, && !gst_caps_features_is_equal (features,
GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)) GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)
&& !gst_caps_features_is_equal (features, system_memory_overlay_features))
ret = FALSE; ret = FALSE;
gst_caps_features_free (gl_features); gst_caps_features_free (gl_features);