Changeset 1961 for pjproject/trunk/pjmedia/src/pjmedia/rtcp.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/pjmedia/src/pjmedia/rtcp.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

@@ -167 +167 @@
     pj_get_timestamp_freq(&sess->ts_freq);
 
+    /* Initialize statistics states */
+    pj_math_stat_init(&sess->stat.rtt);
+    pj_math_stat_init(&sess->stat.rx.loss_period);
+    pj_math_stat_init(&sess->stat.rx.jitter);
+    pj_math_stat_init(&sess->stat.tx.loss_period);
+    pj_math_stat_init(&sess->stat.tx.jitter);
+
     /* RR will be initialized on receipt of the first RTP packet. */
 }
@@ -275 +282 @@
 
         /* Update loss period stat */
-        if (sess->stat.rx.loss_period.count == 0 ||
-            period < sess->stat.rx.loss_period.min)
-        {
-            sess->stat.rx.loss_period.min = period;
-        }
-        if (period > sess->stat.rx.loss_period.max)
-            sess->stat.rx.loss_period.max = period;
-        sess->stat.rx.loss_period.avg = 
-            (sess->stat.rx.loss_period.avg * sess->stat.rx.loss_period.count +
-             period) / (sess->stat.rx.loss_period.count + 1);
-        sess->stat.rx.loss_period.last = period;
-        ++sess->stat.rx.loss_period.count;
+        pj_math_stat_update(&sess->stat.rx.loss_period, period);
     }
 
@@ -330 +326 @@
             }
 
-            /* Add to average */
-            sess->avg_jitter = 
-                (jitter + sess->avg_jitter * sess->stat.rx.jitter.count) /
-                (sess->stat.rx.jitter.count + 1);
-            sess->stat.rx.jitter.avg = (unsigned)sess->avg_jitter;
-            ++sess->stat.rx.jitter.count;
-
             /* Update jitter stat */
-            if (jitter < sess->stat.rx.jitter.min)
-                sess->stat.rx.jitter.min = jitter;
-            if (jitter > sess->stat.rx.jitter.max)
-                sess->stat.rx.jitter.max = jitter;
-
-            sess->stat.rx.jitter.last = jitter;
+            pj_math_stat_update(&sess->stat.rx.jitter, jitter);
 
 #if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)
@@ -464 +448 @@
         period *= 1000;
 
-        if (sess->stat.tx.update_cnt==0||sess->stat.tx.loss_period.min==0)
-            sess->stat.tx.loss_period.min = period;
-        if (period < sess->stat.tx.loss_period.min)
-            sess->stat.tx.loss_period.min = period;
-        if (period > sess->stat.tx.loss_period.max)
-            sess->stat.tx.loss_period.max = period;
-
-        sess->stat.tx.loss_period.avg = 
-            (sess->stat.tx.loss_period.avg*sess->stat.tx.update_cnt+period)
-            / (sess->stat.tx.update_cnt + 1);
-        sess->stat.tx.loss_period.last = period;
+        /* Update loss period stat */
+        pj_math_stat_update(&sess->stat.tx.loss_period, period);
     }
 
@@ -488 +463 @@
 
     /* Update jitter statistics */
-    if (sess->stat.tx.jitter.count == 0)
-        sess->stat.tx.jitter.min = jitter;
-    if (jitter < sess->stat.tx.jitter.min && jitter)
-        sess->stat.tx.jitter.min = jitter;
-    if (jitter > sess->stat.tx.jitter.max)
-        sess->stat.tx.jitter.max = jitter;
-    sess->stat.tx.jitter.avg = 
-        (sess->stat.tx.jitter.avg * sess->stat.tx.jitter.count + jitter) /
-        (sess->stat.tx.jitter.count + 1);
-    ++sess->stat.tx.jitter.count;
-    sess->stat.tx.jitter.last = jitter;
-
+    pj_math_stat_update(&sess->stat.tx.jitter, jitter);
 
     /* Can only calculate if LSR and DLSR is present in RR */
@@ -553 +517 @@
             }
 
-            if (sess->stat.rtt_update_cnt == 0)
-                sess->stat.rtt.min = rtt;
-
             /* "Normalize" rtt value that is exceptionally high.
              * For such values, "normalize" the rtt to be three times
              * the average value.
              */
-            if (rtt > (sess->stat.rtt.avg*3) && sess->stat.rtt_update_cnt!=0) {
+            if (rtt > ((unsigned)sess->stat.rtt.mean*3) && sess->stat.rtt.n!=0)
+            {
                 unsigned orig_rtt = rtt;
-                rtt = sess->stat.rtt.avg*3;
+                rtt = sess->stat.rtt.mean*3;
                 PJ_LOG(5,(sess->name, 
                           "RTT value %d usec is normalized to %d usec",
@@ -570 +532 @@
             TRACE_((sess->name, "RTCP RTT is set to %d usec", rtt));
 
-            if (rtt < sess->stat.rtt.min && rtt)
-                sess->stat.rtt.min = rtt;
-            if (rtt > sess->stat.rtt.max)
-                sess->stat.rtt.max = rtt;
-
-            sess->stat.rtt.avg = 
-                (sess->stat.rtt.avg * sess->stat.rtt_update_cnt + rtt) / 
-                (sess->stat.rtt_update_cnt + 1);
-
-            sess->stat.rtt.last = rtt;
-            sess->stat.rtt_update_cnt++;
+            /* Update RTT stat */
+            pj_math_stat_update(&sess->stat.rtt, rtt);
 
         } else {