From 2d945f96dcd02bcabd02a79342712e089ed30c98 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 26 Nov 2008 00:27:55 +0100 Subject: [PATCH] alsa: Improve chunk timings. And get rid of magic constants. --- alsa_write.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/alsa_write.c b/alsa_write.c index 8e8b693c..91638156 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -186,14 +186,16 @@ static int alsa_write_post_select(__a_unused struct sched *s, frames, (int)ret); return -E_ALSA_WRITE; } - if (ret == -EAGAIN) { /* try again in 5ms */ - PARA_WARNING_LOG("EAGAIN\n"); - ms2tv(5, &tv); - } else { + if (ret == -EAGAIN) + PARA_DEBUG_LOG("EAGAIN\n"); + else wn->written += ret * pad->bytes_per_frame; - ms2tv(pad->buffer_time / 4000, &tv); + if (ret == frames) /* we wrote everything, try again immediately */ + pad->next_chunk = *now; + else { + ms2tv(pad->buffer_time / pad->bytes_per_frame / 1000, &tv); + tv_add(now, &tv, &pad->next_chunk); } - tv_add(now, &tv, &pad->next_chunk); return 1; } -- 2.30.2