X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=8cf5cfd25bf3909e0f4d338d2397ca0e017c29ab;hp=7a4b868d251f0ee780647f72457b1c3162549bf0;hb=c387b216b5fd3c944053e1bba024815719e9a0d9;hpb=b0fe6d882dd35b01360a66e130d6714aff7b6a0d

diff --git a/alsa_write.c b/alsa_write.c
index 7a4b868d..8cf5cfd2 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -31,24 +31,22 @@
 #include "alsa_write.cmdline.h"
 #include "error.h"
 
-/** always use 16 bit little endian */
-#define FORMAT SND_PCM_FORMAT_S16_LE
-
 /** Data specific to the alsa writer. */
 struct private_alsa_write_data {
 	/** The alsa handle */
 	snd_pcm_t *handle;
-	/** Determined and set by alsa_open(). */
+	/** Determined and set by alsa_init(). */
 	int bytes_per_frame;
 	/** The approximate maximum buffer duration in us. */
 	unsigned buffer_time;
 	/* Number of frames that fit into the buffer. */
 	snd_pcm_uframes_t buffer_frames;
 	/**
-	 * The samplerate given by command line option or the decoder
+	 * The sample rate given by command line option or the decoder
 	 * of the writer node group.
 	 */
-	unsigned samplerate;
+	unsigned sample_rate;
+	snd_pcm_format_t sample_format;
 	/**
 	 * The number of channels, given by command line option or the
 	 * decoder of the writer node group.
@@ -57,6 +55,19 @@ struct private_alsa_write_data {
 	struct timeval drain_barrier;
 };
 
+static snd_pcm_format_t get_alsa_pcm_format(enum sample_format sf)
+{
+	switch (sf) {
+	case SF_S8: return SND_PCM_FORMAT_S8;
+	case SF_U8: return SND_PCM_FORMAT_U8;
+	case SF_S16_LE: return SND_PCM_FORMAT_S16_LE;
+	case SF_S16_BE: return SND_PCM_FORMAT_S16_BE;
+	case SF_U16_LE: return SND_PCM_FORMAT_U16_LE;
+	case SF_U16_BE: return SND_PCM_FORMAT_U16_BE;
+	default: return SND_PCM_FORMAT_S16_LE;
+	}
+}
+
 /* Install PCM software and hardware configuration. */
 static int alsa_init(struct private_alsa_write_data *pad,
 		struct alsa_write_args_info *conf)
@@ -80,13 +91,14 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	if (snd_pcm_hw_params_set_access(pad->handle, hwparams,
 			SND_PCM_ACCESS_RW_INTERLEAVED) < 0)
 		return -E_ACCESS_TYPE;
-	if (snd_pcm_hw_params_set_format(pad->handle, hwparams, FORMAT) < 0)
+	if (snd_pcm_hw_params_set_format(pad->handle, hwparams,
+			pad->sample_format) < 0)
 		return -E_SAMPLE_FORMAT;
 	if (snd_pcm_hw_params_set_channels(pad->handle, hwparams,
 			pad->channels) < 0)
 		return -E_CHANNEL_COUNT;
 	if (snd_pcm_hw_params_set_rate_near(pad->handle, hwparams,
-			&pad->samplerate, NULL) < 0)
+			&pad->sample_rate, NULL) < 0)
 		return -E_SET_RATE;
 	err = snd_pcm_hw_params_get_buffer_time_max(hwparams,
 		&pad->buffer_time, NULL);
@@ -110,7 +122,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		start_threshold = 1;
 	else
 		start_threshold = PARA_MIN(pad->buffer_frames,
-			(snd_pcm_uframes_t)pad->samplerate);
+			(snd_pcm_uframes_t)pad->sample_rate);
 	if (snd_pcm_sw_params_set_start_threshold(pad->handle, swparams,
 			start_threshold) < 0)
 		return -E_START_THRESHOLD;
@@ -120,7 +132,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		return -E_STOP_THRESHOLD;
 	if (snd_pcm_sw_params(pad->handle, swparams) < 0)
 		PARA_WARNING_LOG("unable to install sw params\n");
-	pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
+	pad->bytes_per_frame = snd_pcm_format_physical_width(pad->sample_format)
 		* pad->channels / 8;
 	if (pad->bytes_per_frame <= 0)
 		return -E_PHYSICAL_WIDTH;
@@ -130,28 +142,18 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	return 1;
 }
 
-/* Open an instance of the alsa writer. */
-static int alsa_open(struct writer_node *wn)
-{
-	wn->private_data = para_calloc(sizeof(struct private_alsa_write_data));
-	return 1;
-}
-
 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 timeval tv;
 	snd_pcm_sframes_t avail, underrun;
-	int ret;
+	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
-	if (!pad->handle)
-		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)
+	if (ret == 0)
 		return;
+	if (ret < 0 || !pad)
+		return sched_min_delay(s);
 	/*
 	 * Data is available to be written to the alsa handle.  Compute number
 	 * of milliseconds until next buffer underrun would occur.
@@ -171,8 +173,7 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 		underrun = 50;
 	underrun -= 50;
 	ms2tv(underrun, &tv);
-	if (tv_diff(&s->timeout, &tv, NULL) > 0)
-		s->timeout = tv;
+	sched_request_timeout(&tv, s);
 }
 
 static void alsa_close(struct writer_node *wn)
@@ -180,16 +181,16 @@ static void alsa_close(struct writer_node *wn)
 	struct private_alsa_write_data *pad = wn->private_data;
 	PARA_INFO_LOG("closing writer node %p\n", wn);
 
-	if (pad->handle) {
-		/*
-		 * It's OK to have a blocking operation here because we already
-		 * made sure that the PCM output buffer is (nearly) empty.
-		 */
-		snd_pcm_nonblock(pad->handle, 0);
-		snd_pcm_drain(pad->handle);
-		snd_pcm_close(pad->handle);
-		snd_config_update_free_global();
-	}
+	if (!pad)
+		return;
+	/*
+	 * It's OK to have a blocking operation here because we already made
+	 * sure that the PCM output buffer is (nearly) empty.
+	 */
+	snd_pcm_nonblock(pad->handle, 0);
+	snd_pcm_drain(pad->handle);
+	snd_pcm_close(pad->handle);
+	snd_config_update_free_global();
 	free(pad);
 }
 
@@ -211,10 +212,10 @@ again:
 		return;
 	btr_merge(btrn, wn->min_iqs);
 	bytes = btr_next_buffer(btrn, &data);
-	if (ret < 0 || bytes < pad->bytes_per_frame) { /* eof */
+	if (ret < 0 || bytes < wn->min_iqs) { /* eof */
 		assert(btr_no_parent(btrn));
-		ret = -E_ALSA_EOF;
-		if (!pad->handle)
+		ret = -E_WRITE_COMMON_EOF;
+		if (!pad)
 			goto err;
 		/* wait until pending frames are played */
 		if (pad->drain_barrier.tv_sec == 0) {
@@ -227,28 +228,29 @@ again:
 			goto err;
 		return;
 	}
-	if (!pad->handle) {
-		struct alsa_write_args_info *conf = wn->conf;
+	if (!pad) {
+		int32_t val;
+
 		if (bytes == 0) /* no data available */
 			return;
-		/* defaults */
-		pad->samplerate = conf->samplerate_arg;
-		pad->channels = conf->channels_arg;
-		if (!conf->samplerate_given) { /* config option trumps btr_exec */
-			int32_t rate;
-			if (get_btr_samplerate(btrn, &rate) >= 0)
-				pad->samplerate = rate;
-		}
-		if (!conf->channels_given) {
-			int32_t ch;
-			if (get_btr_channels(btrn, &ch) >= 0)
-				pad->channels = ch;
-		}
-		PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
+		pad = para_calloc(sizeof(*pad));
+		get_btr_sample_rate(btrn, &val);
+		pad->sample_rate = val;
+		get_btr_channels(btrn, &val);
+		pad->channels = val;
+		get_btr_sample_format(btrn, &val);
+		pad->sample_format = get_alsa_pcm_format(val);
+
+		PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
+			pad->sample_rate);
 		ret = alsa_init(pad, wn->conf);
-		if (ret < 0)
+		if (ret < 0) {
+			free(pad);
 			goto err;
+		}
+		wn->private_data = pad;
 		wn->min_iqs = pad->bytes_per_frame;
+		goto again;
 	}
 	frames = bytes / pad->bytes_per_frame;
 	frames = snd_pcm_writei(pad->handle, data, frames);
@@ -271,21 +273,14 @@ err:
 	t->error = ret;
 }
 
-__malloc static void *alsa_parse_config(const char *options)
+__malloc static void *alsa_parse_config_or_die(const char *options)
 {
-	int ret;
-	struct alsa_write_args_info *conf
-		= para_calloc(sizeof(struct alsa_write_args_info));
+	struct alsa_write_args_info *conf = para_calloc(sizeof(*conf));
 
 	PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
-	ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
-	if (ret)
-		goto err_out;
-	PARA_INFO_LOG("help given: %d\n", conf->help_given);
+	/* exits on errors */
+	alsa_cmdline_parser_string(options, conf, "alsa_write");
 	return conf;
-err_out:
-	free(conf);
-	return NULL;
 }
 
 static void alsa_free_config(void *conf)
@@ -305,11 +300,10 @@ void alsa_write_init(struct writer *w)
 	struct alsa_write_args_info dummy;
 
 	alsa_cmdline_parser_init(&dummy);
-	w->open = alsa_open;
 	w->close = alsa_close;
 	w->pre_select = alsa_write_pre_select;
 	w->post_select = alsa_write_post_select;
-	w->parse_config = alsa_parse_config;
+	w->parse_config_or_die = alsa_parse_config_or_die;
 	w->shutdown = NULL; /* nothing to do */
 	w->free_config = alsa_free_config;
 	w->help = (struct ggo_help) {