Changeset 4006 for pjproject

Timestamp:

Apr 2, 2012 8:40:54 AM (13 years ago)

Author:

nanang

Message:

Misc (re #1446): Added macro PJMEDIA_MAX_VID_PAYLOAD_SIZE, also updated the default encoding MTU of ffmpeg codec & H263/H264 packetizers to this macro setting.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/config.h (modified) (1 diff)
• src/pjmedia-codec/ffmpeg_codecs.c (modified) (2 diffs)
• src/pjmedia-codec/h263_packetizer.c (modified) (1 diff)
• src/pjmedia-codec/h264_packetizer.c (modified) (1 diff)

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

@@ -1160 +1160 @@
 #endif
 
+
+/**
+ * Maximum video payload size. Note that this must not be greater than
+ * PJMEDIA_MAX_MTU.
+ *
+ * Default: (PJMEDIA_MAX_MTU - 100)
+ */
+#ifndef PJMEDIA_MAX_VID_PAYLOAD_SIZE                    
+#  define PJMEDIA_MAX_VID_PAYLOAD_SIZE          (PJMEDIA_MAX_MTU - 100)
+#endif
+
+
 /**
  * @}

pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c

@@ -933 +933 @@
     attr->enc_fmt.det.vid.max_bps = desc->max_bps;
 
-    /* MTU */
-    attr->enc_mtu = PJMEDIA_MAX_MTU;
+    /* Encoding MTU */
+    attr->enc_mtu = PJMEDIA_MAX_VID_PAYLOAD_SIZE;
 
     return PJ_SUCCESS;
@@ -1214 +1214 @@
 
     pj_memcpy(&ff->param, attr, sizeof(*attr));
+
+    /* Normalize encoding MTU in codec param */
+    if (attr->enc_mtu > PJMEDIA_MAX_VID_PAYLOAD_SIZE)
+        attr->enc_mtu = PJMEDIA_MAX_VID_PAYLOAD_SIZE;
 
     /* Open the codec */

pjproject/trunk/pjmedia/src/pjmedia-codec/h263_packetizer.c

@@ -99 +99 @@
     } else {
         p_->cfg.mode = PJMEDIA_H263_PACKETIZER_MODE_RFC4629;
-        p_->cfg.mtu = PJMEDIA_MAX_MTU;
+        p_->cfg.mtu = PJMEDIA_MAX_VID_PAYLOAD_SIZE;
     }
 

pjproject/trunk/pjmedia/src/pjmedia-codec/h264_packetizer.c

@@ -105 +105 @@
     } else {
         p_->cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_NON_INTERLEAVED;
-        p_->cfg.mtu = PJMEDIA_MAX_MTU;
+        p_->cfg.mtu = PJMEDIA_MAX_VID_PAYLOAD_SIZE;
     }