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

Timestamp:

Jul 5, 2012 7:26:29 AM (12 years ago)

Author:

nanang

Message:

Fix #1547:

• Added PJMEDIA_MAX_MRU to specify maximum packet size in receiving direction.
• Added max_pkt_size into pj_turn_sock_cfg, default is PJ_TURN_MAX_PKT_LEN.
• Fixed hardcoded MTU settings in media transport SRTP.
• Added MIN_CHUNKS_PER_FRM constant in video stream.

Notes:

• PJMEDIA_MAX_MTU & PJMEDIA_MAX_MRU to specify max packet size for TX and RX dir.
• For ICE media transport, TURN session limits outgoing packet size to PJ_TURN_MAX_PKT_LEN (the size of internal buffer for inserting TURN overheads).

File:

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

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

@@ -69 +69 @@
 #endif
 
+/* Due to network MTU limitation, a picture bitstream may be splitted into
+ * several chunks for RTP delivery. The chunk number may vary depend on the
+ * picture resolution and MTU. This constant specifies the minimum chunk
+ * number to be allocated to store a picture bitstream in decoding direction.
+ */
+#define MIN_CHUNKS_PER_FRM      30
+
 /* Video stream keep-alive feature is currently disabled. */
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA != 0
@@ -1358 +1365 @@
     pjmedia_video_format_detail *vfd_enc, *vfd_dec;
     char *p;
-    unsigned dec_mtu;
     pj_status_t status;
 
@@ -1411 +1417 @@
         info->codec_param->enc_mtu = PJMEDIA_MAX_MTU;
 
-    /* MTU estimation for decoding direction */
-    dec_mtu = PJMEDIA_MAX_MTU;
-
+    /* Packet size estimation for decoding direction */
     vfd_enc = pjmedia_format_get_video_format_detail(
                                         &info->codec_param->enc_fmt, PJ_TRUE);
@@ -1529 +1533 @@
     /* Init jitter buffer parameters: */
     frm_ptime       = 1000 * vfd_enc->fps.denum / vfd_enc->fps.num;
-    chunks_per_frm  = stream->frame_size / dec_mtu;
-    if (chunks_per_frm == 0) chunks_per_frm = 1;
+    chunks_per_frm  = stream->frame_size / PJMEDIA_MAX_MRU;
+    if (chunks_per_frm < MIN_CHUNKS_PER_FRM)
+        chunks_per_frm = MIN_CHUNKS_PER_FRM;
 
     /* JB max count, default 500ms */
@@ -1565 +1570 @@
     /* Create jitter buffer */
     status = pjmedia_jbuf_create(pool, &stream->dec->port.info.name,
-                                 dec_mtu + PJMEDIA_STREAM_RESV_PAYLOAD_LEN,
+                                 PJMEDIA_MAX_MRU,
                                  1000 * vfd_enc->fps.denum / vfd_enc->fps.num,
                                  jb_max, &stream->jb);