diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-05-02 15:40:15 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-05-02 15:40:15 +0000 |
| commit | 5c1e2a1e4458654d01fd5f77ab0c977d2f356e86 (patch) | |
| tree | d5e8991efa7eb98aca203eb7addfc4d5d4a029e3 /gst/id3demux | |
| parent | 7df5ab1bf288e8648c5e2be8b80517783e69de5a (diff) | |
gst/: Post an error message when we get an EOS event and were not able to find out the type of stream.
Original commit message from CVS:
* gst/apetag/gsttagdemux.c: (gst_tag_demux_init),
(gst_tag_demux_sink_event):
* gst/id3demux/gstid3demux.c: (gst_id3demux_init),
(gst_id3demux_sink_event):
Post an error message when we get an EOS event and were not
able to find out the type of stream.
* tests/check/elements/id3v2mux.c: (fill_mp3_buffer), (got_buffer),
(test_taglib_id3mux_with_tags):
Decrease num-buffers to 16 per iteration again, otherwise the
many memcpy()s and reallocations in the test will hammer slow
CPUs completely and make the test timeout.
Diffstat (limited to 'gst/id3demux')
| -rw-r--r-- | gst/id3demux/gstid3demux.c | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/gst/id3demux/gstid3demux.c b/gst/id3demux/gstid3demux.c index 56dae513..2fea654f 100644 --- a/gst/id3demux/gstid3demux.c +++ b/gst/id3demux/gstid3demux.c @@ -95,7 +95,7 @@ static void gst_id3demux_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static GstFlowReturn gst_id3demux_chain (GstPad * pad, GstBuffer * buf); - +static gboolean gst_id3demux_sink_event (GstPad * pad, GstEvent * event); static gboolean gst_id3demux_src_activate_pull (GstPad * pad, gboolean active); static GstFlowReturn gst_id3demux_read_range (GstID3Demux * id3demux, guint64 offset, guint length, GstBuffer ** buffer); @@ -217,6 +217,8 @@ gst_id3demux_init (GstID3Demux * id3demux) "sink"), "sink"); gst_pad_set_activate_function (id3demux->sinkpad, GST_DEBUG_FUNCPTR (gst_id3demux_sink_activate)); + gst_pad_set_event_function (id3demux->sinkpad, + GST_DEBUG_FUNCPTR (gst_id3demux_sink_event)); gst_pad_set_chain_function (id3demux->sinkpad, GST_DEBUG_FUNCPTR (gst_id3demux_chain)); gst_element_add_pad (GST_ELEMENT (id3demux), id3demux->sinkpad); @@ -532,6 +534,32 @@ error: return GST_FLOW_ERROR; } +static gboolean +gst_id3demux_sink_event (GstPad * pad, GstEvent * event) +{ + GstID3Demux *demux; + gboolean ret; + + demux = GST_ID3DEMUX (gst_pad_get_parent (pad)); + + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_EOS: + if (demux->srcpad == NULL) { + GST_WARNING_OBJECT (demux, "EOS before we found a type"); + GST_ELEMENT_ERROR (demux, STREAM, TYPE_NOT_FOUND, (NULL), (NULL)); + } + ret = gst_pad_event_default (pad, event); + break; + default: + ret = gst_pad_event_default (pad, event); + break; + } + + gst_object_unref (demux); + return ret; +} + + static void gst_id3demux_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) |