X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_write.c;h=cfd02e7453b1ccac04eb951e5f42009801806b55;hp=65a5adc79db3164ded3ef5a79070eb0ee71a43b4;hb=f3b4f3298d2dffdb84a121b7d4aa561975f79be9;hpb=009e80ae25df7a247a263b5b8e2259c9bdfe20ce

diff --git a/osx_write.c b/osx_write.c
index 65a5adc7..cfd02e74 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -58,6 +58,8 @@ struct private_osx_write_data {
 	struct osx_buffer *to;
 	/** sample rate of the current audio stream */
 	unsigned sample_rate;
+	/** Sample format of the current audio stream */
+	unsigned sample_format;
 	/** number of channels of the current audio stream */
 	unsigned channels;
 };
@@ -94,18 +96,41 @@ static void init_buffers(struct writer_node *wn)
 	*ptrptr = powd->from = powd->to;
 }
 
-static void fill_buffer(struct osx_buffer *b, short *source, long size)
+static void fill_buffer(struct private_osx_write_data *powd, char *data, long bytes)
 {
+	struct osx_buffer *b = powd->to;
 	float *dest;
+	long samples;
+	enum sample_format sf = powd->sample_format;
 
-	assert(b->remaining == 0 || size > 0);
-	if (b->size != size) {
-		b->buffer = para_realloc(b->buffer, size * sizeof(float));
-		b->size = size;
+	samples = (sf == SF_S8 || sf == SF_U8)? bytes : bytes / 2;
+	assert(b->remaining == 0 || samples > 0);
+	if (b->size != samples) {
+		b->buffer = para_realloc(b->buffer, samples * sizeof(float));
+		b->size = samples;
 	}
 	dest = b->buffer;
-	while (size--)
-		*dest++ = (*source++) / 32768.0;
+	switch (powd->sample_format) {
+	case SF_U8: {
+		uint8_t *src = (uint8_t *)data;
+		while (samples--) {
+			*dest++ = (*src++) / 256.0;
+		}
+		break;
+	}
+	case SF_S8: {
+		int8_t *src = (int8_t *)data;
+		while (samples--) {
+			*dest++ = ((*src++) + 128) / 256.0;
+		}
+		break;
+	}
+	default: {
+		short *src = (short *)data;
+		while (samples--)
+			*dest++ = (*src++) / 32768.0;
+	}
+	}
 	b->ptr = b->buffer;
 	b->remaining = b->size;
 }
@@ -164,8 +189,16 @@ static OSStatus osx_callback(void * inClientData,
 
 static int osx_write_open(struct writer_node *wn)
 {
-	struct private_osx_write_data *powd = para_calloc(
-		sizeof(struct private_osx_write_data));
+	struct private_osx_write_data *powd = para_calloc(sizeof(*powd));
+
+	wn->private_data = powd;
+	init_buffers(wn);
+	return 0;
+}
+
+static int core_audio_init(struct writer_node *wn)
+{
+	struct private_osx_write_data *powd = wn->private_data;
 	ComponentDescription desc;
 	Component comp;
 	AURenderCallbackStruct inputCallback = {osx_callback, powd};
@@ -174,7 +207,6 @@ static int osx_write_open(struct writer_node *wn)
 	struct btr_node *btrn = wn->btrn;
 	int32_t val;
 
-	wn->private_data = powd;
 	/* where did that default audio output go? */
 	desc.componentType = kAudioUnitType_Output;
 	desc.componentSubType = kAudioUnitSubType_DefaultOutput;
@@ -197,6 +229,8 @@ static int osx_write_open(struct writer_node *wn)
 	powd->sample_rate = val;
 	get_btr_channels(btrn, &val);
 	powd->channels = val;
+	get_btr_sample_format(btrn, &val);
+	powd->sample_format = val;
 	/*
 	 * Choose PCM format. We tell the Output Unit what format we're going
 	 * to supply data to it. This is necessary if you're providing data
@@ -204,31 +238,36 @@ static int osx_write_open(struct writer_node *wn)
 	 * any format conversions necessary from your format to the device's
 	 * format.
 	 */
-	format.mSampleRate = powd->sample_rate;
-	/* The specific encoding type of audio stream */
 	format.mFormatID = kAudioFormatLinearPCM;
+	format.mFramesPerPacket = 1;
+	format.mSampleRate = powd->sample_rate;
 	/* flags specific to each format */
 	format.mFormatFlags = kLinearPCMFormatFlagIsFloat
 		| kLinearPCMFormatFlagIsPacked
 		| ENDIAN_FLAGS;
+	switch (powd->sample_format) {
+	case SF_S8:
+	case SF_U8:
+		wn->min_iqs = powd->channels;
+		break;
+	default:
+		wn->min_iqs = powd->channels * 2;
+	}
+	format.mBitsPerChannel = 8 * sizeof(float);
+	format.mBytesPerPacket = powd->channels * sizeof(float);
+	format.mBytesPerFrame = format.mBytesPerPacket;
 	format.mChannelsPerFrame = powd->channels;
-	format.mFramesPerPacket = 1;
-	format.mBytesPerPacket = format.mChannelsPerFrame * sizeof(float);
-	format.mBytesPerFrame = format.mFramesPerPacket * format.mBytesPerPacket;
-	/* one of the most constant constants of the whole computer history */
-	format.mBitsPerChannel = sizeof(float) * 8;
+
 	ret = -E_STREAM_FORMAT;
 	if (AudioUnitSetProperty(powd->audio_unit, kAudioUnitProperty_StreamFormat,
 			kAudioUnitScope_Input, 0, &format,
 			sizeof(AudioStreamBasicDescription)))
 		goto e2;
-	init_buffers(wn);
 	ret = -E_ADD_CALLBACK;
 	if (AudioUnitSetProperty(powd->audio_unit, kAudioUnitProperty_SetRenderCallback,
 			kAudioUnitScope_Input, 0, &inputCallback,
 			sizeof(inputCallback)) < 0)
 		goto e3;
-	wn->min_iqs = powd->channels * 2;
 	return 1;
 e3:
 	destroy_buffers(powd);
@@ -285,10 +324,15 @@ static void osx_write_post_select(__a_unused struct sched *s, struct task *t)
 		ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 		if (ret <= 0)
 			break;
+		if (powd->sample_rate == 0) {
+			ret = core_audio_init(wn);
+			if (ret < 0)
+				break;
+		}
 		btr_merge(btrn, 8192);
 		bytes = btr_next_buffer(btrn, &data);
 		//PARA_CRIT_LOG("have: %zu\n", bytes);
-		fill_buffer(powd->to, (short *)data, bytes / sizeof(short));
+		fill_buffer(powd, data, bytes);
 		btr_consume(btrn, bytes);
 		if (!powd->play) {
 			ret = -E_UNIT_START;
@@ -298,9 +342,10 @@ static void osx_write_post_select(__a_unused struct sched *s, struct task *t)
 		}
 		powd->to = powd->to->next;
 	}
-	if (ret < 0)
+	if (ret < 0 && powd->from->remaining <= 0) {
 		btr_remove_node(btrn);
-	t->error = ret;
+		t->error = ret;
+	}
 }
 
 static void osx_write_pre_select(struct sched *s, struct task *t)