X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=b82b3968baf214f3889cca805306438073e21ac6;hp=d0cff0150bf9c7690ffe2eb37f0a55b46d142c00;hb=f393aab6b6e8c7413c02b4e198666ad95570066c;hpb=9b565c60fd159e12d255bb18db9dbff066deebea

diff --git a/oss_write.c b/oss_write.c
index d0cff015..b82b3968 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -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,6 +33,19 @@ struct private_oss_write_data {
 	int bytes_per_frame;
 };
 
+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);
@@ -69,9 +79,10 @@ 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;
@@ -85,18 +96,16 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
 	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) {
@@ -106,7 +115,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
@@ -115,15 +127,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.
@@ -132,7 +144,7 @@ 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;
@@ -146,7 +158,6 @@ 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;
@@ -158,22 +169,16 @@ static void oss_post_select(__a_unused struct sched *s,
 	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);
+		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 */
@@ -183,7 +188,7 @@ static void oss_post_select(__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);