Changeset 5788 for pjproject/trunk/pjmedia/src/pjmedia/stream.c

Timestamp:

May 9, 2018 6:58:48 AM (5 years ago)

Author:

ming

Message:

Fixed #2087: Support for RTP and RTCP multiplexing

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -272 +272 @@
 }
 
+static void on_rx_rtcp( void *data,
+                        void *pkt,
+                        pj_ssize_t bytes_read);
 
 static pj_status_t send_rtcp(pjmedia_stream *stream,
@@ -1716 +1719 @@
         stream->rtcp.stat.rx.discard++;
         return;
+    }
+    
+    /* Check if multiplexing is allowed and the payload indicates RTCP. */
+    if (stream->si.rtcp_mux && hdr->pt >= 64 && hdr->pt <= 95) {
+        on_rx_rtcp(stream, pkt, bytes_read);
+        return;
     }
 
@@ -2504 +2513 @@
     pj_sockaddr_cp(&att_param.rem_addr, &info->rem_addr);
     pj_sockaddr_cp(&stream->rem_rtp_addr, &info->rem_addr);
-    if (pj_sockaddr_has_addr(&info->rem_rtcp.addr))
+    if (stream->si.rtcp_mux) {
+        pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_addr);           
+    } else if (pj_sockaddr_has_addr(&info->rem_rtcp.addr)) {
         pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_rtcp);
+    }
     att_param.addr_len = pj_sockaddr_get_len(&info->rem_addr);
     att_param.rtp_cb2 = &on_rx_rtp;