mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

glfilter: don't complete overwrite caps features from the subclass

Browse source 
We can get away with ensuring that the memory:GLMemory caps feature is
present in the output caps
This commit is contained in:
Matthew Waters 2018-09-27 13:29:03 +10:00
parent 919083d082
commit 0086dfcf7f
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -611,7 +611,7 @@ gst_gl_filter_caps_remove_size (GstCaps * caps)
} }
static GstCaps * static GstCaps *
gst_gl_filter_set_caps_features (const GstCaps * caps, gst_gl_filter_ensure_caps_contains_features (const GstCaps * caps,
const gchar * feature_name) const gchar * feature_name)
{ {
GstCaps *ret = gst_caps_copy (caps); GstCaps *ret = gst_caps_copy (caps);
@ -619,8 +619,12 @@ gst_gl_filter_set_caps_features (const GstCaps * caps,
guint i = 0; guint i = 0;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
gst_caps_set_features (ret, i, GstCapsFeatures *f = gst_caps_get_features (ret, i);
gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY)); if (!gst_caps_features_is_any (f)) {
if (!gst_caps_features_contains (f, feature_name)) {
gst_caps_features_add (f, GST_CAPS_FEATURE_MEMORY_GL_MEMORY);
}
}
} }
return ret; return ret;
@ -651,7 +655,7 @@ gst_gl_filter_transform_caps (GstBaseTransform * bt,
direction, caps, NULL); direction, caps, NULL);
result = result =
gst_gl_filter_set_caps_features (tmp, gst_gl_filter_ensure_caps_contains_features (tmp,
GST_CAPS_FEATURE_MEMORY_GL_MEMORY); GST_CAPS_FEATURE_MEMORY_GL_MEMORY);
gst_caps_unref (tmp); gst_caps_unref (tmp);
tmp = result; tmp = result;