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

ext/alsa/gstalsaclock.c: Sanity check, don't wait endlessly since the clock might not actually run at this point (whi...

Browse source 
Original commit message from CVS:
* ext/alsa/gstalsaclock.c: (gst_alsa_clock_wait):
Sanity check, don't wait endlessly since the clock might not
actually run at this point (which is a deadlock). Fixes #164069.
This commit is contained in:
Ronald S. Bultje 2005-01-17 12:45:27 +00:00
parent 802e07ad33
commit 347cdcdfeb
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-01-17 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsaclock.c: (gst_alsa_clock_wait):
Sanity check, don't wait endlessly since the clock might not
actually run at this point (which is a deadlock). Fixes #164069.
2005-01-16 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2005-01-16 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/playback/gstplaybasebin.c: (probe_triggered): * gst/playback/gstplaybasebin.c: (probe_triggered):

9
ext/alsa/gstalsaclock.c
View file

@ -166,9 +166,10 @@ gst_alsa_clock_get_resolution (GstClock * clock)
static GstClockEntryStatus static GstClockEntryStatus
gst_alsa_clock_wait (GstClock * clock, GstClockEntry * entry) gst_alsa_clock_wait (GstClock * clock, GstClockEntry * entry)
{ {
GstClockTime target, entry_time; GstClockTime target, entry_time, glib_start, glib_cur;
GstClockTimeDiff diff; GstClockTimeDiff diff;
GstAlsaClock *this = GST_ALSA_CLOCK (clock); GstAlsaClock *this = GST_ALSA_CLOCK (clock);
GTimeVal t;
entry_time = gst_alsa_clock_get_internal_time (clock); entry_time = gst_alsa_clock_get_internal_time (clock);
diff = GST_CLOCK_ENTRY_TIME (entry) - gst_clock_get_time (clock); diff = GST_CLOCK_ENTRY_TIME (entry) - gst_clock_get_time (clock);
@ -192,10 +193,14 @@ gst_alsa_clock_wait (GstClock * clock, GstClockEntry * entry)
GST_TIME_ARGS (target), GST_TIME_ARGS (GST_CLOCK_ENTRY_TIME (entry)), GST_TIME_ARGS (target), GST_TIME_ARGS (GST_CLOCK_ENTRY_TIME (entry)),
GST_TIME_ARGS (entry_time)); GST_TIME_ARGS (entry_time));
g_get_current_time (&t);
glib_cur = glib_start = GST_TIMEVAL_TO_TIME (t);
while (gst_alsa_clock_get_internal_time (clock) < target && while (gst_alsa_clock_get_internal_time (clock) < target &&
this->last_unlock < entry_time) { this->last_unlock < entry_time && glib_start + diff * 1.5 > glib_cur) {
g_usleep (gst_alsa_clock_get_resolution (clock) * G_USEC_PER_SEC / g_usleep (gst_alsa_clock_get_resolution (clock) * G_USEC_PER_SEC /
GST_SECOND); GST_SECOND);
g_get_current_time (&t);
glib_cur = GST_TIMEVAL_TO_TIME (t);
} }
return entry->status; return entry->status;