mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix clocking.

Browse source 
Original commit message from CVS:
Fix clocking.
This commit is contained in:
Wim Taymans 2002-04-28 14:33:09 +00:00
parent ca8b0275ca
commit 71d810adff
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sys/oss/gstosssink.c
View file

@ -222,19 +222,28 @@ gst_osssink_get_time (GstClock *clock, gpointer data)
{ {
GstOssSink *osssink = GST_OSSSINK (data); GstOssSink *osssink = GST_OSSSINK (data);
gint delay; gint delay;
gint offset = 0; GstClockTime res;
if (!osssink->bps) if (!osssink->bps)
return 0; return 0;
/* if we have a start time, use offset */
if (osssink->offset >= 0LL) {
offset = osssink->offset;
}
ioctl (osssink->fd, SNDCTL_DSP_GETODELAY, &delay); ioctl (osssink->fd, SNDCTL_DSP_GETODELAY, &delay);
return offset + (osssink->handled - delay) * 1000000LL / osssink->bps; /* sometimes delay is bigger than the number of bytes sent to the device, which screws
* up this calculation, we assume that everything is still in the device then */
if (delay > osssink->handled) {
res = osssink->offset;
}
else {
res = osssink->offset + (osssink->handled - delay) * 1000000LL / osssink->bps;
}
/*
g_print ("from osssink: %lld %lld %d %lld %d\n", res, osssink->offset, delay, osssink->handled,
osssink->bps);
*/
return res;
} }
static void static void
@ -261,7 +270,8 @@ gst_osssink_init (GstOssSink *osssink)
#endif /* WORDS_BIGENDIAN */ #endif /* WORDS_BIGENDIAN */
/* gst_clock_register (osssink->clock, GST_OBJECT (osssink)); */ /* gst_clock_register (osssink->clock, GST_OBJECT (osssink)); */
osssink->bufsize = 4096; osssink->bufsize = 4096;
osssink->offset = -1LL; osssink->bps = 0;
osssink->offset = 0LL;
osssink->handled = 0LL; osssink->handled = 0LL;
/* 6 buffers per chunk by default */ /* 6 buffers per chunk by default */
osssink->sinkpool = gst_buffer_pool_get_default (osssink->bufsize, 6); osssink->sinkpool = gst_buffer_pool_get_default (osssink->bufsize, 6);
@ -472,12 +482,13 @@ gst_osssink_chain (GstPad *pad, GstBuffer *buf)
if (osssink->clock) { if (osssink->clock) {
/* FIXME, NEW_MEDIA/DISCONT?. Try to get our start point */ /* FIXME, NEW_MEDIA/DISCONT?. Try to get our start point */
if (osssink->offset == -1LL && buftime != -1LL) { if (!osssink->have_offset && buftime != -1LL) {
GST_INFO (GST_CAT_PLUGIN_INFO, GST_INFO (GST_CAT_PLUGIN_INFO,
"osssink: clock at offset: %lld, new offset %lld at time %lld\n", "osssink: clock at offset: %lld, new offset %lld at time %lld\n",
osssink->offset, buftime, gst_clock_get_time (osssink->clock)); osssink->offset, buftime, gst_clock_get_time (osssink->clock));
osssink->offset = buftime; osssink->offset = buftime;
osssink->have_offset = TRUE;
osssink->handled = 0; osssink->handled = 0;
gst_element_clock_wait (GST_ELEMENT (osssink), osssink->clock, buftime); gst_element_clock_wait (GST_ELEMENT (osssink), osssink->clock, buftime);
} }
@ -697,7 +708,8 @@ gst_osssink_change_state (GstElement *element)
} }
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_READY_TO_PAUSED:
osssink->offset = -1LL; osssink->offset = 0LL;
osssink->have_offset = FALSE;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_PAUSED_TO_PLAYING:
/* gst_clock_adjust (osssink->clock, osssink->offset - gst_clock_get_time (osssink->clock)); */ /* gst_clock_adjust (osssink->clock, osssink->offset - gst_clock_get_time (osssink->clock)); */

1
sys/oss/gstosssink.h
View file

@ -77,6 +77,7 @@ struct _GstOssSink {
gboolean mute; gboolean mute;
guint bufsize; guint bufsize;
guint bps; guint bps;
gboolean have_offset;
guint64 offset; guint64 offset;
guint64 handled; guint64 handled;