From 65b6abba10ed5810535c7bdb39fc9187b095c564 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 22 Oct 2004 13:09:12 +0000 Subject: [PATCH] ext/ogg/gstoggdemux.c: We love it if files that start at zero work too... Original commit message from CVS: * ext/ogg/gstoggdemux.c: (gst_ogg_pad_push): We love it if files that start at zero work too... --- ChangeLog | 5 +++++ ext/ogg/gstoggdemux.c | 31 +++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e38412..76cfa64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-10-22 Ronald S. Bultje + * ext/ogg/gstoggdemux.c: (gst_ogg_pad_push): + We love it if files that start at zero work too... + +2004-10-22 Ronald S. Bultje + * ext/ogg/gstoggdemux.c: (gst_ogg_demux_iterate): Handle files with missing EOS headers. diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 99e7c76..e7ba84a 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -557,12 +557,10 @@ gst_ogg_demux_src_event (GstPad * pad, GstEvent * event) GST_OGG_SET_STATE (ogg, GST_OGG_STATE_PLAY); FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, - pad->flags |= GST_OGG_PAD_NEEDS_DISCONT; - ); + pad->flags |= GST_OGG_PAD_NEEDS_DISCONT;); if (GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH) { FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, - pad->flags |= GST_OGG_PAD_NEEDS_FLUSH; - ); + pad->flags |= GST_OGG_PAD_NEEDS_FLUSH;); } GST_DEBUG_OBJECT (ogg, "initiating seeking to format %d, offset %" G_GUINT64_FORMAT, format, @@ -636,8 +634,7 @@ gst_ogg_demux_handle_event (GstPad * pad, GstEvent * event) gst_event_unref (event); GST_FLAG_UNSET (ogg, GST_OGG_FLAG_WAIT_FOR_DISCONT); FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, - pad->flags |= GST_OGG_PAD_NEEDS_DISCONT; - ); + pad->flags |= GST_OGG_PAD_NEEDS_DISCONT;); break; default: gst_pad_event_default (pad, event); @@ -923,8 +920,7 @@ _find_chain_get_unknown_part (GstOggDemux * ogg, gint64 * start, gint64 * end) *end = G_MAXINT64; g_assert (ogg->current_chain >= 0); - FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, *start = MAX (*start, pad->end_offset); - ); + FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, *start = MAX (*start, pad->end_offset);); if (ogg->setup_state == SETUP_FIND_LAST_CHAIN) { *end = gst_file_pad_get_length (ogg->sinkpad); @@ -1053,8 +1049,7 @@ _find_streams_check (GstOggDemux * ogg) } else { endpos = G_MAXINT64; FOR_PAD_IN_CHAIN (ogg, pad, ogg->chains->len - 1, - endpos = MIN (endpos, pad->start_offset); - ); + endpos = MIN (endpos, pad->start_offset);); } if (!ogg->seek_skipped || gst_ogg_demux_position (ogg) >= endpos) { /* have we found the endposition for all streams yet? */ @@ -1430,20 +1425,24 @@ gst_ogg_pad_push (GstOggDemux * ogg, GstOggPad * pad) } if (pad->known_offset != -1) - gst_pad_convert (GST_PAD_PEER (pad->pad), - GST_FORMAT_DEFAULT, pad->known_offset, &fmt, &pos); + if (!gst_pad_convert (GST_PAD_PEER (pad->pad), + GST_FORMAT_DEFAULT, pad->known_offset, &fmt, &pos)) + pos = -1; if (pad->start != -1) - gst_pad_convert (GST_PAD_PEER (pad->pad), - GST_FORMAT_DEFAULT, pad->start, &fmt, &base); + if (!gst_pad_convert (GST_PAD_PEER (pad->pad), + GST_FORMAT_DEFAULT, pad->start, &fmt, &base)) + base = -1; if (pos != -1 && base != -1) { pos -= base; + if (pos < 0) + pos = 0; fmt = GST_FORMAT_DEFAULT; gst_pad_convert (GST_PAD_PEER (pad->pad), GST_FORMAT_TIME, pos, &fmt, &pos); - } else + } else { pos = -1; + } - /* send flush if needed */ if ((pad->flags & GST_OGG_PAD_NEEDS_FLUSH) && GST_PAD_IS_USABLE (pad->pad)) { gst_pad_push (pad->pad, GST_DATA (gst_event_new (GST_EVENT_FLUSH))); -- 2.7.4