Changeset 1456 for pjproject/trunk

Timestamp:

Sep 28, 2007 1:12:15 PM (17 years ago)

Author:

bennylp

Message:

Ticket #384: Prefer to use Direct Sound as the sound device backend on Windows

Location:

pjproject/trunk/pjmedia

Files:

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

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

@@ -74 +74 @@
 
 /**
+ * Specify whether we prefer to use DirectSound on Windows.
+ *
+ * Say yes!
+ */
+#ifndef PJMEDIA_PREFER_DIRECT_SOUND
+#   define PJMEDIA_PREFER_DIRECT_SOUND      1
+#endif
+
+
+/**
  * Specify number of sound buffers. Larger number is better for sound
  * stability and to accomodate sound devices that are unable to send frames

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

@@ -266 +266 @@
     int i, count;
 
+    /* Special for Windows - try to use the DirectSound implementation
+     * first since it provides better latency.
+     */
+#if PJMEDIA_PREFER_DIRECT_SOUND
+    if (Pa_HostApiTypeIdToHostApiIndex(paDirectSound) >= 0) {
+        const PaHostApiInfo *pHI;
+        int index = Pa_HostApiTypeIdToHostApiIndex(paDirectSound);
+        pHI = Pa_GetHostApiInfo(index);
+        if (pHI) {
+            const PaDeviceInfo *paDevInfo = NULL;
+            paDevInfo = Pa_GetDeviceInfo(pHI->defaultInputDevice);
+            if (paDevInfo && paDevInfo->maxInputChannels >= channel_count)
+                return pHI->defaultInputDevice;
+        }
+    }
+#endif
+
     /* Enumerate the host api's for the default devices, and return
      * the device with suitable channels.
@@ -305 +322 @@
     int i, count;
 
+    /* Special for Windows - try to use the DirectSound implementation
+     * first since it provides better latency.
+     */
+#if PJMEDIA_PREFER_DIRECT_SOUND
+    if (Pa_HostApiTypeIdToHostApiIndex(paDirectSound) >= 0) {
+        const PaHostApiInfo *pHI;
+        int index = Pa_HostApiTypeIdToHostApiIndex(paDirectSound);
+        pHI = Pa_GetHostApiInfo(index);
+        if (pHI) {
+            const PaDeviceInfo *paDevInfo = NULL;
+            paDevInfo = Pa_GetDeviceInfo(pHI->defaultOutputDevice);
+            if (paDevInfo && paDevInfo->maxOutputChannels >= channel_count)
+                return pHI->defaultOutputDevice;
+        }
+    }
+#endif
+
     /* Enumerate the host api's for the default devices, and return
      * the device with suitable channels.
@@ -335 +369 @@
             return i;
     }
-    
+
     return -1;
 }