From: Andre Noll <maan@congo.fml.local>
Date: Thu, 24 Aug 2006 18:58:33 +0000 (+0200)
Subject: osx_write: make number of buffers configurable
X-Git-Tag: v0.2.14~29
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=13036259ef9841f4aedfc9d0765d189292a6f799;ds=inline

osx_write: make number of buffers configurable

Two buffers seems to be too less for mp3.
---

diff --git a/osx_write.c b/osx_write.c
index 87d700cc..b3049c5a 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -55,16 +55,6 @@ struct private_osx_write_data {
 	unsigned channels;
 };
 
-
-/*
- * Tried with 3 buffers, but then any little window move is sufficient to
- * stop the sound (OK, on a G3 400 with a Public Beta. Perhaps now we can
- * go down to 2 buffers). With 16 buffers we have 1.5 seconds music
- * buffered (or, if you're pessimistic, 1.5 seconds latency). Note 0
- * buffers don't work much further than the Bus error.
- */
-#define NUMBER_BUFFERS 2
-
 static void destroy_buffers(struct private_osx_write_data *powd)
 {
 	struct osx_buffer *ptr;
@@ -79,13 +69,15 @@ static void destroy_buffers(struct private_osx_write_data *powd)
 	}
 }
 
-static void init_buffers(struct private_osx_write_data *powd)
+static void init_buffers(struct writer_node *wn)
 {
+	struct private_osx_write_data *powd = wn->private_data;
+	struct osx_write_args_info *conf = wn->conf;
+	struct osx_buffer **ptrptr;
 	int i;
 
-	struct osx_buffer **ptrptr;
 	ptrptr = &powd->to;
-	for (i = 0; i < NUMBER_BUFFERS; i++) {
+	for (i = 0; i < conf->numbuffers_arg; i++) {
 		*ptrptr = malloc(sizeof(struct osx_buffer));
 		(*ptrptr)->size = 0;
 		(*ptrptr)->remaining = 0;
@@ -226,7 +218,7 @@ static int osx_write_open(struct writer_node *wn)
 			kAudioUnitScope_Input, 0, &format,
 			sizeof(AudioStreamBasicDescription)))
 		goto e2;
-	init_buffers(powd);
+	init_buffers(wn);
 	ret = -E_ADD_CALLBACK;
 	if (AudioUnitSetProperty(powd->output, kAudioUnitProperty_SetRenderCallback,
 			kAudioUnitScope_Input, 0, &inputCallback,
diff --git a/osx_write.ggo b/osx_write.ggo
index 7f319fb2..bfee7e6a 100644
--- a/osx_write.ggo
+++ b/osx_write.ggo
@@ -19,3 +19,13 @@ raw audio)"
 	int typestr="num"
 	default="44100"
 	optional
+
+option "numbuffers" n
+#~~~~~~~~~~~~~~~~~~~~~
+
+"number of audio buffers to allocate (increase if
+you get buffer underruns)"
+
+	int typestr="num"
+	default="3"
+	optional