Changeset 2839 for pjproject/trunk/pjsip-apps/src/pjsystest/systest.c

Timestamp:

Jul 17, 2009 11:37:42 AM (15 years ago)

Author:

bennylp

Message:

More ticket #720: added Win32 target in VS2005 project

File:

• pjproject/trunk/pjsip-apps/src/pjsystest/systest.c (modified) (7 diffs)

pjproject/trunk/pjsip-apps/src/pjsystest/systest.c

@@ -378 +378 @@
     rec_id = PJSUA_INVALID_ID;
 
+    status = pjsua_player_create(&filename, 0, &play_id);
+    if (status != PJ_SUCCESS)
+        goto on_return;
+
+    play_slot = pjsua_player_get_conf_port(play_id);
+
+    status = pjsua_conf_connect(play_slot, 0);
+    if (status != PJ_SUCCESS)
+        goto on_return;
+
     key = gui_msgbox(title,
-                     "Recording has been stopped. Press OK to playback "
-                     "the recorded audio.", 
-                      WITH_OK);
-    
-    status = pjsua_player_create(&filename, 0, &play_id);
-    if (status != PJ_SUCCESS)
-        goto on_return;
-
-    play_slot = pjsua_player_get_conf_port(play_id);
-
-    status = pjsua_conf_connect(play_slot, 0);
-    if (status != PJ_SUCCESS)
-        goto on_return;
-
-    key = gui_msgbox(title,
+                     "Recording has been stopped. "
                      "The recorded audio is being played now to "
                      "the speaker device, in a loop. Listen for "
@@ -487 +483 @@
     param.rec_id = systest.rec_id;
     param.play_id = systest.play_id;
-    param.clock_rate = systest.media_cfg.clock_rate;
+    param.clock_rate = systest.media_cfg.snd_clock_rate;
     param.channel_count = systest.media_cfg.channel_count;
     param.samples_per_frame = param.clock_rate * param.channel_count * 
@@ -569 +565 @@
 
         pj_ansi_snprintf(drifttext, sizeof(drifttext),
-                        "Clock drifts detected. Capture device "
-                        "is running %d samples per second %s "
+                        "Clock drifts detected. Capture "
+                        "is %d samples/sec %s "
                         "than the playback device",
                         drift, which);
@@ -681 +677 @@
         lat = (max_echo_pos - max_signal_pos) * 1000 / wav->info.clock_rate;
 
-#if 1
+#if 0
         PJ_LOG(4,(THIS_FILE, "Signal at %dms, echo at %d ms, latency %d ms",
                   max_signal_pos * 1000 / wav->info.clock_rate,
@@ -771 +767 @@
 
     /* We're running */
+    PJ_LOG(3,(THIS_FILE, "Please wait while test is running (~10 sec)"));
     gui_sleep(10);
 
@@ -947 +944 @@
     len = strlen(textbuf);
 
-    pj_ansi_snprintf(textbuf+len, sizeof(textbuf)-len, "Clock rate: %d\r\n",
+    pj_ansi_snprintf(textbuf+len, sizeof(textbuf)-len, "Test clock rate: %d\r\n",
                      systest.media_cfg.clock_rate);
+    len = strlen(textbuf);
+
+    pj_ansi_snprintf(textbuf+len, sizeof(textbuf)-len, "Device clock rate: %d\r\n",
+                     systest.media_cfg.snd_clock_rate);
     len = strlen(textbuf);
 
@@ -1032 +1033 @@
     pjsua_config_default(&systest.ua_cfg);
     pjsua_media_config_default(&systest.media_cfg);
-    systest.media_cfg.clock_rate = CLOCK_RATE;
+    systest.media_cfg.clock_rate = TEST_CLOCK_RATE;
+    systest.media_cfg.snd_clock_rate = DEV_CLOCK_RATE;
     if (OVERRIDE_AUD_FRAME_PTIME)
         systest.media_cfg.audio_frame_ptime = OVERRIDE_AUD_FRAME_PTIME;
     systest.media_cfg.channel_count = CHANNEL_COUNT;
-    systest.rec_id = PJMEDIA_AUD_DEFAULT_CAPTURE_DEV;
-    systest.play_id = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV;
+    systest.rec_id = REC_DEV_ID;
+    systest.play_id = PLAY_DEV_ID;
     systest.media_cfg.ec_tail_len = 0;