mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

glvideomixer: intersect with template caps when updating

Browse source 
Downstream may provide extra things when we ask it for caps that we may
need to remove.

Fixes the following pipeline warning:

gltestsrc ! glvideomixerelement ! glimagesinkelement

** (gst-launch-1.0:908581): WARNING **: 13:53:28.518: glvideomixer0: update_src_caps returned caps which are not a real subset of the filter caps
This commit is contained in:
Matthew Waters 2020-04-10 14:05:08 +10:00
parent 7e5368627e
commit ebf8198a97
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/gl/gstglvideomixer.c
View file

@ -1038,7 +1038,7 @@ _mixer_pad_get_output_size (GstGLVideoMixer * mix,
static GstCaps * static GstCaps *
_update_caps (GstVideoAggregator * vagg, GstCaps * caps) _update_caps (GstVideoAggregator * vagg, GstCaps * caps)
{ {
GstCaps *ret; GstCaps *template_caps, *ret;
GList *l; GList *l;
GST_OBJECT_LOCK (vagg); GST_OBJECT_LOCK (vagg);
@ -1063,7 +1063,8 @@ _update_caps (GstVideoAggregator * vagg, GstCaps * caps)
GST_OBJECT_UNLOCK (vagg); GST_OBJECT_UNLOCK (vagg);
ret = gst_caps_ref (caps); template_caps = gst_pad_get_pad_template_caps (GST_AGGREGATOR_SRC_PAD (vagg));
ret = gst_caps_intersect (caps, template_caps);
return ret; return ret;
} }