Changeset 2977 for pjproject

Timestamp:

Oct 29, 2009 9:39:17 AM (15 years ago)

Author:

bennylp

Message:

Ticket #983: make native WMME the default audio device on Windows and Windows Mobile:

• increase default playback latency (PJMEDIA_SND_DEFAULT_PLAY_LATENCY) to 140ms for Win32 and 160ms for WM
• set default PJMEDIA_SOUND_BUFFER_COUNT to (PJMEDIA_SND_DEFAULT_PLAY_LATENCY+20)/20 rather than hardcoded 6
• disable PA from audiodev on Win32 and WM

Location:

pjproject/trunk/pjmedia/include

Files:

• pjmedia-audiodev/config.h (modified) (1 diff)
• pjmedia/config.h (modified) (2 diffs)

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

@@ -45 +45 @@
 /**
  * This setting controls whether PortAudio support should be included.
+ *
+ * By default it is enabled except on Windows platforms (including
+ * Windows Mobile) and Symbian.
  */
 #ifndef PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO
-#   define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO      1
+#   if (defined(PJ_WIN32) && PJ_WIN32!=0) || \
+       (defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0)
+#       define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO  0
+#   else
+#       define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO  1
+#   endif
 #endif
 

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

@@ -104 +104 @@
 
 /**
- * Specify default sound device latency, in milisecond.
+ * Specify default sound device latency, in milisecond. 
+ *
+ * Default is 160ms for Windows Mobile and 140ms for other platforms.
  */
 #ifndef PJMEDIA_SND_DEFAULT_PLAY_LATENCY
-#   define PJMEDIA_SND_DEFAULT_PLAY_LATENCY 100
+#   if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE!=0
+#       define PJMEDIA_SND_DEFAULT_PLAY_LATENCY     160
+#   else
+#       define PJMEDIA_SND_DEFAULT_PLAY_LATENCY     140
+#   endif
 #endif
 
@@ -221 +227 @@
  * combiner port, and dsound.c.
  *
- * Default: 6
+ * Default: (PJMEDIA_SND_DEFAULT_PLAY_LATENCY+20)/20
  */
 #ifndef PJMEDIA_SOUND_BUFFER_COUNT
-#   define PJMEDIA_SOUND_BUFFER_COUNT       6
+#   define PJMEDIA_SOUND_BUFFER_COUNT       ((PJMEDIA_SND_DEFAULT_PLAY_LATENCY+20)/20)
 #endif