diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-12 23:46:55 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-12 23:46:55 +0000 |
| commit | ebc30828190af5aadc0b1356ece8b7aaf9e75526 (patch) | |
| tree | 14a1d706db53f1d4d1bfccdc3c5e4e06ea14393f | |
| parent | b809bf63c39827723718d98b024673adc305d3e8 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@168527 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_alsa.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 6b831ecad..3d32c8bb6 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; |