Changeset 3664 for pjproject/trunk/pjsip-apps/src/samples/latency.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/samples/latency.c (modified) (7 diffs)

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

@@ -61 +61 @@
              lat_max = 0;
 
-    samples_per_frame = wav->info.samples_per_frame;
+    samples_per_frame = PJMEDIA_PIA_SPF(&wav->info);
     frm.buf = pj_pool_alloc(pool, samples_per_frame * 2);
     frm.size = samples_per_frame * 2;
@@ -77 +77 @@
     }
 
-    if (read < 2 * wav->info.clock_rate) {
+    if (read < 2 * PJMEDIA_PIA_SRATE(&wav->info)) {
         puts("Error: too short");
         return -1;
@@ -83 +83 @@
 
     start_pos = 0;
-    while (start_pos < len/2 - wav->info.clock_rate) {
+    while (start_pos < len/2 - PJMEDIA_PIA_SRATE(&wav->info)) {
         int max_signal = 0;
         unsigned max_signal_pos = start_pos;
@@ -91 +91 @@
 
         /* 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 + PJMEDIA_PIA_SRATE(&wav->info) * 700 / 1000; ++i) {
             if (abs(buf[i]) > max_signal) {
                 max_signal = abs(buf[i]);
@@ -99 +99 @@
 
         /* Advance 10ms from max_signal_pos */
-        pos = max_signal_pos + 10 * wav->info.clock_rate / 1000;
+        pos = max_signal_pos + 10 * PJMEDIA_PIA_SRATE(&wav->info) / 1000;
 
         /* Get the largest signal in the next 500ms */
         max_signal = 0;
         max_echo_pos = pos;
-        for (i=pos; i<pos+wav->info.clock_rate/2; ++i) {
+        for (i=pos; i<pos+PJMEDIA_PIA_SRATE(&wav->info)/2; ++i) {
             if (abs(buf[i]) > max_signal) {
                 max_signal = abs(buf[i]);
@@ -111 +111 @@
         }
 
-        lat = (max_echo_pos - max_signal_pos) * 1000 / wav->info.clock_rate;
+        lat = (max_echo_pos - max_signal_pos) * 1000 / PJMEDIA_PIA_SRATE(&wav->info);
         
 #if 0
@@ -125 +125 @@
 
         /* Advance next loop */
-        start_pos += wav->info.clock_rate;
+        start_pos += PJMEDIA_PIA_SRATE(&wav->info);
     }