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

pjproject/trunk/pjmedia/src/pjmedia/rtp.c

@@ -20 +20 @@
 #include <pjmedia/errno.h>
 #include <pj/log.h>
-#include <pj/os.h>      /* pj_gettimeofday() */
 #include <pj/sock.h>    /* pj_htonx, pj_htonx */
 #include <pj/assert.h>
+#include <pj/rand.h>
 #include <pj/string.h>
 
@@ -40 +40 @@
 
 PJ_DEF(pj_status_t) pjmedia_rtp_session_init( pjmedia_rtp_session *ses,
-                                         int default_pt, pj_uint32_t sender_ssrc )
-{
-    PJ_LOG(5, (THIS_FILE, "pjmedia_rtp_session_init: ses=%p, default_pt=%d, ssrc=0x%x",
+                                              int default_pt, 
+                                              pj_uint32_t sender_ssrc )
+{
+    PJ_LOG(5, (THIS_FILE, 
+               "pjmedia_rtp_session_init: ses=%p, default_pt=%d, ssrc=0x%x",
                ses, default_pt, sender_ssrc));
 
@@ -51 +53 @@
     }
 
-    /* If sender_ssrc is not specified, create from time value. */
+    /* If sender_ssrc is not specified, create from random value. */
     if (sender_ssrc == 0 || sender_ssrc == (pj_uint32_t)-1) {
-        pj_time_val tv;
-
-        pj_gettimeofday(&tv);
-        sender_ssrc  = (pj_uint32_t) pj_htonl(tv.sec);
+        sender_ssrc = pj_htonl(pj_rand());
     } else {
         sender_ssrc = pj_htonl(sender_ssrc);
     }
 
-    /* Initialize session. */
-    ses->out_extseq = 0;
+    /* Initialize session. 
+     * Initial sequence number SHOULD be random, according to RFC 3550.
+     */
+    ses->out_extseq = pj_rand();
     ses->peer_ssrc = 0;
     
-    /* Sequence number will be initialized when the first RTP packet is receieved. */
+    /* Sequence number will be initialized when the first RTP packet 
+     * is receieved.
+     */
 
     /* Build default header for outgoing RTP packet. */
@@ -86 +89 @@
 
 
-PJ_DEF(pj_status_t) pjmedia_rtp_encode_rtp( pjmedia_rtp_session *ses, int pt, int m,
-                                       int payload_len, int ts_len,
-                                       const void **rtphdr, int *hdrlen )
-{
-    PJ_UNUSED_ARG(payload_len)
-
-    PJ_LOG(6, (THIS_FILE, 
-              "pjmedia_rtp_encode_rtp: ses=%p, pt=%d, m=%d, pt_len=%d, ts_len=%d",
-              ses, pt, m, payload_len, ts_len));
+PJ_DEF(pj_status_t) pjmedia_rtp_encode_rtp( pjmedia_rtp_session *ses, 
+                                            int pt, int m,
+                                            int payload_len, int ts_len,
+                                            const void **rtphdr, int *hdrlen )
+{
+    PJ_UNUSED_ARG(payload_len);
 
     /* Update timestamp */
@@ -122 +122 @@
 
 PJ_DEF(pj_status_t) pjmedia_rtp_decode_rtp( pjmedia_rtp_session *ses, 
-                                       const void *pkt, int pkt_len,
-                                       const pjmedia_rtp_hdr **hdr,
-                                       const void **payload,
-                                       unsigned *payloadlen)
+                                            const void *pkt, int pkt_len,
+                                            const pjmedia_rtp_hdr **hdr,
+                                            const void **payload,
+                                            unsigned *payloadlen)
 {
     int offset;
 
-    PJ_UNUSED_ARG(ses)
-
-    PJ_LOG(6, (THIS_FILE, 
-              "pjmedia_rtp_decode_rtp: ses=%p, pkt=%p, pkt_len=%d",
-              ses, pkt, pkt_len));
+    PJ_UNUSED_ARG(ses);
 
     /* Assume RTP header at the start of packet. We'll verify this later. */
@@ -140 +136 @@
     /* Check RTP header sanity. */
     if ((*hdr)->v != RTP_VERSION) {
-        PJ_LOG(4, (THIS_FILE, "  invalid RTP version!"));
         return PJMEDIA_RTP_EINVER;
     }
@@ -149 +144 @@
     /* Adjust offset if RTP extension is used. */
     if ((*hdr)->x) {
-        pjmedia_rtp_ext_hdr *ext = (pjmedia_rtp_ext_hdr*) (((pj_uint8_t*)pkt) + offset);
+        pjmedia_rtp_ext_hdr *ext = (pjmedia_rtp_ext_hdr*) 
+                                    (((pj_uint8_t*)pkt) + offset);
         offset += (pj_ntohs(ext->length) * sizeof(pj_uint32_t));
     }
@@ -171 +167 @@
     pjmedia_rtp_status seq_st;
 
-    /* Check SSRC. */
-    if (ses->peer_ssrc == 0) ses->peer_ssrc = pj_ntohl(hdr->ssrc);
-    /*
-    if (pj_ntohl(ses->peer_ssrc) != hdr->ssrc) {
-        PJ_LOG(4, (THIS_FILE, "pjmedia_rtp_session_update: ses=%p, invalid ssrc 0x%p (!=0x%p)",
-                   ses, pj_ntohl(hdr->ssrc), ses->peer_ssrc));
-        return PJMEDIA_RTP_EINSSRC;
-    }
-    */
-
     /* Init status */
     seq_st.status.value = 0;
     seq_st.diff = 0;
 
+    /* Check SSRC. */
+    if (ses->peer_ssrc == 0) ses->peer_ssrc = pj_ntohl(hdr->ssrc);
+
+    if (pj_ntohl(hdr->ssrc) != ses->peer_ssrc) {
+        seq_st.status.flag.badssrc = 1;
+        ses->peer_ssrc = pj_ntohl(hdr->ssrc);
+    }
+
     /* Check payload type. */
     if (hdr->pt != ses->out_pt) {
-        PJ_LOG(4, (THIS_FILE, 
-                   "pjmedia_rtp_session_update: ses=%p, invalid payload "
-                   "type %d (expecting %d)",
-                   ses, hdr->pt, ses->out_pt));
         if (p_seq_st) {
+            p_seq_st->status.value = seq_st.status.value;
             p_seq_st->status.flag.bad = 1;
             p_seq_st->status.flag.badpt = 1;