mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 03:35:21 +00:00
ext/alsa/gstalsasink.c: Add some more debug info.
Original commit message from CVS: Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com> * ext/alsa/gstalsasink.c: (set_hwparams), (gst_alsasink_delay): Add some more debug info. Make sure we never return a negative delay. Fixes #516246.
This commit is contained in:
parent
20081431d1
commit
19ee588d64
2 changed files with 16 additions and 0 deletions
|
@ -1,3 +1,11 @@
|
|||
2008-02-13 Wim Taymans <wim.taymans@collabora.co.uk>
|
||||
|
||||
Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com>
|
||||
|
||||
* ext/alsa/gstalsasink.c: (set_hwparams), (gst_alsasink_delay):
|
||||
Add some more debug info.
|
||||
Make sure we never return a negative delay. Fixes #516246.
|
||||
|
||||
2008-02-12 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* ext/alsa/gstalsasink.c: (gst_alsasink_delay):
|
||||
|
|
|
@ -397,6 +397,7 @@ retry:
|
|||
buffer_time = -1;
|
||||
goto retry;
|
||||
}
|
||||
GST_DEBUG_OBJECT (alsa, "buffer time %u", buffer_time);
|
||||
}
|
||||
if (period_time != -1) {
|
||||
/* set the period time */
|
||||
|
@ -409,6 +410,7 @@ retry:
|
|||
period_time = -1;
|
||||
goto retry;
|
||||
}
|
||||
GST_DEBUG_OBJECT (alsa, "period time %u", period_time);
|
||||
}
|
||||
|
||||
/* write the parameters to device */
|
||||
|
@ -858,9 +860,15 @@ gst_alsasink_delay (GstAudioSink * asink)
|
|||
|
||||
res = snd_pcm_delay (alsa->handle, &delay);
|
||||
if (G_UNLIKELY (res < 0)) {
|
||||
/* on errors, report 0 delay */
|
||||
GST_DEBUG_OBJECT (alsa, "snd_pcm_delay returned %d", res);
|
||||
delay = 0;
|
||||
}
|
||||
if (G_UNLIKELY (delay < 0)) {
|
||||
/* make sure we never return a negative delay */
|
||||
GST_WARNING_OBJECT (alsa, "snd_pcm_delay returned negative delay");
|
||||
delay = 0;
|
||||
}
|
||||
|
||||
return delay;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue