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

Timestamp:

Jun 29, 2006 9:51:09 AM (18 years ago)

Author:

bennylp

Message:

Minor bug fix and enhancements: (1) fixed bug that caused out-of-order status to be raised when incoming sequence number is random, (2) changed RTCP to only calculate jitter when the RTP timestamp of the packet is different than previous one, and (3) change RTP to randomize initial sequence number

File:

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

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

@@ -141 +141 @@
     sess->avg_jitter = 0;
 
+    /* Last RX timestamp in RTP packet */
+    sess->rtp_last_ts = (unsigned)-1;
+
     /* Name */
     sess->name = name ? name : THIS_FILE,
@@ -198 +201 @@
     unsigned last_seq;
 
+    if (sess->stat.rx.pkt == 0) {
+        /* Init sequence for the first time. */
+        pjmedia_rtp_seq_init(&sess->seq_ctrl, (pj_uint16_t)seq);
+    } 
+
     sess->stat.rx.pkt++;
     sess->stat.rx.bytes += payload;
 
-    /* Update sequence numbers. */
+    /* Process the RTP packet. */
     last_seq = sess->seq_ctrl.max_seq;
     pjmedia_rtp_seq_update(&sess->seq_ctrl, (pj_uint16_t)seq, &seq_st);
+
     if (seq_st.status.flag.restart) {
         rtcp_init_seq(sess);
@@ -213 +222 @@
     }
 
-    if (seq_st.status.flag.outorder) {
+    if (seq_st.status.flag.outorder && !seq_st.status.flag.probation) {
         sess->stat.rx.reorder++;
         TRACE_((sess->name, "Out-of-order packet detected"));
@@ -259 +268 @@
 
     /*
-     * Calculate jitter only when sequence is good (see RFC 3550 section A.8)
+     * Calculate jitter only when sequence is good (see RFC 3550 section A.8),
+     * AND only when the timestamp is different than the last packet
+     * (see RTP FAQ).
      */
-    if (seq_st.diff == 1) {
+    if (seq_st.diff == 1 && rtp_ts != sess->rtp_last_ts) {
         /* Get arrival time and convert timestamp to samples */
         pj_get_timestamp(&ts);
@@ -310 +321 @@
         }
     }
+
+    /* Update timestamp of last RX RTP packet */
+    sess->rtp_last_ts = rtp_ts;
 }