Changeset 1983 for pjproject/trunk/pjmedia/src/pjmedia/jbuf.c

Timestamp:

Jun 5, 2008 10:50:40 AM (16 years ago)

Author:

nanang

Message:

Ticket #473:

• fixed issue on Speex multiple frames (encoding: encoded bits concatenation & decoding: frames parsing)
• updated pjmedia stream & codecs on encoding multiple frames
• introduced bit_info in pjmedia_frame and jitter buffer

File:

• pjproject/trunk/pjmedia/src/pjmedia/jbuf.c (modified) (13 diffs)

pjproject/trunk/pjmedia/src/pjmedia/jbuf.c

@@ -39 +39 @@
     int         *flist_frame_type;
     pj_size_t   *flist_content_len;
+    pj_uint32_t *flist_bit_info;
     unsigned     flist_frame_size;
     unsigned     flist_max_count;
@@ -109 +110 @@
                                 framelist->flist_max_count);
 
+    framelist->flist_bit_info = (pj_uint32_t*)
+        pj_pool_zalloc(pool, sizeof(framelist->flist_bit_info[0]) * 
+                                framelist->flist_max_count);
+
     framelist->flist_empty = 1;
 
@@ -135 +140 @@
 static pj_bool_t jb_framelist_get(jb_framelist_t *framelist,
                                   void *frame, pj_size_t *size,
-                                  pjmedia_jb_frame_type *p_type) 
+                                  pjmedia_jb_frame_type *p_type,
+                                  pj_uint32_t *bit_info) 
 {
     if (!framelist->flist_empty) {
@@ -144 +150 @@
         *p_type = (pjmedia_jb_frame_type) 
                   framelist->flist_frame_type[framelist->flist_head];
-        *size   = framelist->flist_content_len[framelist->flist_head];
+        if (size)
+            *size   = framelist->flist_content_len[framelist->flist_head];
+        if (bit_info)
+            *bit_info = framelist->flist_bit_info[framelist->flist_head];
 
         pj_bzero(framelist->flist_buffer + 
@@ -222 +231 @@
                                      unsigned index,
                                      const void *frame,
-                                     unsigned frame_size) 
+                                     unsigned frame_size,
+                                     pj_uint32_t bit_info)
 {
     unsigned where;
@@ -264 +274 @@
     framelist->flist_frame_type[where] = PJMEDIA_JB_NORMAL_FRAME;
     framelist->flist_content_len[where] = frame_size;
+    framelist->flist_bit_info[where] = bit_info;
 
     return PJ_TRUE;
@@ -479 +490 @@
                                      int frame_seq)
 {
-    pjmedia_jbuf_put_frame2(jb, frame, frame_size, frame_seq, NULL);
+    pjmedia_jbuf_put_frame2(jb, frame, frame_size, 0, frame_seq, NULL);
 }
 
@@ -485 +496 @@
                                      const void *frame, 
                                      pj_size_t frame_size, 
+                                     pj_uint32_t bit_info,
                                      int frame_seq,
                                      pj_bool_t *discarded)
@@ -509 +521 @@
     if (seq_diff > 0) {
 
-        while (jb_framelist_put_at(&jb->jb_framelist,
-                                   frame_seq,frame,min_frame_size) == PJ_FALSE)
+        while (jb_framelist_put_at(&jb->jb_framelist, frame_seq, frame,
+                                   min_frame_size, bit_info) == PJ_FALSE)
         {
             jb_framelist_remove_head(&jb->jb_framelist,
@@ -526 +538 @@
         pj_bool_t res;
         res = jb_framelist_put_at(&jb->jb_framelist,frame_seq,frame,
-                                  min_frame_size);
+                                  min_frame_size, bit_info);
         if (discarded)
             *discarded = !res;
@@ -539 +551 @@
                                      char *p_frame_type)
 {
-    pj_size_t size;
-
-    pjmedia_jbuf_get_frame2(jb, frame, &size, p_frame_type);
+    pjmedia_jbuf_get_frame2(jb, frame, NULL, p_frame_type, NULL);
 }
 
@@ -550 +560 @@
                                      void *frame, 
                                      pj_size_t *size,
-                                     char *p_frame_type)
+                                     char *p_frame_type,
+                                     pj_uint32_t *bit_info)
 {
     pjmedia_jb_frame_type ftype;
@@ -582 +593 @@
 
     /* Retrieve a frame from frame list */
-    if (jb_framelist_get(&jb->jb_framelist,frame,size,&ftype) == PJ_FALSE) {
+    if (jb_framelist_get(&jb->jb_framelist,frame,size,&ftype,bit_info) ==
+        PJ_FALSE) 
+    {
         /* Can't return frame because jitter buffer is empty! */
         pj_bzero(frame, jb->jb_frame_size);