X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_writer.c;h=2af553db4386561ff58cc1652be235f30f8f551a;hp=c07bbd51e6577152408eda231f5a0e1697b1bbd5;hb=db02b614d1231685e64b27b4838c7cd699e51790;hpb=33a65b86a516e56bc308c2330dec472b38321a8e

diff --git a/osx_writer.c b/osx_writer.c
index c07bbd51..2af553db 100644
--- a/osx_writer.c
+++ b/osx_writer.c
@@ -50,6 +50,7 @@ struct private_osx_writer_data {
 	sem_t *semaphore;
 	osx_buffer *from; /* Current buffers */
 	osx_buffer *to;
+	unsigned samplerate;
 };
 
 
@@ -99,9 +100,9 @@ static void fill_buffer(osx_buffer *b, short *source, long size)
 {
 	float *dest;
 
-	PARA_INFO_LOG("%ld\n", size);
 	if (b->remaining) /* Non empty buffer, must still be playing */
 		return;
+	PARA_INFO_LOG("%ld\n", size);
 	if (b->size != size) {
 		/*
 		 * Hey! What's that? Coudn't this buffer size be fixed
@@ -113,9 +114,14 @@ static void fill_buffer(osx_buffer *b, short *source, long size)
 		b->size = size;
 	}
 	dest = b->buffer;
-	while (size--)
+	while (size--) {
+		char *tmp = (char *)source;
+		char c = *tmp;
+		*tmp = *(tmp + 1);
+		*(tmp + 1) = c;
 		/* *dest++ = ((*source++) + 32768) / 65536.0; */
 		*dest++ = (*source++) / 32768.0;
+	}
 	b->ptr = b->buffer;
 	b->remaining = b->size;
 }
@@ -144,6 +150,7 @@ static OSStatus osx_callback(void * inClientData,
 					/* wait for the results */
 					usleep(2000);
 			}
+			PARA_INFO_LOG("buf %p: n = %ld, m= %ld\n", powd->from->buffer, n, m);
 			/*
 			 * we dump what we can. In fact, just the necessary
 			 * should be sufficient
@@ -175,6 +182,8 @@ static int osx_writer_open(struct writer_node *wn)
 	AudioStreamBasicDescription format;
 	char s[10];
 	int m, ret;
+	struct writer_node_group *wng = wn->wng;
+	struct osx_write_args_info *conf = wn->conf;
 
 	wn->private_data = powd;
 	/* where did that default audio output go? */
@@ -203,13 +212,17 @@ static int osx_writer_open(struct writer_node *wn)
 	 * AND you want the DefaultOutputUnit to do any format conversions
 	 * necessary from your format to the device's format.
 	 */
-	format.mSampleRate = 44100.0; /* The sample rate of the audio stream */
+	if (!conf->samplerate_given && wng->samplerate)
+		powd->samplerate = *wng->samplerate;
+	else
+		powd->samplerate = conf->samplerate_arg;
+	format.mSampleRate = powd->samplerate;
 	/* The specific encoding type of audio stream*/
 	format.mFormatID = kAudioFormatLinearPCM;
 	/* flags specific to each format */
 	format.mFormatFlags = kLinearPCMFormatFlagIsFloat
-		| kLinearPCMFormatFlagIsPacked;
-	//	| kLinearPCMFormatFlagIsBigEndian;
+		| kLinearPCMFormatFlagIsPacked
+		| kLinearPCMFormatFlagIsBigEndian;
 	/*
 	 * We produce 2-channel audio. Now if we have a mega-super-hyper card for our
 	 * audio, it is its problem to convert it to 8-, 16-, 32- or 1024-channel data.
@@ -239,7 +252,7 @@ static int osx_writer_open(struct writer_node *wn)
 			kAudioUnitScope_Input, 0, &inputCallback,
 			sizeof(inputCallback)) < 0)
 		goto e3;
-	return 0;
+	return 1;
 e3:
 	destroy_buffers(powd);
 e2:
@@ -278,20 +291,30 @@ static void osx_writer_close(struct writer_node *wn)
 	free(powd);
 }
 
+static int need_new_buffer(struct writer_node *wn)
+{
+	struct writer_node_group *wng = wn->wng;
+	struct private_osx_writer_data *powd = wn->private_data;
+
+	if (*wng->loaded < sizeof(short))
+		return 0;
+	if (powd->to->remaining) /* Non empty buffer, must still be playing */
+		return 0;
+	return 1;
+}
+
 static int osx_write_post_select(__a_unused struct sched *s,
 		struct writer_node *wn)
 {
 	struct private_osx_writer_data *powd = wn->private_data;
 	struct writer_node_group *wng = wn->wng;
-	short *data = (short*)wng->buf + wn->written;
+	short *data = (short*)wng->buf;
 
-	if (!*wng->loaded)
+	if (!need_new_buffer(wn))
 		return 1;
-	if (powd->to->remaining) /* Non empty buffer, must still be playing */
-		return 1;
-	fill_buffer(powd->to, data, (*wng->loaded - wn->written) / sizeof(short));
+	fill_buffer(powd->to, data, *wng->loaded / sizeof(short));
 	powd->to = powd->to->next;
-	wn->written += (*wng->loaded - wn->written);
+	wn->written = *wng->loaded;
 	if (!powd->play) {
 		if (AudioOutputUnitStart(powd->output))
 			return -1;
@@ -300,15 +323,8 @@ static int osx_write_post_select(__a_unused struct sched *s,
 	return 1;
 }
 
-static int osx_write_pre_select(struct sched *s, struct writer_node *wn)
+static int osx_write_pre_select(struct sched *s, __a_unused struct writer_node *wn)
 {
-	struct writer_node_group *wng = wn->wng;
-	struct private_osx_writer_data *powd = wn->private_data;
-
-//	if (!*wng->loaded)
-//		return 1;
-//	if (powd->to->remaining) /* Non empty buffer, must still be playing */
-//		return 1;
 	s->timeout.tv_sec = 0;
 	s->timeout.tv_usec = 20;
 	return 1;