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

Timestamp:

Jun 6, 2018 8:38:29 AM (5 years ago)

Author:

nanang

Message:

Fixed #2118:

• Stream buffer calculation is now based on maximum bitrate and maximum receiving frame size.
• Added buffer size check when getting frame from jitter buffer, pjmedia_jbuf_get_frame*() specification has been updated that 'size' param is now input and output (was output only).

File:

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

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

@@ -87 +87 @@
     unsigned                out_pkt_size;   /**< Size of output buffer.     */
     void                   *out_pkt;        /**< Output buffer.             */
-    unsigned                out_pkt_len;    /**< Length of data in buffer.  */
     pjmedia_rtp_session     rtp;            /**< RTP session.               */
 };
@@ -531 +530 @@
     for (samples_count=0; samples_count < samples_required;) {
         char frame_type;
-        pj_size_t frame_size;
+        pj_size_t frame_size = channel->out_pkt_size;
         pj_uint32_t bit_info;
 
@@ -822 +821 @@
     while (f->samples_cnt < samples_required) {
         char frame_type;
-        pj_size_t frame_size;
+        pj_size_t frame_size = channel->out_pkt_size;
         pj_uint32_t bit_info;
 
@@ -2077 +2076 @@
 
     if (param->type == PJMEDIA_TYPE_AUDIO) {
-        channel->out_pkt_size = sizeof(pjmedia_rtp_hdr) +
-                                stream->codec_param.info.max_bps *
-                                PJMEDIA_MAX_FRAME_DURATION_MS /
-                                8 / 1000;
+        unsigned max_rx_based_size;
+        unsigned max_bps_based_size;
+
+        /* out_pkt buffer is used for sending and receiving, so lets calculate
+         * its size based on both. For receiving, we have stream->frame_size,
+         * which is used in configuring jitter buffer frame length.
+         * For sending, it is based on codec max_bps info.
+         */
+        max_rx_based_size = stream->frame_size;
+        max_bps_based_size = stream->codec_param.info.max_bps *
+                             PJMEDIA_MAX_FRAME_DURATION_MS / 8 / 1000;
+        channel->out_pkt_size = PJ_MAX(max_rx_based_size, max_bps_based_size);
+
+        /* Also include RTP header size (for sending) */
+        channel->out_pkt_size += sizeof(pjmedia_rtp_hdr);
+
         if (channel->out_pkt_size > PJMEDIA_MAX_MTU -
                                     PJMEDIA_STREAM_RESV_PAYLOAD_LEN)