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

diff --git a/osx_write.c b/osx_write.c
index f3917f64..65a5adc7 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -57,7 +57,7 @@ struct private_osx_write_data {
 	/** the post_select writes audio data here */
 	struct osx_buffer *to;
 	/** sample rate of the current audio stream */
-	unsigned samplerate;
+	unsigned sample_rate;
 	/** number of channels of the current audio stream */
 	unsigned channels;
 };
@@ -98,8 +98,7 @@ static void fill_buffer(struct osx_buffer *b, short *source, long size)
 {
 	float *dest;
 
-	if (b->remaining) /* Non empty buffer, must still be playing */
-		return;
+	assert(b->remaining == 0 || size > 0);
 	if (b->size != size) {
 		b->buffer = para_realloc(b->buffer, size * sizeof(float));
 		b->size = size;
@@ -129,9 +128,14 @@ static OSStatus osx_callback(void * inClientData,
 		m = outOutputData->mBuffers[i].mDataByteSize / sizeof(float);
 		dest = outOutputData->mBuffers[i].mData;
 		while (m > 0) {
-			if ((n = powd->from->remaining) <= 0) {
-				PARA_INFO_LOG("buffer underrun\n");
-				return 0;
+			n = powd->from->remaining;
+			if (n <= 0) {
+				n = powd->from->next->remaining;
+				if (n <= 0) {
+					PARA_INFO_LOG("buffer underrun\n");
+					return 0;
+				}
+				powd->from = powd->from->next;
 			}
 //			PARA_INFO_LOG("buf %p: n = %ld, m= %ld\n", powd->from->buffer, n, m);
 			/*
@@ -168,7 +172,7 @@ static int osx_write_open(struct writer_node *wn)
 	AudioStreamBasicDescription format;
 	int ret;
 	struct btr_node *btrn = wn->btrn;
-	struct osx_write_args_info *conf = wn->conf;
+	int32_t val;
 
 	wn->private_data = powd;
 	/* where did that default audio output go? */
@@ -189,18 +193,10 @@ static int osx_write_open(struct writer_node *wn)
 	if (AudioUnitInitialize(powd->audio_unit))
 		goto e1;
 	powd->play = 0;
-	powd->samplerate = conf->samplerate_arg;
-	powd->channels = conf->channels_arg;
-	if (!conf->samplerate_given) {
-		int32_t rate;
-		if (get_btr_samplerate(btrn, &rate) >= 0)
-			powd->samplerate = rate;
-	}
-	if (!conf->channels_given) {
-		int32_t ch;
-		if (get_btr_channels(btrn, &ch) >= 0)
-			powd->channels = ch;
-	}
+	get_btr_sample_rate(btrn, &val);
+	powd->sample_rate = val;
+	get_btr_channels(btrn, &val);
+	powd->channels = 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
@@ -208,7 +204,7 @@ static int osx_write_open(struct writer_node *wn)
 	 * any format conversions necessary from your format to the device's
 	 * format.
 	 */
-	format.mSampleRate = powd->samplerate;
+	format.mSampleRate = powd->sample_rate;
 	/* The specific encoding type of audio stream */
 	format.mFormatID = kAudioFormatLinearPCM;
 	/* flags specific to each format */
@@ -276,17 +272,6 @@ static void osx_write_close(struct writer_node *wn)
 	free(powd);
 }
 
-static int need_new_buffer(struct writer_node *wn)
-{
-	struct private_osx_write_data *powd = wn->private_data;
-
-	if (wn->min_iqs > btr_get_input_queue_size(wn->btrn))
-		return 0;
-	if (powd->to->remaining) /* Non empty buffer, must still be playing */
-		return 0;
-	return 1;
-}
-
 static void osx_write_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
@@ -294,25 +279,25 @@ static void osx_write_post_select(__a_unused struct sched *s, struct task *t)
 	struct btr_node *btrn = wn->btrn;
 	char *data;
 	size_t bytes;
-	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
+	int ret = 0;
 
-	if (ret <= 0)
-		goto out;
-	if (!need_new_buffer(wn))
-		goto out;
-	btr_merge(btrn, wn->min_iqs);
-	bytes = btr_next_buffer(btrn, &data);
-	fill_buffer(powd->to, (short *)data, bytes / sizeof(short));
-	btr_consume(btrn, bytes);
-	powd->to = powd->to->next;
-	if (!powd->play) {
-		ret = -E_UNIT_START;
-		if (AudioOutputUnitStart(powd->audio_unit))
-			goto out;
-		powd->play = 1;
+	while (powd->to->remaining <= 0) {
+		ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
+		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));
+		btr_consume(btrn, bytes);
+		if (!powd->play) {
+			ret = -E_UNIT_START;
+			if (AudioOutputUnitStart(powd->audio_unit))
+				break;
+			powd->play = 1;
+		}
+		powd->to = powd->to->next;
 	}
-	ret = 1;
-out:
 	if (ret < 0)
 		btr_remove_node(btrn);
 	t->error = ret;
@@ -331,7 +316,7 @@ static void osx_write_pre_select(struct sched *s, struct task *t)
 		sched_min_delay(s);
 	if (ret <= 0 || numbytes < wn->min_iqs)
 		return;
-	divisor = powd->samplerate * wn->min_iqs / numbytes;
+	divisor = powd->sample_rate * wn->min_iqs / numbytes;
 	if (divisor)
 		tv_divide(divisor, &tmp, &delay);
 	sched_request_timeout(&delay, s);