mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 02:32:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

queue: remove weird link behaviour

Browse source 
Remove the link functions and always start the pad task on the srcpad. If
applications need to autoplug they can put a blocking probe on the srcpad like
they would with any other element.
This commit is contained in:
Wim Taymans 2012-02-21 12:52:44 +01:00
parent bd1566b9ae
commit ef5292c2ab
1 changed files with 4 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
plugins/elements/gstqueue.c
View file

@ -208,8 +208,6 @@ static gboolean gst_queue_handle_src_event (GstPad * pad, GstObject * parent,
static gboolean gst_queue_handle_src_query (GstPad * pad, GstObject * parent, static gboolean gst_queue_handle_src_query (GstPad * pad, GstObject * parent,
GstQuery * query); GstQuery * query);
static GstPadLinkReturn gst_queue_link_sink (GstPad * pad, GstPad * peer);
static GstPadLinkReturn gst_queue_link_src (GstPad * pad, GstPad * peer);
static void gst_queue_locked_flush (GstQueue * queue); static void gst_queue_locked_flush (GstQueue * queue);
static gboolean gst_queue_src_activate_mode (GstPad * pad, GstObject * parent, static gboolean gst_queue_src_activate_mode (GstPad * pad, GstObject * parent,
@ -375,8 +373,6 @@ gst_queue_class_init (GstQueueClass * klass)
/* Registering debug symbols for function pointers */ /* Registering debug symbols for function pointers */
GST_DEBUG_REGISTER_FUNCPTR (gst_queue_src_activate_mode); GST_DEBUG_REGISTER_FUNCPTR (gst_queue_src_activate_mode);
GST_DEBUG_REGISTER_FUNCPTR (gst_queue_link_sink);
GST_DEBUG_REGISTER_FUNCPTR (gst_queue_link_src);
GST_DEBUG_REGISTER_FUNCPTR (gst_queue_handle_sink_event); GST_DEBUG_REGISTER_FUNCPTR (gst_queue_handle_sink_event);
GST_DEBUG_REGISTER_FUNCPTR (gst_queue_handle_sink_query); GST_DEBUG_REGISTER_FUNCPTR (gst_queue_handle_sink_query);
GST_DEBUG_REGISTER_FUNCPTR (gst_queue_handle_src_event); GST_DEBUG_REGISTER_FUNCPTR (gst_queue_handle_src_event);
@ -394,7 +390,6 @@ gst_queue_init (GstQueue * queue)
gst_queue_sink_activate_mode); gst_queue_sink_activate_mode);
gst_pad_set_event_function (queue->sinkpad, gst_queue_handle_sink_event); gst_pad_set_event_function (queue->sinkpad, gst_queue_handle_sink_event);
gst_pad_set_query_function (queue->sinkpad, gst_queue_handle_sink_query); gst_pad_set_query_function (queue->sinkpad, gst_queue_handle_sink_query);
gst_pad_set_link_function (queue->sinkpad, gst_queue_link_sink);
GST_PAD_SET_PROXY_CAPS (queue->sinkpad); GST_PAD_SET_PROXY_CAPS (queue->sinkpad);
GST_PAD_SET_PROXY_ALLOCATION (queue->sinkpad); GST_PAD_SET_PROXY_ALLOCATION (queue->sinkpad);
gst_element_add_pad (GST_ELEMENT (queue), queue->sinkpad); gst_element_add_pad (GST_ELEMENT (queue), queue->sinkpad);
@ -403,7 +398,6 @@ gst_queue_init (GstQueue * queue)
gst_pad_set_activatemode_function (queue->srcpad, gst_pad_set_activatemode_function (queue->srcpad,
gst_queue_src_activate_mode); gst_queue_src_activate_mode);
gst_pad_set_link_function (queue->srcpad, gst_queue_link_src);
gst_pad_set_event_function (queue->srcpad, gst_queue_handle_src_event); gst_pad_set_event_function (queue->srcpad, gst_queue_handle_src_event);
gst_pad_set_query_function (queue->srcpad, gst_queue_handle_src_query); gst_pad_set_query_function (queue->srcpad, gst_queue_handle_src_query);
GST_PAD_SET_PROXY_CAPS (queue->srcpad); GST_PAD_SET_PROXY_CAPS (queue->srcpad);
@ -460,42 +454,6 @@ gst_queue_finalize (GObject * object)
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
static GstPadLinkReturn
gst_queue_link_sink (GstPad * pad, GstPad * peer)
{
return GST_PAD_LINK_OK;
}
static GstPadLinkReturn
gst_queue_link_src (GstPad * pad, GstPad * peer)
{
GstPadLinkReturn result = GST_PAD_LINK_OK;
GstQueue *queue;
queue = GST_QUEUE (GST_PAD_PARENT (pad));
GST_DEBUG_OBJECT (queue, "queue linking source pad");
if (GST_PAD_LINKFUNC (peer)) {
result = GST_PAD_LINKFUNC (peer) (peer, pad);
}
if (GST_PAD_LINK_SUCCESSFUL (result)) {
GST_QUEUE_MUTEX_LOCK (queue);
if (queue->srcresult == GST_FLOW_OK) {
queue->push_newsegment = TRUE;
gst_pad_start_task (pad, (GstTaskFunction) gst_queue_loop, pad);
GST_DEBUG_OBJECT (queue, "starting task as pad is linked");
} else {
GST_DEBUG_OBJECT (queue, "not starting task reason %s",
gst_flow_get_name (queue->srcresult));
}
GST_QUEUE_MUTEX_UNLOCK (queue);
}
return result;
}
/* calculate the diff between running time on the sink and src of the queue. /* calculate the diff between running time on the sink and src of the queue.
* This is the total amount of time in the queue. */ * This is the total amount of time in the queue. */
static void static void
@ -772,12 +730,8 @@ gst_queue_handle_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
queue->srcresult = GST_FLOW_OK; queue->srcresult = GST_FLOW_OK;
queue->eos = FALSE; queue->eos = FALSE;
queue->unexpected = FALSE; queue->unexpected = FALSE;
if (gst_pad_is_linked (queue->srcpad)) { gst_pad_start_task (queue->srcpad, (GstTaskFunction) gst_queue_loop,
gst_pad_start_task (queue->srcpad, (GstTaskFunction) gst_queue_loop, queue->srcpad);
queue->srcpad);
} else {
GST_INFO_OBJECT (queue, "not re-starting task as pad is not linked");
}
GST_QUEUE_MUTEX_UNLOCK (queue); GST_QUEUE_MUTEX_UNLOCK (queue);
STATUS (queue, pad, "after flush"); STATUS (queue, pad, "after flush");
@ -1334,14 +1288,8 @@ gst_queue_src_activate_mode (GstPad * pad, GstObject * parent, GstPadMode mode,
queue->srcresult = GST_FLOW_OK; queue->srcresult = GST_FLOW_OK;
queue->eos = FALSE; queue->eos = FALSE;
queue->unexpected = FALSE; queue->unexpected = FALSE;
/* we do not start the task yet if the pad is not connected */ result =
if (gst_pad_is_linked (pad)) gst_pad_start_task (pad, (GstTaskFunction) gst_queue_loop, pad);
result =
gst_pad_start_task (pad, (GstTaskFunction) gst_queue_loop, pad);
else {
GST_INFO_OBJECT (queue, "not starting task as pad is not linked");
result = TRUE;
}
GST_QUEUE_MUTEX_UNLOCK (queue); GST_QUEUE_MUTEX_UNLOCK (queue);
} else { } else {
/* step 1, unblock loop function */ /* step 1, unblock loop function */