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

Timestamp:

Mar 8, 2012 8:34:30 AM (11 years ago)

Author:

nanang

Message:

Fix #1440:

• Use separate buffer for outgoing RTCP. Previously, RTCP generation might override outgoing RTP payload (because of shared buffer).
• Use exact size for RTCP-XR content buffer. Previously RTCP-XR content buffer size was set to PJMEDIA_MAX_MTU, quite huge wasted space.

File:

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

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

@@ -145 +145 @@
     pj_bool_t                initial_rr;    /**< Initial RTCP RR sent       */
     pj_bool_t                rtcp_sdes_bye_disabled;/**< Send RTCP SDES/BYE?*/
+    void                    *out_rtcp_pkt;  /**< Outgoing RTCP packet.      */
+    unsigned                 out_rtcp_pkt_size;
+                                            /**< Outgoing RTCP packet size. */
 
     /* RFC 2833 DTMF transmission queue: */
@@ -927 +930 @@
 
     if (with_sdes || with_bye || with_xr) {
-        pkt = (pj_uint8_t*) stream->enc->out_pkt;
+        pkt = (pj_uint8_t*) stream->out_rtcp_pkt;
         pj_memcpy(pkt, sr_rr_pkt, len);
-        max_len = stream->enc->out_pkt_size;
+        max_len = stream->out_rtcp_pkt_size;
     } else {
         pkt = sr_rr_pkt;
@@ -1890 +1893 @@
     pjmedia_channel *channel;
     pj_status_t status;
-    unsigned min_out_pkt_size;
     
     /* Allocate memory for channel descriptor */
@@ -1914 +1916 @@
     if (channel->out_pkt_size > PJMEDIA_MAX_MTU)
         channel->out_pkt_size = PJMEDIA_MAX_MTU;
-
-    /* It should big enough to hold (minimally) RTCP SR with an SDES. */
-    min_out_pkt_size =  sizeof(pjmedia_rtcp_sr_pkt) +
-                        sizeof(pjmedia_rtcp_common) +
-                        (4 + stream->cname.slen) +
-                        32;
-
-    if (channel->out_pkt_size < min_out_pkt_size)
-        channel->out_pkt_size = min_out_pkt_size;
 
     channel->out_pkt = pj_pool_alloc(pool, channel->out_pkt_size);
@@ -2261 +2254 @@
         }
     }
+
+    /* Allocate outgoing RTCP buffer, should be enough to hold SR/RR, SDES,
+     * BYE, and XR.
+     */
+    stream->out_rtcp_pkt_size =  sizeof(pjmedia_rtcp_sr_pkt) +
+                                 sizeof(pjmedia_rtcp_common) +
+                                 (4 + stream->cname.slen) +
+                                 32;
+#if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)
+    if (info->rtcp_xr_enabled) {
+        stream->out_rtcp_pkt_size += sizeof(pjmedia_rtcp_xr_pkt);
+    }
+#endif
+
+    if (stream->out_rtcp_pkt_size > PJMEDIA_MAX_MTU)
+        stream->out_rtcp_pkt_size = PJMEDIA_MAX_MTU;
+
+    stream->out_rtcp_pkt = pj_pool_alloc(pool, stream->out_rtcp_pkt_size);
 
     /* Only attach transport when stream is ready. */