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

Timestamp:

May 11, 2006 2:22:01 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug: incorrect remote and local PT for telephone-events (swapped)

File:

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

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

@@ -175 +175 @@
     pj_mutex_unlock( stream->jb_mutex );
 
-    if (status != PJ_SUCCESS || frame_type == PJMEDIA_JB_ZERO_FRAME ||
-        frame_type == PJMEDIA_JB_MISSING_FRAME) 
-    {
+    if (status != PJ_SUCCESS || frame_type != PJMEDIA_JB_NORMAL_FRAME) {
         frame->type = PJMEDIA_FRAME_TYPE_NONE;
         return PJ_SUCCESS;
@@ -628 +626 @@
 
         } else {
+            unsigned ext_seq;
+            ext_seq = channel->rtp.seq_ctrl.cycles | pj_ntohs(hdr->seq);
             status = pjmedia_jbuf_put_frame(stream->jb, payload, payloadlen,
-                                            pj_ntohs(hdr->seq));
+                                            ext_seq);
         }
         pj_mutex_unlock( stream->jb_mutex );
@@ -915 +915 @@
     status = pjmedia_jbuf_create(pool, &stream->port.info.name,
                                  stream->frame_size, 
-                                 jbuf_init, jbuf_max,
-                                 &stream->jb);
+                                 jbuf_max, &stream->jb);
     if (status != PJ_SUCCESS)
         goto err_cleanup;
 
+    /* Set jitter buffer to adaptive */
+    pjmedia_jbuf_set_adaptive( stream->jb, jbuf_init, 1, jbuf_max * 4 / 5);
 
     /* Create decoder channel: */