mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/base/gstbasesink.c: Don't report POSITION based on clock time if sync is disabled in a sink.

Browse source 
Original commit message from CVS:
* libs/gst/base/gstbasesink.c: (gst_base_sink_get_position):
Don't report POSITION based on clock time if sync is
disabled in a sink.
This commit is contained in:
Wim Taymans 2006-05-15 11:54:22 +00:00
parent 1fa79bc05f
commit 6af1d4c999
2 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-05-15 Wim Taymans <wim@fluendo.com>
* libs/gst/base/gstbasesink.c: (gst_base_sink_get_position):
Don't report POSITION based on clock time if sync is
disabled in a sink.
2006-05-15 Tim-Philipp Müller <tim at centricular dot net> 2006-05-15 Tim-Philipp Müller <tim at centricular dot net>
* gst/gstobject.h: * gst/gstobject.h:

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

@ -2227,7 +2227,9 @@ gst_base_sink_peer_query (GstBaseSink * sink, GstQuery * query)
return res; return res;
} }
/* get the position of the last seen object */ /* get the end position of the last seen object, this is used
* for EOS and for making sure that we don't report a position we
* have not reached yet. */
static gboolean static gboolean
gst_base_sink_get_position_last (GstBaseSink * basesink, gint64 * cur) gst_base_sink_get_position_last (GstBaseSink * basesink, gint64 * cur)
{ {
@ -2261,6 +2263,7 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
gboolean res = FALSE; gboolean res = FALSE;
switch (format) { switch (format) {
/* we can answer time format */
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
{ {
GstClockTime now, base; GstClockTime now, base;
@ -2268,23 +2271,30 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
gdouble rate; gdouble rate;
gint64 last; gint64 last;
/* we can answer time format */
GST_OBJECT_LOCK (basesink); GST_OBJECT_LOCK (basesink);
/* can only give answer if not EOS */ /* can only give answer based on the clock if not EOS */
if (G_UNLIKELY (basesink->eos)) if (G_UNLIKELY (basesink->eos))
goto in_eos; goto in_eos;
/* in PAUSE we cannot read from the clock so we
* report time based on the last seen timestamp. */
if (GST_STATE (basesink) == GST_STATE_PAUSED) if (GST_STATE (basesink) == GST_STATE_PAUSED)
goto in_pause; goto in_pause;
/* We get position from clock only in PLAYING */ /* We get position from clock only in PLAYING, we checked
* the PAUSED case above, so this is check is to test
* READY and NULL, where the position is always 0 */
if (GST_STATE (basesink) != GST_STATE_PLAYING) if (GST_STATE (basesink) != GST_STATE_PLAYING)
goto wrong_state; goto wrong_state;
/* we need to sync on the clock. */
if (basesink->sync == FALSE)
goto no_sync;
/* and we need a clock */ /* and we need a clock */
if (G_UNLIKELY ((clock = GST_ELEMENT_CLOCK (basesink)) == NULL)) if (G_UNLIKELY ((clock = GST_ELEMENT_CLOCK (basesink)) == NULL))
goto no_clock; goto no_sync;
/* collect all data we need holding the lock */ /* collect all data we need holding the lock */
if (GST_CLOCK_TIME_IS_VALID (basesink->segment.time)) if (GST_CLOCK_TIME_IS_VALID (basesink->segment.time))
@ -2328,7 +2338,8 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
GST_TIME_ARGS (accum), GST_TIME_ARGS (time)); GST_TIME_ARGS (accum), GST_TIME_ARGS (time));
} }
default: default:
/* cannot answer other than TIME */ /* cannot answer other than TIME, we return FALSE, which will
* send the query upstream. */
break; break;
} }
@ -2352,15 +2363,20 @@ in_pause:
} }
wrong_state: wrong_state:
{ {
/* in NULL or READY we always return 0 */
res = TRUE; res = TRUE;
*cur = 0; *cur = 0;
GST_OBJECT_UNLOCK (basesink); GST_OBJECT_UNLOCK (basesink);
goto done; goto done;
} }
no_clock: no_sync:
{ {
/* report last seen timestamp if any, else return FALSE so
* that upstream can answer */
if ((*cur = basesink->priv->current_sstart) != -1)
res = TRUE;
GST_OBJECT_UNLOCK (basesink); GST_OBJECT_UNLOCK (basesink);
return FALSE; return res;
} }
} }