diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/matroska/ebml-read.c | 36 |
2 files changed, 28 insertions, 16 deletions
@@ -1,3 +1,11 @@ +2004-01-30 Ronald Bultje <rbultje@ronald.bitfreak.net> + + * gst-libs/gst/riff/riff-read.c: (gst_riff_peek_head), + (gst_riff_read_seek): + * gst/matroska/ebml-read.c: (gst_ebml_read_element_id), + (gst_ebml_read_seek): + Fix event handling. + 2004-01-30 Benjamin Otte <in7y118@public.uni-hamburg.de> * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps): diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c index 4f813f65..4497cd11 100644 --- a/gst/matroska/ebml-read.c +++ b/gst/matroska/ebml-read.c @@ -156,13 +156,13 @@ gst_ebml_read_element_id (GstEbmlRead *ebml, gint len_mask = 0x80, read = 1, n = 1; guint32 total; - if (gst_bytestream_peek_bytes (ebml->bs, &data, 1) != 1) { + while (gst_bytestream_peek_bytes (ebml->bs, &data, 1) != 1) { GstEvent *event = NULL; guint32 remaining; /* Here, we might encounter EOS */ gst_bytestream_get_status (ebml->bs, &remaining, &event); - if (event && GST_EVENT_TYPE (event) == GST_EVENT_EOS) { + if (event) { gst_pad_event_default (ebml->sinkpad, event); } else { guint64 pos = gst_bytestream_tell (ebml->bs); @@ -170,8 +170,8 @@ gst_ebml_read_element_id (GstEbmlRead *ebml, GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL, ("Read error at position %llu (0x%llx)", pos, pos)); + return -1; } - return -1; } total = data[0]; while (read <= 4 && !(total & len_mask)) { @@ -313,7 +313,7 @@ gst_ebml_read_seek (GstEbmlRead *ebml, guint64 offset) { guint32 remaining; - GstEvent *event; + GstEvent *event = NULL; guchar *data; /* first, flush remaining buffers */ @@ -332,19 +332,23 @@ gst_ebml_read_seek (GstEbmlRead *ebml, return NULL; } - /* and now, peek a new byte. This will fail because there's a - * pending event. Then, take the event and return it. */ - if (gst_bytestream_peek_bytes (ebml->bs, &data, 1)) - g_warning ("Unexpected data after seek"); + while (!event) { + /* and now, peek a new byte. This will fail because there's a + * pending event. Then, take the event and return it. */ + if (gst_bytestream_peek_bytes (ebml->bs, &data, 1)) { + GST_WARNING ("Unexpected data after seek - this means seek failed"); + break; + } - /* get the discont event and return */ - gst_bytestream_get_status (ebml->bs, &remaining, &event); - if (!event || GST_EVENT_TYPE (event) != GST_EVENT_DISCONTINUOUS) { - GST_ELEMENT_ERROR (ebml, CORE, SEEK, NULL, - ("No discontinuity event after seek")); - if (event) - gst_event_unref (event); - return NULL; + /* get the discont event and return */ + gst_bytestream_get_status (ebml->bs, &remaining, &event); + if (!event) { + GST_WARNING ("No discontinuity event after seek - seek failed"); + break; + } else if (GST_EVENT_TYPE (event) != GST_EVENT_DISCONTINUOUS) { + gst_pad_event_default (ebml->sinkpad, event); + event = NULL; + } } return event; |