/*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
* decoder of the writer node group.
*/
unsigned channels;
+ struct timeval drain_barrier;
};
/* Install PCM software and hardware configuration. */
return 1;
}
-static void alsa_write_pre_select_btr(struct sched *s, struct task *t)
+static void alsa_write_pre_select(struct sched *s, struct task *t)
{
struct writer_node *wn = container_of(t, struct writer_node, task);
struct private_alsa_write_data *pad = wn->private_data;
s->timeout = tv;
}
-static void xrun(snd_pcm_t *handle)
-{
- snd_pcm_status_t *status;
- int ret;
- struct timeval tv, diff;
-
- snd_pcm_status_alloca(&status);
- ret = snd_pcm_status(handle, status);
- if (ret < 0)
- return;
- if (snd_pcm_status_get_state(status) != SND_PCM_STATE_XRUN)
- return;
- snd_pcm_status_get_trigger_tstamp(status, &tv);
- tv_diff(now, &tv, &diff);
- PARA_WARNING_LOG("underrun: %lums\n", tv2ms(&diff));
-}
-
static void alsa_close(struct writer_node *wn)
{
struct private_alsa_write_data *pad = wn->private_data;
free(pad);
}
-static void alsa_write_post_select_btr(__a_unused struct sched *s,
+static void alsa_write_post_select(__a_unused struct sched *s,
struct task *t)
{
struct writer_node *wn = container_of(t, struct writer_node, task);
struct btr_node *btrn = wn->btrn;
char *data;
size_t bytes;
- snd_pcm_sframes_t frames, avail;
+ snd_pcm_sframes_t frames;
int ret;
again:
if (!pad->handle)
goto err;
/* wait until pending frames are played */
- avail = snd_pcm_avail_update(pad->handle);
- if (avail + 1000 > pad->buffer_frames)
+ if (pad->drain_barrier.tv_sec == 0) {
+ PARA_DEBUG_LOG("waiting for device to drain\n");
+ tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
+ &pad->drain_barrier);
+ return;
+ }
+ if (tv_diff(now, &pad->drain_barrier, NULL) > 0)
goto err;
- PARA_DEBUG_LOG("waiting for device to drain\n");
return;
}
if (!pad->handle) {
goto again;
}
if (frames == -EPIPE) {
- xrun(pad->handle);
+ PARA_WARNING_LOG("underrun (tried to write %zu bytes)\n", bytes);
snd_pcm_prepare(pad->handle);
return;
}
*
* \param w Pointer to the writer to initialize.
*
- * \sa \ref struct writer.
+ * \sa struct \ref writer.
*/
void alsa_write_init(struct writer *w)
{
alsa_cmdline_parser_init(&dummy);
w->open = alsa_open;
w->close = alsa_close;
- w->pre_select_btr = alsa_write_pre_select_btr;
- w->post_select_btr = alsa_write_post_select_btr;
+ w->pre_select = alsa_write_pre_select;
+ w->post_select = alsa_write_post_select;
w->parse_config = alsa_parse_config;
w->shutdown = NULL; /* nothing to do */
w->free_config = alsa_free_config;