mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/playback/gststreamselector.*: Be more selective when we're redoing caps negotiation from within the chain functio...

Browse source 
Original commit message from CVS:
* gst/playback/gststreamselector.c: (gst_stream_selector_init),
(gst_stream_selector_get_caps), (gst_stream_selector_chain):
* gst/playback/gststreamselector.h:
Be more selective when we're redoing caps negotiation from
within the chain function on a stream change.
This commit is contained in:
Ronald S. Bultje 2005-01-28 13:44:04 +00:00
parent 705aac4125
commit 05d83eb4cd
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-01-28 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/playback/gststreamselector.c: (gst_stream_selector_init),
(gst_stream_selector_get_caps), (gst_stream_selector_chain):
* gst/playback/gststreamselector.h:
Be more selective when we're redoing caps negotiation from
within the chain function on a stream change.
2005-01-28 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2005-01-28 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* configure.ac: * configure.ac:

8
gst/playback/gststreamselector.c
View file

@ -143,6 +143,7 @@ gst_stream_selector_init (GstStreamSelector * sel)
/* sinkpad management */ /* sinkpad management */
sel->last_active_sinkpad = NULL; sel->last_active_sinkpad = NULL;
sel->nb_sinkpads = 0; sel->nb_sinkpads = 0;
sel->in_chain = FALSE;
} }
static void static void
@ -172,6 +173,7 @@ gst_stream_selector_get_linked_pad (GstPad * pad)
static GstCaps * static GstCaps *
gst_stream_selector_get_caps (GstPad * pad) gst_stream_selector_get_caps (GstPad * pad)
{ {
GstStreamSelector *sel = GST_STREAM_SELECTOR (gst_pad_get_parent (pad));
GstPad *otherpad = gst_stream_selector_get_linked_pad (pad); GstPad *otherpad = gst_stream_selector_get_linked_pad (pad);
if (!otherpad) { if (!otherpad) {
@ -179,6 +181,8 @@ gst_stream_selector_get_caps (GstPad * pad)
"Pad %s not linked, returning ANY", gst_pad_get_name (pad)); "Pad %s not linked, returning ANY", gst_pad_get_name (pad));
return gst_caps_new_any (); return gst_caps_new_any ();
} else if (otherpad == sel->last_active_sinkpad && sel->in_chain) {
return gst_caps_copy (GST_PAD_CAPS (sel->last_active_sinkpad));
} }
GST_DEBUG_OBJECT (gst_pad_get_parent (pad), GST_DEBUG_OBJECT (gst_pad_get_parent (pad),
@ -265,7 +269,9 @@ gst_stream_selector_chain (GstPad * pad, GstData * data)
gst_pad_get_name (sel->last_active_sinkpad) : "none", gst_pad_get_name (sel->last_active_sinkpad) : "none",
gst_pad_get_name (pad)); gst_pad_get_name (pad));
sel->last_active_sinkpad = pad; sel->last_active_sinkpad = pad;
ret = gst_pad_renegotiate (pad); sel->in_chain = TRUE;
ret = gst_pad_renegotiate (sel->srcpad);
sel->in_chain = FALSE;
if (GST_PAD_LINK_FAILED (ret)) { if (GST_PAD_LINK_FAILED (ret)) {
GST_ELEMENT_ERROR (sel, CORE, NEGOTIATION, (NULL), (NULL)); GST_ELEMENT_ERROR (sel, CORE, NEGOTIATION, (NULL), (NULL));
sel->last_active_sinkpad = NULL; sel->last_active_sinkpad = NULL;

1
gst/playback/gststreamselector.h
View file

@ -45,6 +45,7 @@ struct _GstStreamSelector {
GstPad *last_active_sinkpad; GstPad *last_active_sinkpad;
GstPad *srcpad; GstPad *srcpad;
guint nb_sinkpads; guint nb_sinkpads;
gboolean in_chain;
}; };
struct _GstStreamSelectorClass { struct _GstStreamSelectorClass {