From 6169fd7d0db82e40f58d9282aba6ba465aa60e9f Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 8 Nov 2004 14:43:47 +0000 Subject: [PATCH] ext/ogg/gstoggdemux.c: Actually always send a discont (cornercase when resending the same serial-tagged chain twice). Original commit message from CVS: * ext/ogg/gstoggdemux.c: (gst_ogg_pad_push): Actually always send a discont (cornercase when resending the same serial-tagged chain twice). --- ChangeLog | 6 ++++++ ext/ogg/gstoggdemux.c | 36 +++++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51d00dadae..44621c0343 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-11-08 Ronald S. Bultje + + * ext/ogg/gstoggdemux.c: (gst_ogg_pad_push): + Actually always send a discont (cornercase when resending the + same serial-tagged chain twice). + 2004-11-08 Julien MOUTTE * sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_clear), diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index c12be297b7..e95035fcde 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -567,10 +567,12 @@ gst_ogg_demux_src_event (GstPad * pad, GstEvent * event) GST_OGG_SET_STATE (ogg, GST_OGG_STATE_SEEK); 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, @@ -645,7 +647,8 @@ 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); @@ -931,7 +934,8 @@ _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); @@ -1060,7 +1064,8 @@ _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? */ @@ -1505,22 +1510,27 @@ gst_ogg_pad_push (GstOggDemux * ogg, GstOggPad * pad) } /* send discont if needed */ - if (pos != -1 && (pad->flags & GST_OGG_PAD_NEEDS_DISCONT) + if ((pad->flags & GST_OGG_PAD_NEEDS_DISCONT) && GST_PAD_IS_USABLE (pad->pad)) { /* so in order to synchronized the variety of streams, we will * not use the granpos but the last seekpos for the discont. */ GstEvent *event; gint64 discont; - fmt = GST_FORMAT_DEFAULT; - if (!GST_PAD_PEER (pad->pad) || - !gst_pad_convert (GST_PAD_PEER (pad->pad), - ogg->seek_format, ogg->seek_to, &fmt, &discont)) { - event = gst_event_new_discontinuous (FALSE, - ogg->seek_format, ogg->seek_to, GST_FORMAT_UNDEFINED); + if (pos != -1) { + fmt = GST_FORMAT_DEFAULT; + if (!GST_PAD_PEER (pad->pad) || + !gst_pad_convert (GST_PAD_PEER (pad->pad), + ogg->seek_format, ogg->seek_to, &fmt, &discont)) { + event = gst_event_new_discontinuous (FALSE, + ogg->seek_format, ogg->seek_to, GST_FORMAT_UNDEFINED); + } else { + event = gst_event_new_discontinuous (FALSE, + GST_FORMAT_DEFAULT, discont, GST_FORMAT_UNDEFINED); + } } else { event = gst_event_new_discontinuous (FALSE, - GST_FORMAT_DEFAULT, discont, GST_FORMAT_UNDEFINED); + GST_FORMAT_DEFAULT, 0, GST_FORMAT_UNDEFINED); } /* FIXME: this might be wrong because we can only use the last