Changeset 388

Timestamp:

Apr 5, 2006 7:08:16 PM (18 years ago)

Author:

bennylp

Message:

Added detection/protection against inaccurate timestamp in RTCP

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/rtcp.c (modified) (6 diffs)
• pjsip-apps/src/samples/siprtp.c (modified) (4 diffs)

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

@@ -38 +38 @@
 #   define TRACE_(x)    PJ_LOG(3,x)
 #else
-#   define TRACE_(x)
+#   define TRACE_(x)    ;
 #endif
 
@@ -190 +190 @@
     pj_get_timestamp(&session->rx_lsr_time);
 
+    TRACE_((THIS_FILE, "Rx RTCP SR: ntp-ts=%p, time=%p", 
+            session->rx_lsr,
+            (pj_uint32_t)(session->rx_lsr_time.u64*65536/session->ts_freq.u64)));
+
     /* Calculate RTT if it has RR */
     if (size >= sizeof(pjmedia_rtcp_pkt)) {
@@ -221 +225 @@
             eedelay = (eedelay * 1000000) >> 16;
 
-            TRACE_((THIS_FILE, "Rx RTCP: lsr=%p, dlsr=%p (%d:%03dms), "
+            TRACE_((THIS_FILE, "Rx RTCP RR: lsr=%p, dlsr=%p (%d:%03dms), "
                                "now=%p, rtt=%p",
                     lsr, dlsr, dlsr/65536, (dlsr%65536)*1000/65536,
@@ -232 +236 @@
                 session->rtt_us = (pj_uint32_t)eedelay;
             } else {
-                TRACE_((THIS_FILE, "NTP clock running backwards?"));
+                PJ_LOG(3, (THIS_FILE, "Internal NTP clock skew detected"));
             }
         }
@@ -302 +306 @@
         pj_uint32_t lsr = session->rx_lsr;
         pj_uint64_t lsr_time = session->rx_lsr_time.u64;
-        
+        pj_uint32_t dlsr;
+        
+        /* Convert LSR time to 1/65536 seconds resolution */
+        lsr_time = (lsr_time << 16) / session->ts_freq.u64;
+
         /* Fill in LSR.
            LSR is the middle 32bit of the last SR NTP time received.
@@ -314 +322 @@
 
         /* Convert interval to 1/65536 seconds value */
-        ts.u64 = ((ts.u64 - lsr_time) << 16) / session->ts_freq.u64;
-
-        rtcp_pkt->rr.dlsr = pj_htonl( (pj_uint32_t)ts.u64 );
+        ts.u64 = (ts.u64 << 16) / session->ts_freq.u64;
+
+        /* Get DLSR */
+        dlsr = (pj_uint32_t)(ts.u64 - lsr_time);
+        rtcp_pkt->rr.dlsr = pj_htonl(dlsr);
+
+        TRACE_((THIS_FILE, "Tx RTCP RR: lsr=%p, lsr_time=%p, now=%p, dlsr=%p"
+                           "(%ds:%03dms)",
+                           lsr, 
+                           (pj_uint32_t)lsr_time,
+                           (pj_uint32_t)ts.u64, 
+                           dlsr,
+                           dlsr/65536,
+                           (dlsr%65536)*1000/65536 ));
     }
     

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

@@ -176 +176 @@
                        pj_status_t status);
 
-
+/* Print call */
+static void print_call(int call_index);
 
 
@@ -676 +677 @@
         pj_time_val null_time = {0, 0};
 
+        PJ_LOG(3,(THIS_FILE, "Call #%d disconnected. Reason=%s",
+                  call->index,
+                  pjsip_get_status_text(inv->cause)->ptr));
+        PJ_LOG(3,(THIS_FILE, "Call #%d statistics:", call->index));
+        print_call(call->index);
+
+
         call->inv = NULL;
         inv->mod_data[mod_siprtp.id] = NULL;
@@ -685 +693 @@
         call->connect_time = null_time;
 
-        PJ_LOG(3,(THIS_FILE, "Call #%d disconnected. Reason=%s",
-                  call->index,
-                  pjsip_get_status_text(inv->cause)->ptr));
 
     } else if (inv->state == PJSIP_INV_STATE_CONFIRMED) {
@@ -1472 +1477 @@
 
 
-    if (call->media[0].thread == NULL) {
+    if (call->inv == NULL || call->inv->state < PJSIP_INV_STATE_CONFIRMED) {
         return;
     }