Changeset 1961 for pjproject/trunk/pjsip-apps/src/samples/streamutil.c

Timestamp:

May 17, 2008 2:54:18 PM (16 years ago)

Author:

nanang

Message:

More on ticket #535: updated files using and related to math.h

File:

• pjproject/trunk/pjsip-apps/src/samples/streamutil.c (modified) (9 diffs)

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

@@ -769 +769 @@
            "    total %s packets %sB received (%sB +IP hdr)%s\n"
            "    pkt loss=%d (%3.1f%%), dup=%d (%3.1f%%), reorder=%d (%3.1f%%)%s\n"
-           "          (msec)    min     avg     max     last\n"
-           "    loss period: %7.3f %7.3f %7.3f %7.3f%s\n"
-           "    jitter     : %7.3f %7.3f %7.3f %7.3f%s\n",
+           "          (msec)    min     avg     max     last    dev\n"
+           "    loss period: %7.3f %7.3f %7.3f %7.3f %7.3f%s\n"
+           "    jitter     : %7.3f %7.3f %7.3f %7.3f %7.3f%s\n",
            last_update,
            good_number(packets, stat.rx.pkt),
@@ -785 +785 @@
            "",
            stat.rx.loss_period.min / 1000.0, 
-           stat.rx.loss_period.avg / 1000.0, 
+           stat.rx.loss_period.mean / 1000.0, 
            stat.rx.loss_period.max / 1000.0,
            stat.rx.loss_period.last / 1000.0,
+           pj_math_stat_get_stddev(&stat.rx.loss_period) / 1000.0,
            "",
            stat.rx.jitter.min / 1000.0,
-           stat.rx.jitter.avg / 1000.0,
+           stat.rx.jitter.mean / 1000.0,
            stat.rx.jitter.max / 1000.0,
            stat.rx.jitter.last / 1000.0,
+           pj_math_stat_get_stddev(&stat.rx.jitter) / 1000.0,
            ""
            );
@@ -812 +814 @@
            "    total %s packets %sB sent (%sB +IP hdr)%s\n"
            "    pkt loss=%d (%3.1f%%), dup=%d (%3.1f%%), reorder=%d (%3.1f%%)%s\n"
-           "          (msec)    min     avg     max     last\n"
-           "    loss period: %7.3f %7.3f %7.3f %7.3f%s\n"
-           "    jitter     : %7.3f %7.3f %7.3f %7.3f%s\n",
+           "          (msec)    min     avg     max     last    dev\n"
+           "    loss period: %7.3f %7.3f %7.3f %7.3f %7.3f%s\n"
+           "    jitter     : %7.3f %7.3f %7.3f %7.3f %7.3f%s\n",
            last_update,
            good_number(packets, stat.tx.pkt),
@@ -828 +830 @@
            "",
            stat.tx.loss_period.min / 1000.0, 
-           stat.tx.loss_period.avg / 1000.0, 
+           stat.tx.loss_period.mean / 1000.0, 
            stat.tx.loss_period.max / 1000.0,
            stat.tx.loss_period.last / 1000.0,
+           pj_math_stat_get_stddev(&stat.tx.loss_period) / 1000.0,
            "",
            stat.tx.jitter.min / 1000.0,
-           stat.tx.jitter.avg / 1000.0,
+           stat.tx.jitter.mean / 1000.0,
            stat.tx.jitter.max / 1000.0,
            stat.tx.jitter.last / 1000.0,
+           pj_math_stat_get_stddev(&stat.tx.jitter) / 1000.0,
            ""
            );
 
 
-    printf(" RTT delay     : %7.3f %7.3f %7.3f %7.3f%s\n", 
+    printf(" RTT delay     : %7.3f %7.3f %7.3f %7.3f %7.3f%s\n", 
            stat.rtt.min / 1000.0,
-           stat.rtt.avg / 1000.0,
+           stat.rtt.mean / 1000.0,
            stat.rtt.max / 1000.0,
            stat.rtt.last / 1000.0,
+           pj_math_stat_get_stddev(&stat.rtt) / 1000.0,
            ""
            );
@@ -886 +891 @@
             SAMPLES_TO_USEC(jmean, xr_stat.rx.stat_sum.jitter.mean, 
                             port->info.clock_rate);
-            SAMPLES_TO_USEC(jdev, xr_stat.rx.stat_sum.jitter.dev, 
-                            port->info.clock_rate);
+            SAMPLES_TO_USEC(jdev, 
+                           pj_math_stat_get_stddev(&xr_stat.rx.stat_sum.jitter),
+                           port->info.clock_rate);
             sprintf(jitter, "%7.3f %7.3f %7.3f %7.3f", 
                     jmin/1000.0, jmean/1000.0, jmax/1000.0, jdev/1000.0);
@@ -898 +904 @@
                     xr_stat.rx.stat_sum.toh.mean,
                     xr_stat.rx.stat_sum.toh.max,
-                    xr_stat.rx.stat_sum.toh.dev);
+                    pj_math_stat_get_stddev(&xr_stat.rx.stat_sum.toh));
         } else
             sprintf(toh, "(report not available)");
@@ -948 +954 @@
             SAMPLES_TO_USEC(jmean, xr_stat.tx.stat_sum.jitter.mean, 
                             port->info.clock_rate);
-            SAMPLES_TO_USEC(jdev, xr_stat.tx.stat_sum.jitter.dev, 
-                            port->info.clock_rate);
+            SAMPLES_TO_USEC(jdev, 
+                           pj_math_stat_get_stddev(&xr_stat.tx.stat_sum.jitter),
+                           port->info.clock_rate);
             sprintf(jitter, "%7.3f %7.3f %7.3f %7.3f", 
                     jmin/1000.0, jmean/1000.0, jmax/1000.0, jdev/1000.0);
@@ -960 +967 @@
                     xr_stat.tx.stat_sum.toh.mean,
                     xr_stat.tx.stat_sum.toh.max,
-                    xr_stat.tx.stat_sum.toh.dev);
+                    pj_math_stat_get_stddev(&xr_stat.rx.stat_sum.toh));
         } else
             sprintf(toh,    "(report not available)");
@@ -1169 +1176 @@
 
 
-        /* RTT delay, need this? */
-        printf("          (msec)    min     avg     max     last\n");
-        printf(" RTT delay     : %7.3f %7.3f %7.3f %7.3f%s\n", 
+        /* RTT delay (by receiver side) */
+        printf("          (msec)    min     avg     max     last    dev\n");
+        printf(" RTT delay     : %7.3f %7.3f %7.3f %7.3f %7.3f%s\n", 
                xr_stat.rtt.min / 1000.0,
-               xr_stat.rtt.avg / 1000.0,
+               xr_stat.rtt.mean / 1000.0,
                xr_stat.rtt.max / 1000.0,
                xr_stat.rtt.last / 1000.0,
+               pj_math_stat_get_stddev(&xr_stat.rtt) / 1000.0,
                ""
                );