doh

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11476 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/portaudio/test/patest1.c b/libs/portaudio/test/patest1.c
index cee23bcdb253b6e94cfde7dc05de445ca6607f7b..0d42f17a6eee8976d137e8c832d945d5fe4ab1f9 100644 (file)
--- a/libs/portaudio/test/patest1.c
+++ b/libs/portaudio/test/patest1.c
@@ -49,7 +49,7 @@
 #define M_PI (3.14159265)
 #endif
 
-#define SAMPLE_RATE (8000)
+#define SAMPLE_RATE (44100)
 
 typedef struct
 {

diff --git a/libs/portaudio/test/patest_sine.c b/libs/portaudio/test/patest_sine.c
index 32476cc549503471eca3a1acd35bb6c3f2a9c98c..70eebc5d5b2f49b9f4086d29da06c2cd78d2e4d7 100644 (file)
--- a/libs/portaudio/test/patest_sine.c
+++ b/libs/portaudio/test/patest_sine.c
@@ -45,9 +45,9 @@
 #include <math.h>
 #include "portaudio.h"
 
-#define NUM_SECONDS   (1)
-#define SAMPLE_RATE   (8000)
-#define FRAMES_PER_BUFFER  (160)
+#define NUM_SECONDS   (5)
+#define SAMPLE_RATE   (44100)
+#define FRAMES_PER_BUFFER  (64)
 
 #ifndef M_PI
 #define M_PI  (3.14159265)

diff --git a/libs/portaudio/test/patest_sine8.c b/libs/portaudio/test/patest_sine8.c
index 5d830b38a133d67a42070d415b7b25bde3c1cb5d..171d2ef3d86a859e3400f4635310218c7cda4139 100644 (file)
--- a/libs/portaudio/test/patest_sine8.c
+++ b/libs/portaudio/test/patest_sine8.c
@@ -45,15 +45,15 @@
 #include <math.h>
 #include "portaudio.h"
 
-#define NUM_SECONDS   (1)
+#define NUM_SECONDS   (8)
 #define SAMPLE_RATE   (44100)
 #define TABLE_SIZE    (200)
 #define TEST_UNSIGNED (0)
 
 #if TEST_UNSIGNED
-#define TEST_FORMAT   paUInt16
+#define TEST_FORMAT   paUInt8
 #else
-#define TEST_FORMAT   paInt16
+#define TEST_FORMAT   paInt8
 #endif
 
 #ifndef M_PI

diff --git a/libs/portaudio/test/patest_sine_formats.c b/libs/portaudio/test/patest_sine_formats.c
index f4bdb26a50e6d16723db6ceb110780d35ca9e64e..22bfa594f548df88318bc52b4fd9d1221625de81 100644 (file)
--- a/libs/portaudio/test/patest_sine_formats.c
+++ b/libs/portaudio/test/patest_sine_formats.c
@@ -43,11 +43,10 @@
 #include <stdio.h>
 #include <math.h>
 #include "portaudio.h"
-#include <fcntl.h>
 
-#define NUM_SECONDS        (20)
-#define SAMPLE_RATE        (8000)
-#define FRAMES_PER_BUFFER  (80)
+#define NUM_SECONDS        (10)
+#define SAMPLE_RATE        (44100)
+#define FRAMES_PER_BUFFER  (512)
 #define LEFT_FREQ          (SAMPLE_RATE/256.0)  /* So we hit 1.0 */
 #define RIGHT_FREQ         (500.0)
 #define AMPLITUDE          (1.0)
@@ -92,8 +91,6 @@ typedef float               SAMPLE_t;
 #endif
 
 
-static int fd = 0;
-
 typedef struct
 {
     double left_phase;
@@ -123,26 +120,14 @@ static int patestCallback( const void *inputBuffer,
     {
         framesToCalc = data->framesToGo;
         data->framesToGo = 0;
-        //finished = 1;
+        finished = 1;
     }
     else
     {
         framesToCalc = framesPerBuffer;
         data->framesToGo -= framesPerBuffer;
     }
-       
-
-       if (!fd) {
-        fd = open("/root/sr8k.raw", O_RDONLY, 0);
-    }
-       
-       printf("WTF %d\n", framesToCalc);
 
-       i = read(fd, outputBuffer, framesToCalc * 2);
-       
-       if (!i) finished = 1;
-
-       /*
     for( i=0; i<framesToCalc; i++ )
     {
         data->left_phase += (LEFT_FREQ / SAMPLE_RATE);
@@ -153,16 +138,12 @@ static int patestCallback( const void *inputBuffer,
         if( data->right_phase > 1.0) data->right_phase -= 1.0;
         *out++ = DOUBLE_TO_SAMPLE( AMPLITUDE * sin( (data->right_phase * M_PI * 2. )));
     }
-       */
-
     /* zero remainder of final buffer */
-#if 0
     for( ; i<(int)framesPerBuffer; i++ )
     {
         *out++ = SAMPLE_ZERO; /* left */
         *out++ = SAMPLE_ZERO; /* right */
     }
-#endif
     return finished;
 }
 /*******************************************************************/
@@ -184,7 +165,7 @@ int main(void)
 
 
     outputParameters.device           = Pa_GetDefaultOutputDevice(); /* Default output device. */
-    outputParameters.channelCount     = 1;                           /* Stereo output */
+    outputParameters.channelCount     = 2;                           /* Stereo output */
     outputParameters.sampleFormat     = TEST_FORMAT;                 /* Selected above. */
     outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency;
     outputParameters.hostApiSpecificStreamInfo = NULL;