Changeset 3239 for pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

Timestamp:

Jul 15, 2010 2:45:47 PM (14 years ago)

Author:

nanang

Message:

Re #1103:

• Added (back) raw jitter statistics into RTCP statistics, with the new name "rx_raw_jitter".
• Added IPDV statistics into RTCP statistics.
• Added new compile-time settings to enable/disable raw jitter and IPDV statistics.
• Updated call dump in pjsua-lib.

File:

• pjproject/trunk/pjmedia/src/pjmedia/rtcp.c (modified) (4 diffs)

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

@@ -154 +154 @@
     pj_math_stat_init(&stat->tx.jitter);
 
+#if defined(PJMEDIA_RTCP_STAT_HAS_IPDV) && PJMEDIA_RTCP_STAT_HAS_IPDV!=0
+    pj_math_stat_init(&stat->rx_ipdv);
+#endif
+
+#if defined(PJMEDIA_RTCP_STAT_HAS_RAW_JITTER) && PJMEDIA_RTCP_STAT_HAS_RAW_JITTER!=0
+    pj_math_stat_init(&stat->rx_raw_jitter);
+#endif
+
     pj_gettimeofday(&now);
     stat->start = now;
@@ -361 +369 @@
             pj_int32_t d;
             pj_uint32_t jitter;
-            
+
             d = transit - sess->transit;
-            sess->transit = transit;
             if (d < 0) 
                 d = -d;
@@ -382 +389 @@
 
 
+#if defined(PJMEDIA_RTCP_STAT_HAS_RAW_JITTER) && PJMEDIA_RTCP_STAT_HAS_RAW_JITTER!=0
+            {
+                pj_uint32_t raw_jitter;
+
+                /* Convert raw jitter unit from samples to usec */
+                if (d < 4294)
+                    raw_jitter = d * 1000000 / sess->clock_rate;
+                else {
+                    raw_jitter = d * 1000 / sess->clock_rate;
+                    raw_jitter *= 1000;
+                }
+                
+                /* Update jitter stat */
+                pj_math_stat_update(&sess->stat.rx_raw_jitter, raw_jitter);
+            }
+#endif
+
+
+#if defined(PJMEDIA_RTCP_STAT_HAS_IPDV) && PJMEDIA_RTCP_STAT_HAS_IPDV!=0
+            {
+                pj_int32_t ipdv;
+
+                ipdv = transit - sess->transit;
+                /* Convert IPDV unit from samples to usec */
+                if (ipdv > -2147 && ipdv < 2147)
+                    ipdv = ipdv * 1000000 / (int)sess->clock_rate;
+                else {
+                    ipdv = ipdv * 1000 / (int)sess->clock_rate;
+                    ipdv *= 1000;
+                }
+                
+                /* Update jitter stat */
+                pj_math_stat_update(&sess->stat.rx_ipdv, ipdv);
+            }
+#endif
+
 #if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)
             pjmedia_rtcp_xr_rx_rtp(&sess->xr_session, seq, 
@@ -390 +433 @@
                                    -1, 0);                  /* toh     */
 #endif
+
+            /* Update session transit */
+            sess->transit = transit;
         }
 #if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)