Changeset 3571 for pjproject/branches/1.x/pjmedia/src/pjmedia/stream.c

Timestamp:

May 19, 2011 8:05:23 AM (13 years ago)

Author:

ming

Message:

Fixed #1268: Option for automatic/manual sending of RTCP SDES/BYE for the stream.

File:

• pjproject/branches/1.x/pjmedia/src/pjmedia/stream.c (modified) (8 diffs)

pjproject/branches/1.x/pjmedia/src/pjmedia/stream.c

@@ -144 +144 @@
     pj_uint32_t              rtcp_interval; /**< Interval, in timestamp.    */
     pj_bool_t                initial_rr;    /**< Initial RTCP RR sent       */
+    pj_bool_t                rtcp_sdes_bye_disabled;/**< Send RTCP SDES/BYE?*/
 
     /* RFC 2833 DTMF transmission queue: */
@@ -1827 +1828 @@
         /* Build RR or SR */
         pjmedia_rtcp_build_rtcp(&stream->rtcp, &sr_rr_pkt, &len);
-        pkt = (pj_uint8_t*) stream->enc->out_pkt;
-        pj_memcpy(pkt, sr_rr_pkt, len);
-        pkt += len;
-
-        /* Append SDES */
-        len = create_rtcp_sdes(stream, (pj_uint8_t*)pkt, 
-                               stream->enc->out_pkt_size - len);
-        if (len > 0) {
-            pkt += len;
-            len = ((pj_uint8_t*)pkt) - ((pj_uint8_t*)stream->enc->out_pkt);
-            pjmedia_transport_send_rtcp(stream->transport, 
-                                        stream->enc->out_pkt, len);
-        }
+
+        if (!stream->rtcp_sdes_bye_disabled) {
+            pkt = (pj_uint8_t*) stream->enc->out_pkt;
+            pj_memcpy(pkt, sr_rr_pkt, len);
+            pkt += len;
+
+            /* Append SDES */
+            len = create_rtcp_sdes(stream, (pj_uint8_t*)pkt, 
+                                   stream->enc->out_pkt_size - len);
+            if (len > 0) {
+                pkt += len;
+                len = ((pj_uint8_t*)pkt) - ((pj_uint8_t*)stream->enc->out_pkt);
+                pjmedia_transport_send_rtcp(stream->transport, 
+                                            stream->enc->out_pkt, len);
+            }
+        } else {
+            pjmedia_transport_send_rtcp(stream->transport, ss_rr_pkt, len);
+        }
 
         stream->initial_rr = PJ_TRUE;
@@ -1955 +1961 @@
     pjmedia_stream *stream;
     pj_str_t name;
-    unsigned jb_init, jb_max, jb_min_pre, jb_max_pre, len;
+    unsigned jb_init, jb_max, jb_min_pre, jb_max_pre;
     char *p;
     pj_status_t status;
@@ -1993 +1999 @@
     stream->rtcp_interval = (PJMEDIA_RTCP_INTERVAL-500 + (pj_rand()%1000)) *
                             info->fmt.clock_rate / 1000;
+    stream->rtcp_sdes_bye_disabled = info->rtcp_sdes_bye_disabled;
 
     stream->tx_event_pt = info->tx_event_pt ? info->tx_event_pt : -1;
@@ -2306 +2313 @@
 
     /* Send RTCP SDES */
-    len = create_rtcp_sdes(stream, (pj_uint8_t*)stream->enc->out_pkt, 
-                           stream->enc->out_pkt_size);
-    if (len != 0) {
-        pjmedia_transport_send_rtcp(stream->transport, 
-                                    stream->enc->out_pkt, len);
+    if (!stream->rtcp_sdes_bye_disabled) {
+        pjmedia_stream_send_rtcp_sdes(stream);
     }
 
@@ -2365 +2369 @@
 PJ_DEF(pj_status_t) pjmedia_stream_destroy( pjmedia_stream *stream )
 {
-    unsigned len;
     PJ_ASSERT_RETURN(stream != NULL, PJ_EINVAL);
 
@@ -2407 +2410 @@
 
     /* Send RTCP BYE */
-    if (stream->enc && stream->transport) {
-        len = create_rtcp_bye(stream, (pj_uint8_t*)stream->enc->out_pkt,
-                              stream->enc->out_pkt_size);
-        if (len != 0) {
-            pjmedia_transport_send_rtcp(stream->transport, 
-                                        stream->enc->out_pkt, len);
-        }
+    if (!stream->rtcp_sdes_bye_disabled) {
+        pjmedia_stream_send_rtcp_bye(stream);
     }
 
@@ -2761 +2759 @@
 }
 
+/*
+ * Send RTCP SDES.
+ */
+PJ_DEF(pj_status_t)
+pjmedia_stream_send_rtcp_sdes( pjmedia_stream *stream )
+{
+    unsigned len;
+
+    PJ_ASSERT_RETURN(stream, PJ_EINVAL);
+
+    len = create_rtcp_sdes(stream, (pj_uint8_t*)stream->enc->out_pkt,
+                           stream->enc->out_pkt_size);
+    if (len != 0) {
+        return pjmedia_transport_send_rtcp(stream->transport, 
+                                           stream->enc->out_pkt, len);
+    }
+
+    return PJ_SUCCESS;
+}
+
+/*
+ * Send RTCP BYE.
+ */
+PJ_DEF(pj_status_t)
+pjmedia_stream_send_rtcp_bye( pjmedia_stream *stream )
+{
+    PJ_ASSERT_RETURN(stream, PJ_EINVAL);
+
+    if (stream->enc && stream->transport) {
+        unsigned len;
+
+        len = create_rtcp_bye(stream, (pj_uint8_t*)stream->enc->out_pkt,
+                              stream->enc->out_pkt_size);
+        if (len != 0) {
+            return pjmedia_transport_send_rtcp(stream->transport, 
+                                               stream->enc->out_pkt, len);
+        }
+    }
+
+    return PJ_SUCCESS;
+}