Changeset 3435 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/jbuf.c

Timestamp:

Mar 2, 2011 8:37:31 AM (13 years ago)

Author:

nanang

Message:

Re #1182:

• Added remote frame-rate detection in to video stream.
• Fixed bitrate settings in ffmpeg codec.
• Fixed SDL dev to update internal SDL info when format changed.
• Minor fixes/updates, e.g:
  • added cleanup steps, fixed logs, etc, in sample app simpleua.c and vid_streamutil.c
  • fixed/added docs of the new APIs in the jitter buffer.

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/jbuf.c (modified) (9 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/jbuf.c

@@ -264 +264 @@
                                   pjmedia_jb_frame_type *p_type,
                                   pj_uint32_t *bit_info,
-                                  pj_uint32_t *ts) 
+                                  pj_uint32_t *ts,
+                                  int *seq) 
 {
     if (framelist->size) {
@@ -289 +290 @@
             if (ts)
                 *ts = framelist->ts[framelist->head];
+            if (seq)
+                *seq = framelist->origin;
 
             //pj_bzero(framelist->content + 
@@ -314 +317 @@
 
 static pj_bool_t jb_framelist_peek(jb_framelist_t *framelist,
-                                   unsigned idx,
+                                   unsigned offset,
                                    const void **frame,
                                    pj_size_t *size,
                                    pjmedia_jb_frame_type *type,
                                    pj_uint32_t *bit_info,
-                                   pj_uint32_t *ts) 
-{
-    unsigned pos;
-
-    if (idx >= jb_framelist_eff_size(framelist))
+                                   pj_uint32_t *ts,
+                                   int *seq) 
+{
+    unsigned pos, idx;
+
+    if (offset >= jb_framelist_eff_size(framelist))
         return PJ_FALSE;
 
     pos = framelist->head;
+    idx = offset;
 
     /* Find actual peek position, note there may be discarded frames */
@@ -351 +356 @@
     if (ts)
         *ts = framelist->ts[pos];
+    if (seq)
+        *seq = framelist->origin + offset;
 
     return PJ_TRUE;
@@ -932 +939 @@
                                      char *p_frame_type)
 {
-    pjmedia_jbuf_get_frame3(jb, frame, NULL, p_frame_type, NULL, NULL);
+    pjmedia_jbuf_get_frame3(jb, frame, NULL, p_frame_type, NULL,
+                            NULL, NULL);
 }
 
@@ -944 +952 @@
                                      pj_uint32_t *bit_info)
 {
-    pjmedia_jbuf_get_frame3(jb, frame, size, p_frame_type, bit_info, NULL);
+    pjmedia_jbuf_get_frame3(jb, frame, size, p_frame_type, bit_info,
+                            NULL, NULL);
 }
 
@@ -955 +964 @@
                                      char *p_frame_type,
                                      pj_uint32_t *bit_info,
-                                     pj_uint32_t *ts)
+                                     pj_uint32_t *ts,
+                                     int *seq)
 {
     if (jb->jb_status == JB_STATUS_PREFETCHING) {
@@ -980 +990 @@
         /* Try to retrieve a frame from frame list */
         res = jb_framelist_get(&jb->jb_framelist, frame, size, &ftype, 
-                               bit_info, ts);
+                               bit_info, ts, seq);
         if (res) {
             /* We've successfully retrieved a frame from the frame list, but
@@ -1050 +1060 @@
 
 PJ_DEF(void) pjmedia_jbuf_peek_frame( pjmedia_jbuf *jb,
-                                      unsigned idx,
+                                      unsigned offset,
                                       const void **frame, 
                                       pj_size_t *size, 
                                       char *p_frm_type,
                                       pj_uint32_t *bit_info,
-                                      pj_uint32_t *ts)
+                                      pj_uint32_t *ts,
+                                      int *seq)
 {
     pjmedia_jb_frame_type ftype;
     pj_bool_t res;
 
-    res = jb_framelist_peek(&jb->jb_framelist, idx, frame, size, &ftype, bit_info, ts);
+    res = jb_framelist_peek(&jb->jb_framelist, offset, frame, size, &ftype,
+                            bit_info, ts, seq);
     if (!res)
         *p_frm_type = PJMEDIA_JB_ZERO_EMPTY_FRAME;