From a4fd6ae437a37d116e837f2049e82d35af1b2921 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 12 Jan 2009 23:46:55 +0000 Subject: [PATCH] Merged revisions 168526 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r168526 | tilghman | 2009-01-12 17:45:51 -0600 (Mon, 12 Jan 2009) | 12 lines Merged revisions 167095 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r167095 | tilghman | 2008-12-31 18:01:22 -0600 (Wed, 31 Dec 2008) | 5 lines Repeat attempts to write when we receive -EAGAIN from the driver, as detailed in the ALSA sample code (see http://www.alsa-project.org/alsa-doc/alsa-lib/_2test_2pcm_8c-example.html#a32) Reported by: Jerry Geis (via the -users list) Fixed by: me (license 14) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168527 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_alsa.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 6b831ecad3..3d32c8bb69 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -381,13 +381,17 @@ static int alsa_write(struct ast_channel *chan, struct ast_frame *f) state = snd_pcm_state(alsa.ocard); if (state == SND_PCM_STATE_XRUN) snd_pcm_prepare(alsa.ocard); - res = snd_pcm_writei(alsa.ocard, sizbuf, len / 2); + while ((res = snd_pcm_writei(alsa.ocard, sizbuf, len / 2)) == -EAGAIN) { + usleep(1); + } if (res == -EPIPE) { #if DEBUG ast_debug(1, "XRUN write\n"); #endif snd_pcm_prepare(alsa.ocard); - res = snd_pcm_writei(alsa.ocard, sizbuf, len / 2); + while ((res = snd_pcm_writei(alsa.ocard, sizbuf, len / 2)) == -EAGAIN) { + usleep(1); + } if (res != len / 2) { ast_log(LOG_ERROR, "Write error: %s\n", snd_strerror(res)); res = -1;