[Iaxclient-cvs] iaxclient/lib audio_portaudio.c,1.9,1.10

[<st...@us...>]

Update of /cvsroot/iaxclient/iaxclient/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv20515

Modified Files:
	audio_portaudio.c 
Log Message:
virtual mono mode.

forced on MACOSX, used when mono fails to open on others (like OSS).


Index: audio_portaudio.c
===================================================================
RCS file: /cvsroot/iaxclient/iaxclient/lib/audio_portaudio.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- audio_portaudio.c	20 Jun 2003 13:23:05 -0000	1.9
+++ audio_portaudio.c	20 Jun 2003 23:09:04 -0000	1.10
@@ -25,6 +25,7 @@
 static PABLIO_Stream *iStream;
 static PABLIO_Stream *oStream;
 static int oneStream;
+static int virtualMono;
 static const PaDeviceInfo **inputDevices;
 static const PaDeviceInfo **outputDevices;
 static int nInputDevices;
@@ -76,8 +77,10 @@
 int pa_initialize_audio() {
     PaError  err;
 
+//#if 0
+#ifndef MACOSX
     /* Open simplified blocking I/O layer on top of PortAudio. */
-    /* first, try opening one stream for in/out */
+    /* first, try opening one stream for in/out, Mono */
     err = OpenAudioStream( &iStream, SAMPLE_RATE, paInt16,
                            (PABLIO_READ  | PABLIO_WRITE | PABLIO_MONO) );
     
@@ -85,9 +88,25 @@
 	/* if this works, set iStream, oStream to this stream */
 	oStream = iStream;
 	oneStream = 1;
+	virtualMono = 0;
 	return 0;
     }
+#endif
 
+    /* Open simplified blocking I/O layer on top of PortAudio. */
+    /* first, try opening one stream for in/out, Mono */
+    err = OpenAudioStream( &iStream, SAMPLE_RATE, paInt16,
+                           (PABLIO_READ  | PABLIO_WRITE | PABLIO_STEREO) );
+    
+    if( err == paNoError ) {
+	/* if this works, set iStream, oStream to this stream */
+	oStream = iStream;
+	oneStream = 1;
+	virtualMono = 1;
+	return 0;
+    }
+
+#if TRY_TWO_OPENS
     oneStream = 0;
     err = OpenAudioStream( &iStream, SAMPLE_RATE, paInt16,
                            (PABLIO_READ  | PABLIO_MONO) );
@@ -101,6 +120,7 @@
 	handle_paerror(err, "opening separate output stream");
 	return -1;
     }
+#endif
 
     return 0;
 }
@@ -118,25 +138,63 @@
 
 }
 
+
+void mono2stereo(SAMPLE *out, SAMPLE *in, int nSamples) {
+    int i;
+    //fprintf(stderr, "mono2stereo: %d samples\n", nSamples);
+    for(i=0;i<nSamples;i++) {
+	*(out++) = *in;
+	*(out++) = *(in++); 
+    }
+}
+
+void stereo2mono(SAMPLE *out, SAMPLE *in, int nSamples) {
+    int i;
+    //fprintf(stderr, "stereo2mono: %d samples\n", nSamples);
+    for(i=0;i<nSamples;i++) {
+	*(out) = *(in++);
+	out++; in++;
+	//*(out++) += *(in++);
+    }
+}
+
 void pa_play_recv_audio(void *fr, int fr_size) {
-	if(GetAudioStreamWriteable(oStream) < SAMPLES_PER_FRAME * FRAMES_PER_BLOCK)
+      
+	SAMPLE stereobuf[FRAMES_PER_BLOCK * 2];
+	SAMPLE *buf;
+	if(GetAudioStreamWriteable(oStream) < FRAMES_PER_BLOCK)
 	{
 	      //fprintf(stderr, "audio_portaudio: audio output overflow\n");
 	      return;
 	}
 
+	if(virtualMono) {
+	    mono2stereo(stereobuf, (SAMPLE *)fr, FRAMES_PER_BLOCK);
+	    buf = stereobuf;
+	} else {
+	    buf = (short *)fr;
+	}
+
 	// Play the audio as decoded
-	WriteAudioStream(oStream, fr, SAMPLES_PER_FRAME * FRAMES_PER_BLOCK);
+	WriteAudioStream(oStream, buf, FRAMES_PER_BLOCK);
 }
 
 void pa_send_audio(struct timeval *lastouttm, struct iaxc_call *most_recent_answer, int iEncodeType) {
-	SAMPLE samples[SAMPLES_PER_FRAME * FRAMES_PER_BLOCK];
+	SAMPLE samples[FRAMES_PER_BLOCK * 2]; // could be stereo
+	SAMPLE monobuf[FRAMES_PER_BLOCK];
+	SAMPLE *buf;
 
 	/* send all available complete frames */
-	while(GetAudioStreamReadable(iStream) >= FRAMES_PER_BLOCK)
+	while(GetAudioStreamReadable(iStream) >= (FRAMES_PER_BLOCK))
 	{
 		ReadAudioStream(iStream, samples, FRAMES_PER_BLOCK);
-		send_encoded_audio(most_recent_answer, samples, iEncodeType);
+		if(virtualMono) {
+		    stereo2mono(monobuf, samples, FRAMES_PER_BLOCK);
+		    buf = monobuf;
+		} else {
+		    buf = samples;
+		}
+		send_encoded_audio(most_recent_answer, buf, iEncodeType);
 	}
 }