X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=df9608a8c6a2bbb9b3787df76ce8ec7931604e16;hp=b002113caeb5e3c7dd75c78080a4fb9cead20510;hb=481150224edabeee0a6bbfdab232df58e5c1224e;hpb=28e9fc661113f219f8e11f4e23723a176d9ac09c

diff --git a/oss_write.c b/oss_write.c
index b002113c..df9608a8 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -25,9 +25,6 @@
 #include "oss_write.cmdline.h"
 #include "error.h"
 
-/** Always use 16 bit little endian. */
-#define FORMAT AFMT_S16_LE
-
 /** Data specific to the oss writer. */
 struct private_oss_write_data {
 	/** The file handle of the device. */
@@ -36,23 +33,38 @@ struct private_oss_write_data {
 	int bytes_per_frame;
 };
 
-static void oss_pre_select_btr(struct sched *s, struct task *t)
+static int get_oss_format(enum sample_format sf)
+{
+	switch (sf) {
+	case SF_S8: return AFMT_S8;
+	case SF_U8: return AFMT_U8;
+	case SF_S16_LE: return AFMT_S16_LE;
+	case SF_S16_BE: return AFMT_S16_BE;
+	case SF_U16_LE: return AFMT_U16_LE;
+	case SF_U16_BE: return AFMT_U16_BE;
+	default: return AFMT_S16_LE;
+	}
+}
+
+static void oss_pre_select(struct sched *s, struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
 	struct private_oss_write_data *powd = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
-	t->error = 0;
-	if (ret < 0)
-		sched_min_delay(s);
-	else if (ret > 0)
-		para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
+	if (ret == 0)
+		return;
+	if (ret < 0 || !powd)
+		return sched_min_delay(s);
+	para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
 }
 
 static void oss_close(struct writer_node *wn)
 {
 	struct private_oss_write_data *powd = wn->private_data;
 
+	if (!powd)
+		return;
 	close(powd->fd);
 	free(powd);
 }
@@ -68,34 +80,34 @@ static void oss_close(struct writer_node *wn)
  * incorrectly believe that the device is still in 44.1 kHz mode when actually
  * the speed is decreased to 22.05 kHz.
  */
-static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channels)
+static int oss_init(struct writer_node *wn, unsigned sample_rate,
+		unsigned channels, int sample_format)
 {
-	int ret, format = FORMAT;
+	int ret, format;
 	unsigned ch, rate;
 	struct oss_write_args_info *conf = wn->conf;
-	struct private_oss_write_data *powd = wn->private_data;
+	struct private_oss_write_data *powd = para_calloc(sizeof(*powd));
 
+	wn->private_data = powd;
 	PARA_INFO_LOG("opening %s\n", conf->device_arg);
 	ret = para_open(conf->device_arg, O_WRONLY, 0);
 	if (ret < 0)
-		return ret;
+		goto err_free;
 	powd->fd = ret;
 	ret = mark_fd_nonblocking(powd->fd);
 	if (ret < 0)
 		goto err;
 	/* set PCM format */
+	sample_format = format = get_oss_format(sample_format);
 	ret = ioctl(powd->fd, SNDCTL_DSP_SETFMT, &format);
 	if (ret < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err;
 	}
 	ret = -E_BAD_SAMPLE_FORMAT;
-	if (format != FORMAT)
+	if (format != sample_format)
 		goto err;
 	/* set number of channels */
-	ret = -E_BAD_CHANNEL_COUNT;
-	if (channels == 0)
-		goto err;
 	ch = channels;
 	ret = ioctl(powd->fd, SNDCTL_DSP_CHANNELS, &ch);
 	if (ret < 0) {
@@ -105,7 +117,10 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
 	ret = -E_BAD_CHANNEL_COUNT;
 	if (ch != channels)
 		goto err;
-	powd->bytes_per_frame = ch * 2;
+	if (format == SF_U8 || format == SF_S8)
+		powd->bytes_per_frame = ch;
+	else
+		powd->bytes_per_frame = ch * 2;
 
 	/*
 	 * Set sampling rate
@@ -114,15 +129,15 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
 	 * device, the the highest possible speed is automatically used. The
 	 * value actually used is returned as the new value of the argument.
 	 */
-	rate = samplerate;
+	rate = sample_rate;
 	ret = ioctl(powd->fd, SNDCTL_DSP_SPEED, &rate);
 	if (ret < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err;
 	}
-	if (rate != samplerate) {
-		unsigned min = PARA_MIN(rate, samplerate),
-			max = PARA_MAX(rate, samplerate);
+	if (rate != sample_rate) {
+		unsigned min = PARA_MIN(rate, sample_rate),
+			max = PARA_MAX(rate, sample_rate);
 		/*
 		 * Check whether the returned sample rate differs significantly
 		 * from the requested one.
@@ -131,21 +146,21 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
 		if (100 * max > 110 * min) /* more than 10% deviation */
 			goto err;
 		PARA_NOTICE_LOG("using %dHz rather than %dHz\n", rate,
-			samplerate);
+			sample_rate);
 	}
 	wn->min_iqs = powd->bytes_per_frame;
 	return 1;
 err:
 	close(powd->fd);
+err_free:
 	free(powd);
 	return ret;
 }
 
-static void oss_post_select_btr(__a_unused struct sched *s,
+static void oss_post_select(__a_unused struct sched *s,
 		struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
-	struct oss_write_args_info *conf = wn->conf;
 	struct private_oss_write_data *powd = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	size_t frames, bytes;
@@ -156,23 +171,17 @@ static void oss_post_select_btr(__a_unused struct sched *s,
 		goto out;
 	if (ret == 0)
 		return;
-	if (powd->fd < 0) {
-		int32_t rate, ch;
-		ret = -1;
-		if (!conf->samplerate_given) /* config option trumps btr_exec */
-			ret = get_btr_samplerate(wn->btrn, &rate);
-		if (ret < 0)
-			rate = conf->samplerate_arg;
-		ret = -1;
-		if (!conf->channels_given)
-			ret = get_btr_channels(wn->btrn, &ch);
-		if (ret < 0)
-			ch = conf->channels_arg;
-		ret = oss_init(wn, rate, ch);
+	if (!powd) {
+		int32_t rate, ch, format;
+		get_btr_sample_rate(btrn, &rate);
+		get_btr_channels(btrn, &ch);
+		get_btr_sample_format(btrn, &format);
+		ret = oss_init(wn, rate, ch, format);
 		if (ret < 0)
 			goto out;
 		return;
 	}
+	btr_merge(btrn, wn->min_iqs);
 	bytes = btr_next_buffer(btrn, &data);
 	frames = bytes / powd->bytes_per_frame;
 	if (!frames) { /* eof and less than a single frame available */
@@ -182,7 +191,7 @@ static void oss_post_select_btr(__a_unused struct sched *s,
 	ret = 0;
 	if (!FD_ISSET(powd->fd, &s->wfds))
 		goto out;
-	ret = write_nonblock(powd->fd, data, frames * powd->bytes_per_frame, 0);
+	ret = write_nonblock(powd->fd, data, frames * powd->bytes_per_frame);
 	if (ret < 0)
 		goto out;
 	btr_consume(btrn, ret);
@@ -193,28 +202,13 @@ out:
 		btr_remove_node(btrn);
 }
 
-static int oss_open(struct writer_node *wn)
-{
-	struct private_oss_write_data *powd;
-
-	powd = para_calloc(sizeof(*powd));
-	wn->private_data = powd;
-	powd->fd = -1;
-	return 1;
-}
-
-__malloc static void *oss_parse_config(const char *options)
+__malloc static void *oss_parse_config_or_die(const char *options)
 {
-	int ret;
 	struct oss_write_args_info *conf = para_calloc(sizeof(*conf));
 
-	ret = oss_cmdline_parser_string(options, conf, "oss_write");
-	if (ret)
-		goto err_out;
+	/* exits on errors */
+	oss_cmdline_parser_string(options, conf, "oss_write");
 	return conf;
-err_out:
-	free(conf);
-	return NULL;
 }
 
 static void oss_free_config(void *conf)
@@ -234,11 +228,10 @@ void oss_write_init(struct writer *w)
 	struct oss_write_args_info dummy;
 
 	oss_cmdline_parser_init(&dummy);
-	w->open = oss_open;
 	w->close = oss_close;
-	w->pre_select_btr = oss_pre_select_btr;
-	w->post_select_btr = oss_post_select_btr;
-	w->parse_config = oss_parse_config;
+	w->pre_select = oss_pre_select;
+	w->post_select = oss_post_select;
+	w->parse_config_or_die = oss_parse_config_or_die;
 	w->free_config = oss_free_config;
 	w->shutdown = NULL;
 	w->help = (struct ggo_help) {