Changeset 4197 for pjproject/trunk

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).

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/config.h (modified) (1 diff)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (4 diffs)
• pjmedia/src/pjmedia/transport_udp.c (modified) (3 diffs)
• pjmedia/src/pjmedia/vid_stream.c (modified) (5 diffs)
• pjnath/include/pjnath/stun_sock.h (modified) (1 diff)
• pjnath/include/pjnath/turn_sock.h (modified) (1 diff)
• pjnath/src/pjnath/turn_sock.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -372 +372 @@
 
 /**
- * Max packet size to support.
+ * Max packet size for transmitting direction.
  */
 #ifndef PJMEDIA_MAX_MTU                 
 #  define PJMEDIA_MAX_MTU                       1500
+#endif
+
+
+/**
+ * Max packet size for receiving direction.
+ */
+#ifndef PJMEDIA_MAX_MRU                 
+#  define PJMEDIA_MAX_MRU                       2000
 #endif
 

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -35 +35 @@
 #define THIS_FILE   "transport_srtp.c"
 
-/* Maximum size of packet */
-#define MAX_RTP_BUFFER_LEN          1500
-#define MAX_RTCP_BUFFER_LEN         1500
+/* Maximum size of outgoing packet */
+#define MAX_RTP_BUFFER_LEN          PJMEDIA_MAX_MTU
+#define MAX_RTCP_BUFFER_LEN         PJMEDIA_MAX_MTU
+
+/* Maximum SRTP crypto key length */
 #define MAX_KEY_LEN                 32
 
@@ -778 +780 @@
         return pjmedia_transport_send_rtp(srtp->member_tp, pkt, size);
 
-    if (size > sizeof(srtp->rtp_tx_buffer))
+    if (size > sizeof(srtp->rtp_tx_buffer) - 10)
         return PJ_ETOOBIG;
 
@@ -792 +794 @@
 
     if (err == err_status_ok) {
-        status = pjmedia_transport_send_rtp(srtp->member_tp, srtp->rtp_tx_buffer, len);
+        status = pjmedia_transport_send_rtp(srtp->member_tp, 
+                                            srtp->rtp_tx_buffer, len);
     } else {
         status = PJMEDIA_ERRNO_FROM_LIBSRTP(err);
@@ -823 +826 @@
     }
 
-    if (size > sizeof(srtp->rtcp_tx_buffer))
+    if (size > sizeof(srtp->rtcp_tx_buffer) - 10)
         return PJ_ETOOBIG;
 

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -30 +30 @@
 
 /* Maximum size of incoming RTP packet */
-#define RTP_LEN     PJMEDIA_MAX_MTU
+#define RTP_LEN     PJMEDIA_MAX_MRU
 
 /* Maximum size of incoming RTCP packet */
@@ -43 +43 @@
 typedef struct pending_write
 {
-    char                buffer[RTP_LEN];
+    char                buffer[PJMEDIA_MAX_MTU];
     pj_ioqueue_op_key_t op_key;
 } pending_write;
@@ -753 +753 @@
 
     /* Check that the size is supported */
-    PJ_ASSERT_RETURN(size <= RTP_LEN, PJ_ETOOBIG);
+    PJ_ASSERT_RETURN(size <= PJMEDIA_MAX_MTU, PJ_ETOOBIG);
 
     /* Simulate packet lost on TX direction */

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);

pjproject/trunk/pjnath/include/pjnath/stun_sock.h

@@ -219 +219 @@
 {
     /**
-     * Packet buffer size. Default value is PJ_STUN_SOCK_PKT_LEN.
+     * Packet buffer size.
+     *
+     * Default value is PJ_STUN_SOCK_PKT_LEN.
      */
     unsigned max_pkt_size;

pjproject/trunk/pjnath/include/pjnath/turn_sock.h

@@ -109 +109 @@
 typedef struct pj_turn_sock_cfg
 {
+    /**
+     * Packet buffer size.
+     *
+     * Default value is PJ_TURN_MAX_PKT_LEN.
+     */
+    unsigned max_pkt_size;
+
     /**
      * QoS traffic type to be set on this transport. When application wants

pjproject/trunk/pjnath/src/pjnath/turn_sock.c

@@ -98 +98 @@
 {
     pj_bzero(cfg, sizeof(*cfg));
+    cfg->max_pkt_size = PJ_TURN_MAX_PKT_LEN;
     cfg->qos_type = PJ_QOS_TYPE_BEST_EFFORT;
     cfg->qos_ignore_error = PJ_TRUE;
@@ -475 +476 @@
     /* Kick start pending read operation */
     status = pj_activesock_start_read(asock, turn_sock->pool, 
-                                      PJ_TURN_MAX_PKT_LEN, 0);
+                                      turn_sock->setting.max_pkt_size, 0);
 
     /* Init send_key */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -720 +720 @@
                   sizeof(cfg->qos_params));
     }
+
+    /* Configure packet size for STUN and TURN sockets */
+    ice_cfg.stun.cfg.max_pkt_size = PJMEDIA_MAX_MRU;
+    ice_cfg.turn.cfg.max_pkt_size = PJMEDIA_MAX_MRU;
 
     pj_bzero(&ice_cb, sizeof(pjmedia_ice_cb));