Changeset 5748 for pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

Timestamp:

Feb 27, 2018 3:37:53 AM (6 years ago)

Author:

ming

Message:

Fixed #2098: Add SDP attribute SSRC and CNAME

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -1361 +1361 @@
 
     /* Create RTP and RTCP sessions: */
-    if (info->rtp_seq_ts_set == 0) {
-        status = pjmedia_rtp_session_init(&channel->rtp, pt, info->ssrc);
-    } else {
+    {
         pjmedia_rtp_session_setting settings;
 
-        settings.flags = (pj_uint8_t)((info->rtp_seq_ts_set << 2) | 3);
+        settings.flags = (pj_uint8_t)((info->rtp_seq_ts_set << 2) |
+                                      (info->has_rem_ssrc << 4) | 3);
         settings.default_pt = pt;
         settings.sender_ssrc = info->ssrc;
+        settings.peer_ssrc = info->rem_ssrc;
         settings.seq = info->rtp_seq;
         settings.ts = info->rtp_ts;
@@ -1497 +1497 @@
     stream->num_keyframe = info->sk_cfg.count;
 
-    /* Build random RTCP CNAME. CNAME has user@host format */
-    stream->cname.ptr = p = (char*) pj_pool_alloc(pool, 20);
-    pj_create_random_string(p, 5);
-    p += 5;
-    *p++ = '@'; *p++ = 'p'; *p++ = 'j';
-    pj_create_random_string(p, 6);
-    p += 6;
-    *p++ = '.'; *p++ = 'o'; *p++ = 'r'; *p++ = 'g';
-    stream->cname.slen = p - stream->cname.ptr;
-
+    stream->cname = info->cname;
+    if (stream->cname.slen == 0) {
+        /* Build random RTCP CNAME. CNAME has user@host format */
+        stream->cname.ptr = p = (char*) pj_pool_alloc(pool, 20);
+        pj_create_random_string(p, 5);
+        p += 5;
+        *p++ = '@'; *p++ = 'p'; *p++ = 'j';
+        pj_create_random_string(p, 6);
+        p += 6;
+        *p++ = '.'; *p++ = 'o'; *p++ = 'r'; *p++ = 'g';
+        stream->cname.slen = p - stream->cname.ptr;
+    }
 
     /* Create mutex to protect jitter buffer: */