Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia/rtp.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/rtp.c (modified) (2 diffs)

pjproject/branches/projects/uwp/pjmedia/src/pjmedia/rtp.c

@@ -150 +150 @@
                                             unsigned *payloadlen)
 {
+    pjmedia_rtp_dec_hdr dec_hdr;
+
+    return pjmedia_rtp_decode_rtp2(ses, pkt, pkt_len, hdr, &dec_hdr, 
+                                   payload, payloadlen);
+}
+
+
+PJ_DEF(pj_status_t) pjmedia_rtp_decode_rtp2(
+                                            pjmedia_rtp_session *ses,
+                                            const void *pkt, int pkt_len,
+                                            const pjmedia_rtp_hdr **hdr,
+                                            pjmedia_rtp_dec_hdr *dec_hdr,
+                                            const void **payload,
+                                            unsigned *payloadlen)
+{
     int offset;
 
@@ -165 +180 @@
     offset = sizeof(pjmedia_rtp_hdr) + ((*hdr)->cc * sizeof(pj_uint32_t));
 
-    /* Adjust offset if RTP extension is used. */
+    /* Decode RTP extension. */
     if ((*hdr)->x) {
-        pjmedia_rtp_ext_hdr *ext = (pjmedia_rtp_ext_hdr*) 
-                                    (((pj_uint8_t*)pkt) + offset);
-        offset += ((pj_ntohs(ext->length)+1) * sizeof(pj_uint32_t));
+        dec_hdr->ext_hdr = (pjmedia_rtp_ext_hdr*)(((pj_uint8_t*)pkt) + offset);
+        dec_hdr->ext = (pj_uint32_t*)(dec_hdr->ext_hdr + 1);
+        dec_hdr->ext_len = pj_ntohs((dec_hdr->ext_hdr)->length);
+        offset += ((dec_hdr->ext_len + 1) * sizeof(pj_uint32_t));
+    } else {
+        dec_hdr->ext_hdr = NULL;
+        dec_hdr->ext = NULL;
+        dec_hdr->ext_len = 0;
     }