Changeset 1486 for pjproject

Timestamp:

Oct 7, 2007 7:42:04 AM (17 years ago)

Author:

bennylp

Message:

Ticket #395: Added configuration to control maximum PortAudio? sound buffer latency, and change default sound backend back to WMME

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/config.h (modified) (1 diff)
• src/pjmedia/pasound.c (modified) (5 diffs)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -76 +76 @@
  * Specify whether we prefer to use DirectSound on Windows.
  *
- * Say yes!
+ * Default: 0
  */
 #ifndef PJMEDIA_PREFER_DIRECT_SOUND
-#   define PJMEDIA_PREFER_DIRECT_SOUND      1
+#   define PJMEDIA_PREFER_DIRECT_SOUND      0
+#endif
+
+
+/**
+ * Specify PortAudio maximum buffering latency, in milliseconds.
+ */
+#ifndef PJMEDIA_PASOUND_MAX_LATENCY
+#   define PJMEDIA_PASOUND_MAX_LATENCY      60
 #endif
 

pjproject/trunk/pjmedia/src/pjmedia/pasound.c

@@ -29 +29 @@
 #define THIS_FILE       "pasound.c"
 
+#define MAX_LATENCY     (PJMEDIA_PASOUND_MAX_LATENCY / 1000.0)
+
 static int snd_init_count;
 
@@ -442 +444 @@
     inputParam.sampleFormat = sampleFormat;
     inputParam.suggestedLatency = paDevInfo->defaultLowInputLatency;
+    if (inputParam.suggestedLatency > MAX_LATENCY)
+        inputParam.suggestedLatency = MAX_LATENCY;
 
     paHostApiInfo = Pa_GetHostApiInfo(paDevInfo->hostApi);
@@ -537 +541 @@
     outputParam.hostApiSpecificStreamInfo = NULL;
     outputParam.sampleFormat = sampleFormat;
-    outputParam.suggestedLatency = 1.0 * samples_per_frame / clock_rate;;
+    outputParam.suggestedLatency = paDevInfo->defaultLowOutputLatency;
+    if (outputParam.suggestedLatency > MAX_LATENCY)
+        outputParam.suggestedLatency = MAX_LATENCY;
 
     paHostApiInfo = Pa_GetHostApiInfo(paDevInfo->hostApi);
@@ -659 +665 @@
     inputParam.sampleFormat = sampleFormat;
     inputParam.suggestedLatency = paRecDevInfo->defaultLowInputLatency;
+    if (inputParam.suggestedLatency > MAX_LATENCY)
+        inputParam.suggestedLatency = MAX_LATENCY;
 
     paRecHostApiInfo = Pa_GetHostApiInfo(paRecDevInfo->hostApi);
@@ -668 +676 @@
     outputParam.sampleFormat = sampleFormat;
     outputParam.suggestedLatency = paPlayDevInfo->defaultLowOutputLatency;
+    if (outputParam.suggestedLatency > MAX_LATENCY)
+        outputParam.suggestedLatency = MAX_LATENCY;
 
     paPlayHostApiInfo = Pa_GetHostApiInfo(paPlayDevInfo->hostApi);