Changeset 443 for pjproject/trunk

Timestamp:

May 14, 2006 6:50:09 PM (19 years ago)

Author:

bennylp

Message:

Set default sound backend in Win32 to own DirectSound?, and changed conference clock to 10ms (from 20ms)

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/config.h (modified) (1 diff)
• pjmedia/src/pjmedia/dsound.c (modified) (3 diffs)
• pjsip-apps/src/samples/siprtp_report.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

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

@@ -35 +35 @@
  */
 #ifndef PJMEDIA_SOUND_IMPLEMENTATION
-#   define PJMEDIA_SOUND_IMPLEMENTATION     PJMEDIA_SOUND_PORTAUDIO_SOUND
+//#   define PJMEDIA_SOUND_IMPLEMENTATION           PJMEDIA_SOUND_PORTAUDIO_SOUND
+#   define PJMEDIA_SOUND_IMPLEMENTATION     PJMEDIA_SOUND_WIN32_DIRECT_SOUND
 #endif
 

pjproject/trunk/pjmedia/src/pjmedia/dsound.c

@@ -45 +45 @@
 
 #define MAX_PACKET_BUFFER_COUNT     32
-#define DEFAULT_BUFFER_COUNT        5
+#define DEFAULT_BUFFER_COUNT        8
 
 
@@ -213 +213 @@
 
     /* Done setting up play device. */
-    PJ_LOG(5,(THIS_FILE, " DirectSound player stream initialized"));
+    PJ_LOG(5,(THIS_FILE, 
+              " DirectSound player stream initialized (clock_rate=%d, "
+              "channel_count=%d, samples_per_frame=%d",
+              clock_rate, channel_count, samples_per_frame));
 
     return PJ_SUCCESS;
@@ -305 +308 @@
 
     /* Done setting up recorder device. */
-    PJ_LOG(5,(THIS_FILE, " DirectSound capture stream initialized"));
+    PJ_LOG(5,(THIS_FILE, 
+              " DirectSound capture stream initialized (clock_rate=%d, "
+              "channel_count=%d, samples_per_frame=%d",
+              clock_rate, channel_count, samples_per_frame));
 
     return PJ_SUCCESS;

pjproject/trunk/pjsip-apps/src/samples/siprtp_report.c

@@ -60 +60 @@
 
     /* Print duration */
-    if (inv->state >= PJSIP_INV_STATE_CONFIRMED && call->connect_time) {
+    if (inv->state >= PJSIP_INV_STATE_CONFIRMED && call->connect_time.sec) {
 
         PJ_TIME_VAL_SUB(now, call->connect_time);

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -702 +702 @@
     /* Init conference bridge. */
     clock_rate = pjsua.clock_rate ? pjsua.clock_rate : 16000;
-    samples_per_frame = clock_rate * 20 / 1000;
+    samples_per_frame = clock_rate * 10 / 1000;
     status = pjmedia_conf_create(pjsua.pool, 
                                  pjsua.max_calls+PJSUA_CONF_MORE_PORTS,