mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 06:16:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ogg/gstoggdemux.c: We love it if files that start at zero work too...

Browse source 
Original commit message from CVS:
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_push):
We love it if files that start at zero work too...
This commit is contained in:
Ronald S. Bultje 2004-10-22 13:09:12 +00:00
parent 2aa83eb99d
commit 65b6abba10
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-10-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* 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 <rbultje@ronald.bitfreak.net> 2004-10-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_iterate): * ext/ogg/gstoggdemux.c: (gst_ogg_demux_iterate):

31
ext/ogg/gstoggdemux.c
View file

@ -557,12 +557,10 @@ gst_ogg_demux_src_event (GstPad * pad, GstEvent * event)
GST_OGG_SET_STATE (ogg, GST_OGG_STATE_PLAY); GST_OGG_SET_STATE (ogg, GST_OGG_STATE_PLAY);
FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, 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) { if (GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH) {
FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, 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, GST_DEBUG_OBJECT (ogg,
"initiating seeking to format %d, offset %" G_GUINT64_FORMAT, format, "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_event_unref (event);
GST_FLAG_UNSET (ogg, GST_OGG_FLAG_WAIT_FOR_DISCONT); GST_FLAG_UNSET (ogg, GST_OGG_FLAG_WAIT_FOR_DISCONT);
FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, FOR_PAD_IN_CURRENT_CHAIN (ogg, pad,
pad->flags |= GST_OGG_PAD_NEEDS_DISCONT; pad->flags |= GST_OGG_PAD_NEEDS_DISCONT;);
);
break; break;
default: default:
gst_pad_event_default (pad, event); gst_pad_event_default (pad, event);
@ -923,8 +920,7 @@ _find_chain_get_unknown_part (GstOggDemux * ogg, gint64 * start, gint64 * end)
*end = G_MAXINT64; *end = G_MAXINT64;
g_assert (ogg->current_chain >= 0); 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) { if (ogg->setup_state == SETUP_FIND_LAST_CHAIN) {
*end = gst_file_pad_get_length (ogg->sinkpad); *end = gst_file_pad_get_length (ogg->sinkpad);
@ -1053,8 +1049,7 @@ _find_streams_check (GstOggDemux * ogg)
} else { } else {
endpos = G_MAXINT64; endpos = G_MAXINT64;
FOR_PAD_IN_CHAIN (ogg, pad, ogg->chains->len - 1, 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) { if (!ogg->seek_skipped || gst_ogg_demux_position (ogg) >= endpos) {
/* have we found the endposition for all streams yet? */ /* 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) if (pad->known_offset != -1)
gst_pad_convert (GST_PAD_PEER (pad->pad), if (!gst_pad_convert (GST_PAD_PEER (pad->pad),
GST_FORMAT_DEFAULT, pad->known_offset, &fmt, &pos); GST_FORMAT_DEFAULT, pad->known_offset, &fmt, &pos))
pos = -1;
if (pad->start != -1) if (pad->start != -1)
gst_pad_convert (GST_PAD_PEER (pad->pad), if (!gst_pad_convert (GST_PAD_PEER (pad->pad),
GST_FORMAT_DEFAULT, pad->start, &fmt, &base); GST_FORMAT_DEFAULT, pad->start, &fmt, &base))
base = -1;
if (pos != -1 && base != -1) { if (pos != -1 && base != -1) {
pos -= base; pos -= base;
if (pos < 0)
pos = 0;
fmt = GST_FORMAT_DEFAULT; fmt = GST_FORMAT_DEFAULT;
gst_pad_convert (GST_PAD_PEER (pad->pad), gst_pad_convert (GST_PAD_PEER (pad->pad),
GST_FORMAT_TIME, pos, &fmt, &pos); GST_FORMAT_TIME, pos, &fmt, &pos);
} else } else {
pos = -1; pos = -1;
}
/* send flush if needed */
if ((pad->flags & GST_OGG_PAD_NEEDS_FLUSH) if ((pad->flags & GST_OGG_PAD_NEEDS_FLUSH)
&& GST_PAD_IS_USABLE (pad->pad)) { && GST_PAD_IS_USABLE (pad->pad)) {
gst_pad_push (pad->pad, GST_DATA (gst_event_new (GST_EVENT_FLUSH))); gst_pad_push (pad->pad, GST_DATA (gst_event_new (GST_EVENT_FLUSH)));