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

Timestamp:

Jul 19, 2011 3:42:28 AM (13 years ago)

Author:

nanang

Message:

Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip-apps/src/pjsystest/systest.c (modified) (8 diffs)

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

@@ -651 +651 @@
     pjmedia_frame frm;
     short *buf;
-    unsigned i, samples_per_frame, read, len;
+    unsigned i, clock_rate, samples_per_frame, read, len;
     unsigned start_pos;
     pj_bool_t first;
@@ -661 +661 @@
     *lat_max = 0;
 
-    samples_per_frame = wav->info.samples_per_frame;
+    samples_per_frame = PJMEDIA_PIA_SPF(&wav->info);
+    clock_rate = PJMEDIA_PIA_SRATE(&wav->info);
     frm.buf = pj_pool_alloc(pool, samples_per_frame * 2);
     frm.size = samples_per_frame * 2;
@@ -678 +679 @@
     }
 
-    if (read < 2 * wav->info.clock_rate) {
+    if (read < 2 * clock_rate) {
         systest_perror("The WAV file is too short", PJ_SUCCESS);
         return -1;
@@ -686 +687 @@
      * (keypad press, etc.)
      */
-    pjmedia_zero_samples(buf, wav->info.clock_rate / 2);
+    pjmedia_zero_samples(buf, clock_rate / 2);
 
     /* Loop to calculate latency */
     start_pos = 0;
     first = PJ_TRUE;
-    while (start_pos < len/2 - wav->info.clock_rate) {
+    while (start_pos < len/2 - clock_rate) {
         int max_signal = 0;
         unsigned max_signal_pos = start_pos;
@@ -699 +700 @@
 
         /* Get the largest signal in the next 0.7s */
-        for (i=start_pos; i<start_pos + wav->info.clock_rate * 700 / 1000; ++i) {
+        for (i=start_pos; i<start_pos + clock_rate * 700 / 1000; ++i) {
             if (abs(buf[i]) > max_signal) {
                 max_signal = abs(buf[i]);
@@ -707 +708 @@
 
         /* Advance 10ms from max_signal_pos */
-        pos = max_signal_pos + 10 * wav->info.clock_rate / 1000;
+        pos = max_signal_pos + 10 * clock_rate / 1000;
 
         /* Get the largest signal in the next 800ms */
         max_signal = 0;
         max_echo_pos = pos;
-        for (i=pos; i<pos+wav->info.clock_rate * 8 / 10; ++i) {
+        for (i=pos; i<pos+clock_rate * 8 / 10; ++i) {
             if (abs(buf[i]) > max_signal) {
                 max_signal = abs(buf[i]);
@@ -719 +720 @@
         }
 
-        lat = (max_echo_pos - max_signal_pos) * 1000 / wav->info.clock_rate;
+        lat = (max_echo_pos - max_signal_pos) * 1000 / clock_rate;
 
 #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,
-                  max_echo_pos * 1000 / wav->info.clock_rate,
+                  max_signal_pos * 1000 / clock_rate,
+                  max_echo_pos * 1000 / clock_rate,
                   lat));
 #endif
@@ -737 +738 @@
         /* Advance next loop */
         if (first) {
-            start_pos = max_signal_pos + wav->info.clock_rate * 9 / 10;
+            start_pos = max_signal_pos + clock_rate * 9 / 10;
             first = PJ_FALSE;
         } else {
-            start_pos += wav->info.clock_rate;
+            start_pos += clock_rate;
         }
     }