mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggdemux: allow unset seek stop time in push mode

Browse source
This commit is contained in:
Vincent Penquerc'h 2014-06-06 12:18:49 +01:00
parent 55b4d8f6af
commit c1b42827c1
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ext/ogg/gstoggdemux.c
View file

@ -2161,11 +2161,15 @@ gst_ogg_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
ogg->push_byte_offset = segment.start; ogg->push_byte_offset = segment.start;
ogg->push_last_seek_offset = segment.start; ogg->push_last_seek_offset = segment.start;
if (gst_event_get_seqnum (event) == ogg->push_seek_seqnum) if (gst_event_get_seqnum (event) == ogg->push_seek_seqnum) {
GstSeekType stop_type = GST_SEEK_TYPE_NONE;
if (ogg->push_seek_time_original_stop != -1)
stop_type = GST_SEEK_TYPE_SET;
gst_segment_do_seek (&ogg->segment, ogg->push_seek_rate, gst_segment_do_seek (&ogg->segment, ogg->push_seek_rate,
GST_FORMAT_TIME, ogg->push_seek_flags, GST_SEEK_TYPE_SET, GST_FORMAT_TIME, ogg->push_seek_flags, GST_SEEK_TYPE_SET,
ogg->push_seek_time_original_target, GST_SEEK_TYPE_SET, ogg->push_seek_time_original_target, stop_type,
ogg->push_seek_time_original_stop, &update); ogg->push_seek_time_original_stop, &update);
}
GST_PUSH_UNLOCK (ogg); GST_PUSH_UNLOCK (ogg);
} else { } else {
@ -3485,11 +3489,16 @@ gst_ogg_demux_perform_seek_push (GstOggDemux * ogg, GstEvent * event)
goto error; goto error;
} }
if (start_type != GST_SEEK_TYPE_SET || stop_type != GST_SEEK_TYPE_SET) { if (start_type != GST_SEEK_TYPE_SET) {
GST_DEBUG_OBJECT (ogg, "can only seek to a SET target"); GST_DEBUG_OBJECT (ogg, "can only seek to a SET target");
goto error; goto error;
} }
/* If stop is unset, make sure it is -1, as this value will be tested
later to check whether stop is set or not */
if (stop_type == GST_SEEK_TYPE_NONE)
stop = -1;
if (!(flags & GST_SEEK_FLAG_FLUSH)) { if (!(flags & GST_SEEK_FLAG_FLUSH)) {
GST_DEBUG_OBJECT (ogg, "can only do flushing seeks"); GST_DEBUG_OBJECT (ogg, "can only do flushing seeks");
goto error; goto error;