mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

playbin: Use the caps query instead of accept-caps to detect if a sink accepts caps

Browse source 
accept-caps is only for one element, caps query is recursive. Fixes playback
with totem and other situations.

https://bugzilla.gnome.org/show_bug.cgi?id=760234
This commit is contained in:
Sebastian Dröge 2016-01-07 15:24:25 +02:00
parent c119715e25
commit 844aa3e6a9
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/playback/gstplaybin2.c
View file

@ -4451,7 +4451,7 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
sinkcaps = gst_pad_query_caps (sinkpad, NULL); sinkcaps = gst_pad_query_caps (sinkpad, NULL);
if (!gst_caps_is_any (sinkcaps)) if (!gst_caps_is_any (sinkcaps))
ret = !gst_pad_query_accept_caps (sinkpad, caps); ret = !gst_caps_can_intersect (sinkcaps, caps);
gst_caps_unref (sinkcaps); gst_caps_unref (sinkcaps);
gst_object_unref (sinkpad); gst_object_unref (sinkpad);
} }
@ -4482,7 +4482,7 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
sinkcaps = gst_pad_query_caps (sinkpad, NULL); sinkcaps = gst_pad_query_caps (sinkpad, NULL);
if (!gst_caps_is_any (sinkcaps)) if (!gst_caps_is_any (sinkcaps))
ret = !gst_pad_query_accept_caps (sinkpad, caps); ret = !gst_caps_can_intersect (sinkcaps, caps);
gst_caps_unref (sinkcaps); gst_caps_unref (sinkcaps);
gst_object_unref (sinkpad); gst_object_unref (sinkpad);
} }
@ -4500,7 +4500,7 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
sinkcaps = gst_pad_query_caps (sinkpad, NULL); sinkcaps = gst_pad_query_caps (sinkpad, NULL);
if (!gst_caps_is_any (sinkcaps)) if (!gst_caps_is_any (sinkcaps))
ret = !gst_pad_query_accept_caps (sinkpad, caps); ret = !gst_caps_can_intersect (sinkcaps, caps);
gst_caps_unref (sinkcaps); gst_caps_unref (sinkcaps);
gst_object_unref (sinkpad); gst_object_unref (sinkpad);
} }
@ -4522,18 +4522,20 @@ static gboolean
sink_accepts_caps (GstPlayBin * playbin, GstElement * sink, GstCaps * caps) sink_accepts_caps (GstPlayBin * playbin, GstElement * sink, GstCaps * caps)
{ {
GstPad *sinkpad; GstPad *sinkpad;
gboolean ret = TRUE;
if ((sinkpad = gst_element_get_static_pad (sink, "sink"))) { if ((sinkpad = gst_element_get_static_pad (sink, "sink"))) {
GstCaps *sinkcaps;
sinkcaps = gst_pad_query_caps (sinkpad, NULL);
/* Got the sink pad, now let's see if the element actually does accept the /* Got the sink pad, now let's see if the element actually does accept the
* caps that we have */ * caps that we have */
if (!gst_pad_query_accept_caps (sinkpad, caps)) { ret = gst_caps_can_intersect (sinkcaps, caps);
gst_object_unref (sinkpad); gst_caps_unref (sinkcaps);
return FALSE;
}
gst_object_unref (sinkpad); gst_object_unref (sinkpad);
} }
return TRUE; return ret;
} }
/* We are asked to select an element. See if the next element to check /* We are asked to select an element. See if the next element to check