Changeset 4003 for pjproject/trunk

Timestamp:

Mar 30, 2012 8:55:18 AM (13 years ago)

Author:

nanang

Message:

Fix #1475: Fixed wrong frame size calculation used for jitter buffer initialization in video stream, it should be based on PJMEDIA_MAX_MTU instead of encoder MTU setting.

File:

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

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

@@ -1267 +1267 @@
     pjmedia_video_format_detail *vfd_enc, *vfd_dec;
     char *p;
-    unsigned mtu;
+    unsigned dec_mtu;
     pj_status_t status;
 
@@ -1319 +1319 @@
     if (info->codec_param->enc_mtu > PJMEDIA_MAX_MTU)
         info->codec_param->enc_mtu = PJMEDIA_MAX_MTU;
-    mtu = info->codec_param->enc_mtu;
+
+    /* MTU estimation for decoding direction */
+    dec_mtu = PJMEDIA_MAX_MTU;
 
     vfd_enc = pjmedia_format_get_video_format_detail(
@@ -1421 +1423 @@
     /* Init jitter buffer parameters: */
     frm_ptime       = 1000 * vfd_enc->fps.denum / vfd_enc->fps.num;
-    chunks_per_frm  = stream->frame_size / mtu;
+    chunks_per_frm  = stream->frame_size / dec_mtu;
     if (chunks_per_frm == 0) chunks_per_frm = 1;
 
@@ -1457 +1459 @@
     /* Create jitter buffer */
     status = pjmedia_jbuf_create(pool, &stream->dec->port.info.name,
-                                 mtu + PJMEDIA_STREAM_RESV_PAYLOAD_LEN,
+                                 dec_mtu + PJMEDIA_STREAM_RESV_PAYLOAD_LEN,
                                  1000 * vfd_enc->fps.denum / vfd_enc->fps.num,
                                  jb_max, &stream->jb);