summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2006-02-16 14:02:57 +0000
committerEdward Hervey <bilboed@bilboed.com>2006-02-16 14:02:57 +0000
commit0241c68356e3da9e82c08bc6d3fbfa783c885888 (patch)
tree56a0536c1092b578abca625972a5921449343f04
parent16775d85b10549595d4af052deb7508cbd1a4ea4 (diff)
downloadgst-plugins-bad-0241c68356e3da9e82c08bc6d3fbfa783c885888.tar.gz
gst-plugins-bad-0241c68356e3da9e82c08bc6d3fbfa783c885888.tar.bz2
gst-plugins-bad-0241c68356e3da9e82c08bc6d3fbfa783c885888.zip
gst/qtdemux/qtdemux.c: Don't stop the task if the pad isn't linked.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_event), (gst_qtdemux_loop), (qtdemux_sink_activate_pull): Don't stop the task if the pad isn't linked.
-rw-r--r--ChangeLog6
-rw-r--r--gst/qtdemux/qtdemux.c11
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 94be037a..9c9f9de0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-16 Edward Hervey <edward@fluendo.com>
+
+ * gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_event),
+ (gst_qtdemux_loop), (qtdemux_sink_activate_pull):
+ Don't stop the task if the pad isn't linked.
+
2006-02-15 Tim-Philipp Müller <tim at centricular dot net>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_chain):
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 506209b4..e15de786 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -143,7 +143,7 @@ static void gst_qtdemux_base_init (GstQTDemuxClass * klass);
static void gst_qtdemux_init (GstQTDemux * quicktime_demux);
static GstStateChangeReturn gst_qtdemux_change_state (GstElement * element,
GstStateChange transition);
-static void gst_qtdemux_loop_header (GstPad * pad);
+static void gst_qtdemux_loop (GstPad * pad);
static GstFlowReturn gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf);
static gboolean qtdemux_sink_activate (GstPad * sinkpad);
static gboolean qtdemux_sink_activate_pull (GstPad * sinkpad, gboolean active);
@@ -427,7 +427,7 @@ gst_qtdemux_handle_src_event (GstPad * pad, GstEvent * event)
/* and restart */
gst_pad_start_task (qtdemux->sinkpad,
- (GstTaskFunction) gst_qtdemux_loop_header, qtdemux->sinkpad);
+ (GstTaskFunction) gst_qtdemux_loop, qtdemux->sinkpad);
GST_PAD_STREAM_UNLOCK (qtdemux->sinkpad);
break;
@@ -723,7 +723,7 @@ beach:
}
static void
-gst_qtdemux_loop_header (GstPad * pad)
+gst_qtdemux_loop (GstPad * pad)
{
GstQTDemux *qtdemux = GST_QTDEMUX (GST_OBJECT_PARENT (pad));
guint64 cur_offset;
@@ -746,7 +746,7 @@ gst_qtdemux_loop_header (GstPad * pad)
g_error ("State=%d", qtdemux->state);
}
- if (ret != GST_FLOW_OK) {
+ if ((ret != GST_FLOW_OK) && (ret != GST_FLOW_NOT_LINKED)) {
GST_LOG_OBJECT (qtdemux, "pausing task, reason %s",
gst_flow_get_name (ret));
gst_pad_pause_task (qtdemux->sinkpad);
@@ -1052,8 +1052,7 @@ qtdemux_sink_activate_pull (GstPad * sinkpad, gboolean active)
if (active) {
/* if we have a scheduler we can start the task */
demux->pullbased = TRUE;
- gst_pad_start_task (sinkpad,
- (GstTaskFunction) gst_qtdemux_loop_header, sinkpad);
+ gst_pad_start_task (sinkpad, (GstTaskFunction) gst_qtdemux_loop, sinkpad);
} else {
gst_pad_stop_task (sinkpad);
}