mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/base/gstbasesink.c: If we have not seen a buffer before EOS, use the segment values to report the current po...

Browse source 
Original commit message from CVS:
* libs/gst/base/gstbasesink.c: (gst_base_sink_get_sync_times),
(gst_base_sink_wait_eos), (gst_base_sink_event):
If we have not seen a buffer before EOS, use the segment values to
report the current position instead of invalid positions.
This commit is contained in:
Wim Taymans 2008-06-20 08:28:46 +00:00
parent e5c981bb7b
commit 8cd06f8770
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-06-20 Wim Taymans <wim.taymans@collabora.co.uk>
* libs/gst/base/gstbasesink.c: (gst_base_sink_get_sync_times),
(gst_base_sink_wait_eos), (gst_base_sink_event):
If we have not seen a buffer before EOS, use the segment values to
report the current position instead of invalid positions.
2008-06-20 Stefan Kost <ensonic@users.sf.net> 2008-06-20 Stefan Kost <ensonic@users.sf.net>
* docs/plugins/tmpl/.cvsignore: * docs/plugins/tmpl/.cvsignore:

25
libs/gst/base/gstbasesink.c
View file

@ -1304,23 +1304,36 @@ gst_base_sink_get_sync_times (GstBaseSink * basesink, GstMiniObject * obj,
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
/* EOS event needs syncing */ /* EOS event needs syncing */
case GST_EVENT_EOS: case GST_EVENT_EOS:
if (basesink->segment.rate >= 0.0) {
if (basesink->segment.rate >= 0.0) {
sstart = sstop = priv->current_sstop; sstart = sstop = priv->current_sstop;
else if (sstart == -1) {
/* we have not seen a buffer yet, use the segment values */
sstart = sstop = gst_segment_to_stream_time (&basesink->segment,
basesink->segment.format, basesink->segment.stop);
}
} else {
sstart = sstop = priv->current_sstart; sstart = sstop = priv->current_sstart;
if (sstart == -1) {
/* we have not seen a buffer yet, use the segment values */
sstart = sstop = gst_segment_to_stream_time (&basesink->segment,
basesink->segment.format, basesink->segment.start);
}
}
rstart = rstop = priv->eos_rtime; rstart = rstop = priv->eos_rtime;
*do_sync = rstart != -1; *do_sync = rstart != -1;
GST_DEBUG_OBJECT (basesink, "sync times for EOS %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (basesink, "sync times for EOS %" GST_TIME_FORMAT,
GST_TIME_ARGS (rstart)); GST_TIME_ARGS (rstart));
goto done; goto done;
}
default:
/* other events do not need syncing */ /* other events do not need syncing */
/* FIXME, maybe NEWSEGMENT might need synchronisation /* FIXME, maybe NEWSEGMENT might need synchronisation
* since the POSITION query depends on accumulated times and * since the POSITION query depends on accumulated times and
* we cannot accumulate the current segment before the previous * we cannot accumulate the current segment before the previous
* one completed. * one completed.
*/ */
default:
return FALSE; return FALSE;
} }
} }
@ -1598,9 +1611,12 @@ gst_base_sink_wait_eos (GstBaseSink * sink, GstClockTime time,
GST_DEBUG_OBJECT (sink, "possibly waiting for clock to reach %" GST_DEBUG_OBJECT (sink, "possibly waiting for clock to reach %"
GST_TIME_FORMAT, GST_TIME_ARGS (time)); GST_TIME_FORMAT, GST_TIME_ARGS (time));
/* compensate for latency and ts_offset. We don't adjust for device latency
* because we don't interact with the device on EOS normally. */
stime = gst_base_sink_adjust_time (sink, time);
/* wait for the clock, this can be interrupted because we got shut down or /* wait for the clock, this can be interrupted because we got shut down or
* we PAUSED. */ * we PAUSED. */
stime = gst_base_sink_adjust_time (sink, time);
status = gst_base_sink_wait_clock (sink, stime, jitter); status = gst_base_sink_wait_clock (sink, stime, jitter);
GST_DEBUG_OBJECT (sink, "clock returned %d", status); GST_DEBUG_OBJECT (sink, "clock returned %d", status);
@ -2472,6 +2488,7 @@ gst_base_sink_event (GstPad * pad, GstEvent * event)
GST_OBJECT_LOCK (basesink); GST_OBJECT_LOCK (basesink);
basesink->priv->current_sstart = -1; basesink->priv->current_sstart = -1;
basesink->priv->current_sstop = -1; basesink->priv->current_sstop = -1;
basesink->priv->eos_rtime = -1;
GST_OBJECT_UNLOCK (basesink); GST_OBJECT_UNLOCK (basesink);
gst_event_unref (event); gst_event_unref (event);