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

Timestamp:

Apr 24, 2006 11:13:00 PM (18 years ago)

Author:

bennylp

Message:

Better support for continuing media when peer has restarted transmission/RTP session

File:

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

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

@@ -110 +110 @@
         if (PJ_TIME_VAL_MSEC(diff) >= MIN_DIFF) {
 
-            TRACE_((THIS_FILE, "NTP timestamp corrected by %d ms",
+            TRACE_((sess->name, "RTCP NTP timestamp corrected by %d ms",
                     PJ_TIME_VAL_MSEC(diff)));
 
@@ -126 +126 @@
 
 PJ_DEF(void) pjmedia_rtcp_init(pjmedia_rtcp_session *sess, 
+                               char *name,
                                unsigned clock_rate,
                                unsigned samples_per_frame,
@@ -135 +136 @@
     pj_memset(rtcp_pkt, 0, sizeof(pjmedia_rtcp_pkt));
     
+    /* Name */
+    sess->name = name ? name : THIS_FILE,
+
     /* Set clock rate */
     sess->clock_rate = clock_rate;
@@ -238 +242 @@
 
     /*
-     * Calculate jitter (see RFC 3550 section A.8)
+     * Calculate jitter only when sequence is good (see RFC 3550 section A.8)
      */
-    
-    /* Get arrival time and convert timestamp to samples */
-    pj_get_timestamp(&ts);
-    ts.u64 = ts.u64 * sess->clock_rate / sess->ts_freq.u64;
-    arrival = ts.u32.lo;
-
-    transit = arrival - rtp_ts;
-    
-    /* Ignore the first N packets as they normally have bad jitter
-     * due to other threads working to establish the call
-     */
-    if (sess->transit == 0 || sess->received < 25 ) {
-        sess->transit = transit;
-        sess->stat.rx.jitter.min = 2000;
-    } else {
-        pj_int32_t d;
-        pj_uint32_t jitter;
-        
-        d = transit - sess->transit;
-        sess->transit = transit;
-        if (d < 0) 
-            d = -d;
-        
-        sess->jitter += d - ((sess->jitter + 8) >> 4);
-
-        /* Get jitter in usec */
-        if (d < 4294)
-            jitter = d * 1000000 / sess->clock_rate;
-        else {
-            jitter = d * 1000 / sess->clock_rate;
-            jitter *= 1000;
+    if (seq_st.diff == 1) {
+        /* Get arrival time and convert timestamp to samples */
+        pj_get_timestamp(&ts);
+        ts.u64 = ts.u64 * sess->clock_rate / sess->ts_freq.u64;
+        arrival = ts.u32.lo;
+
+        transit = arrival - rtp_ts;
+    
+        /* Ignore the first N packets as they normally have bad jitter
+         * due to other threads working to establish the call
+         */
+        if (sess->transit == 0 || sess->received < 25 ) {
+            sess->transit = transit;
+            sess->stat.rx.jitter.min = 2000;
+        } else {
+            pj_int32_t d;
+            pj_uint32_t jitter;
+            
+            d = transit - sess->transit;
+            sess->transit = transit;
+            if (d < 0) 
+                d = -d;
+            
+            sess->jitter += d - ((sess->jitter + 8) >> 4);
+
+            /* Get jitter in usec */
+            if (d < 4294)
+                jitter = d * 1000000 / sess->clock_rate;
+            else {
+                jitter = d * 1000 / sess->clock_rate;
+                jitter *= 1000;
+            }
+
+            /* 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;
         }
-
-        /* 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;
     }
 }
@@ -308 +313 @@
     pj_get_timestamp(&sess->rx_lsr_time);
 
-    TRACE_((THIS_FILE, "Rx RTCP SR: ntp_ts=%p", 
+    TRACE_((sess->name, "Rx RTCP SR: ntp_ts=%p", 
             sess->rx_lsr,
             (pj_uint32_t)(sess->rx_lsr_time.u64*65536/sess->ts_freq.u64)));
@@ -405 +410 @@
         }
 
-        TRACE_((THIS_FILE, "Rx RTCP RR: lsr=%p, dlsr=%p (%d:%03dms), "
+        TRACE_((sess->name, "Rx RTCP RR: lsr=%p, dlsr=%p (%d:%03dms), "
                            "now=%p, rtt=%p",
                 lsr, dlsr, dlsr/65536, (dlsr%65536)*1000/65536,
@@ -416 +421 @@
             unsigned rtt = (pj_uint32_t)eedelay;
             
-            TRACE_((THIS_FILE, "RTT is set to %d usec", rtt));
+            TRACE_((sess->name, "RTCP RTT is set to %d usec", rtt));
 
             if (rtt >= 1000000) {
@@ -441 +446 @@
 
         } else {
-            PJ_LOG(5, (THIS_FILE, "Internal NTP clock skew detected: "
+            PJ_LOG(5, (sess->name, "Internal RTCP NTP clock skew detected: "
                                    "lsr=%p, now=%p, dlsr=%p (%d:%03dms), "
                                    "diff=%d",
@@ -526 +531 @@
     rtcp_pkt->sr.ntp_frac = pj_htonl(ntp.lo);
 
-    TRACE_((THIS_FILE, "TX RTCP SR: ntp_ts=%p", 
+    TRACE_((sess->name, "TX RTCP SR: ntp_ts=%p", 
                        ((ntp.hi & 0xFFFF) << 16) + ((ntp.lo & 0xFFFF0000) 
                             >> 16)));
@@ -559 +564 @@
         rtcp_pkt->rr.dlsr = pj_htonl(dlsr);
 
-        TRACE_((THIS_FILE, "Tx RTCP RR: lsr=%p, lsr_time=%p, now=%p, dlsr=%p"
+        TRACE_((sess->name,"Tx RTCP RR: lsr=%p, lsr_time=%p, now=%p, dlsr=%p"
                            "(%ds:%03dms)",
                            lsr,