X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=7a4b868d251f0ee780647f72457b1c3162549bf0;hp=658183eacafca7ba9385177185b72392cf78d3d0;hb=a4f75cecaaee538edb7aae3f0ff19168a1dab59d;hpb=158e22fed53d462f8c7cb8ab527f81cc8e89a22b;ds=sidebyside

diff --git a/alsa_write.c b/alsa_write.c
index 658183ea..7a4b868d 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -39,7 +39,7 @@ struct private_alsa_write_data {
 	/** The alsa handle */
 	snd_pcm_t *handle;
 	/** Determined and set by alsa_open(). */
-	int bytes_per_frame; /* TODO: Kill this after btr switch */
+	int bytes_per_frame;
 	/** The approximate maximum buffer duration in us. */
 	unsigned buffer_time;
 	/* Number of frames that fit into the buffer. */
@@ -54,6 +54,7 @@ struct private_alsa_write_data {
 	 * decoder of the writer node group.
 	 */
 	unsigned channels;
+	struct timeval drain_barrier;
 };
 
 /* Install PCM software and hardware configuration. */
@@ -130,60 +131,27 @@ static int alsa_init(struct private_alsa_write_data *pad,
 }
 
 /* Open an instance of the alsa writer. */
-static int alsa_open_nobtr(struct writer_node *wn)
-{
-	struct alsa_write_args_info *conf = wn->conf;
-	struct writer_node_group *wng = wn->wng;
-	struct private_alsa_write_data *pad = para_calloc(sizeof(*pad));
-
-	wn->private_data = pad;
-	if (!conf->samplerate_given && wng->samplerate)
-		pad->samplerate = *wng->samplerate;
-	else
-		pad->samplerate = conf->samplerate_arg;
-	if (!conf->channels_given && wng->channels)
-		pad->channels = *wng->channels;
-	else
-		pad->channels = conf->channels_arg;
-	PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
-	return 1;
-}
-
-static int alsa_open_btr(struct writer_node *wn)
-{
-	struct private_alsa_write_data *pad = para_calloc(sizeof(*pad));
-
-	wn->private_data = pad;
-	return 1;
-}
 static int alsa_open(struct writer_node *wn)
 {
-	if (wn->btrn)
-		return alsa_open_btr(wn);
-	return alsa_open_nobtr(wn);
+	wn->private_data = para_calloc(sizeof(struct private_alsa_write_data));
+	return 1;
 }
 
-static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
+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;
-	struct writer_node_group *wng = wn->wng;
 	struct timeval tv;
 	snd_pcm_sframes_t avail, underrun;
+	int ret;
 
 	if (!pad->handle)
-		return 1;
-	if (wn->btrn) {
-		int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
-		if (ret == 0)
-			return 1;
-		if (ret < 0) {
-			sched_request_timeout_ms(20, s);
-			return 42;
-		}
-	} else {
-		if (*wng->loaded - wn->written < pad->bytes_per_frame)
-			return 1;
-	}
+		return;
+	ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
+	if (ret < 0)
+		sched_request_timeout_ms(20, s);
+	if (ret <= 0)
+		return;
 	/*
 	 * Data is available to be written to the alsa handle.  Compute number
 	 * of milliseconds until next buffer underrun would occur.
@@ -205,74 +173,6 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
 	ms2tv(underrun, &tv);
 	if (tv_diff(&s->timeout, &tv, NULL) > 0)
 		s->timeout = tv;
-	//PARA_CRIT_LOG("timout: %lu\n", tv2ms(&s->timeout));
-	return 1;
-}
-
-static void alsa_write_pre_select_btr(struct sched *s, struct task *t)
-{
-	struct writer_node *wn = container_of(t, struct writer_node, task);
-	alsa_write_pre_select(s, wn);
-}
-
-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 int alsa_write_post_select(__a_unused struct sched *s,
-		struct writer_node *wn)
-{
-	struct private_alsa_write_data *pad = wn->private_data;
-	struct writer_node_group *wng = wn->wng;
-	size_t bytes = *wng->loaded - wn->written;
-	unsigned char *data = (unsigned char*)*wng->bufp + wn->written;
-	snd_pcm_sframes_t ret, frames, avail;
-
-	if (*wng->input_error < 0 && (!pad->handle || bytes < pad->bytes_per_frame)) {
-		wn->written = *wng->loaded;
-		return *wng->input_error;
-	}
-	if (!bytes) /* no data available */
-		return 0;
-	if (!pad->handle) {
-		int err = alsa_init(pad, wn->conf);
-		if (err < 0)
-			return err;
-	}
-	frames = bytes / pad->bytes_per_frame;
-	if (!frames) /* less than a single frame available */
-		return 0;
-	avail = snd_pcm_avail_update(pad->handle);
-	if (avail <= 0)
-		return 0;
-	frames = PARA_MIN(frames, avail);
-	ret = snd_pcm_writei(pad->handle, data, frames);
-	if (ret >= 0) {
-		wn->written += ret * pad->bytes_per_frame;
-		return 1;
-	}
-	if (ret == -EPIPE) {
-		xrun(pad->handle);
-		snd_pcm_prepare(pad->handle);
-		return 0;
-	}
-	PARA_WARNING_LOG("%s\n", snd_strerror(-ret));
-	if (ret == -EAGAIN)
-		return 0;
-	return -E_ALSA_WRITE;
 }
 
 static void alsa_close(struct writer_node *wn)
@@ -293,7 +193,7 @@ static void alsa_close(struct writer_node *wn)
 	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);
@@ -301,7 +201,7 @@ static void alsa_write_post_select_btr(__a_unused struct sched *s,
 	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:
@@ -317,10 +217,14 @@ 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) {
@@ -332,20 +236,15 @@ again:
 		pad->channels = conf->channels_arg;
 		if (!conf->samplerate_given) { /* config option trumps btr_exec */
 			int32_t rate;
-			ret = get_btr_samplerate(btrn, &rate);
-			if (ret < 0)
-				goto err;
-			pad->samplerate = rate;
+			if (get_btr_samplerate(btrn, &rate) >= 0)
+				pad->samplerate = rate;
 		}
 		if (!conf->channels_given) {
 			int32_t ch;
-			ret = get_btr_channels(btrn, &ch);
-			if (ret < 0)
-				goto err;
-			pad->channels = ch;
+			if (get_btr_channels(btrn, &ch) >= 0)
+				pad->channels = ch;
 		}
 		PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
-		ret = 1;
 		ret = alsa_init(pad, wn->conf);
 		if (ret < 0)
 			goto err;
@@ -358,7 +257,7 @@ again:
 		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;
 	}
@@ -368,6 +267,7 @@ again:
 	ret = -E_ALSA_WRITE;
 err:
 	assert(ret < 0);
+	btr_remove_node(btrn);
 	t->error = ret;
 }
 
@@ -398,7 +298,7 @@ static void alsa_free_config(void *conf)
  *
  * \param w Pointer to the writer to initialize.
  *
- * \sa \ref struct writer.
+ * \sa struct \ref writer.
  */
 void alsa_write_init(struct writer *w)
 {
@@ -408,9 +308,7 @@ void alsa_write_init(struct writer *w)
 	w->open = alsa_open;
 	w->close = alsa_close;
 	w->pre_select = alsa_write_pre_select;
-	w->pre_select_btr = alsa_write_pre_select_btr;
 	w->post_select = alsa_write_post_select;
-	w->post_select_btr = alsa_write_post_select_btr;
 	w->parse_config = alsa_parse_config;
 	w->shutdown = NULL; /* nothing to do */
 	w->free_config = alsa_free_config;