Changeset 1778 for pjproject/branches/projects/jbuf2/pjmedia/include/pjmedia/jbuf2.h

Timestamp:

Feb 4, 2008 11:52:43 PM (16 years ago)

Author:

nanang

Message:

Ticket #461:

• added param userdata to JB callbacks
• added a bit optimization on pjmedia_jb2_get_frame(): shifting pointer instead of shifting frame buffer(memmove) when only parts of PCM frame needed
• modified DTX handling mechanism: detects jumping timestamp but good sequence to generate noise/silence frames, instead of relying on abnormal drift.
• modified behaviour on failure of allocating frame
• moved abnormal drift detection from compensate_drift() to update_state()
• added/removed some log for debugging purpose

File:

• pjproject/branches/projects/jbuf2/pjmedia/include/pjmedia/jbuf2.h (modified) (3 diffs)

pjproject/branches/projects/jbuf2/pjmedia/include/pjmedia/jbuf2.h

@@ -56 +56 @@
 {
     PJMEDIA_JB_PH_IDLE      = 0,        /**< No activity in PUT/GET or both */
-    PJMEDIA_JB_PH_LEARNING  = 1,        /**< Normal encoded frame */
-    PJMEDIA_JB_PH_RUNNING   = 2,        /**< Normal PCM frame */
+    PJMEDIA_JB_PH_LEARNING  = 1,        /**< Learning */
+    PJMEDIA_JB_PH_RUNNING   = 2,        /**< Running */
 } pjmedia_jb2_phase;
 
@@ -137 +137 @@
 
 /**
+ * This structure describes jitter buffer callback
+ */
+typedef struct pjmedia_jb2_cb
+{
+    pj_status_t (*decode) (pjmedia_jb2_frame *frame, void *userdata);
+    pj_status_t (*plc)    (pjmedia_jb2_frame *frame, void *userdata);
+    pj_status_t (*cng)    (pjmedia_jb2_frame *frame, void *userdata);
+    void                  *user_data;
+} pjmedia_jb2_cb;
+
+
+/**
  * This structure describes jitter buffer current status.
  */
@@ -162 +174 @@
 
 } pjmedia_jb2_setting;
-
-typedef struct pjmedia_jb2_cb
-{
-    pj_status_t (*decode) (pjmedia_jb2_frame *frame);
-    pj_status_t (*plc)    (pjmedia_jb2_frame *frame);
-    pj_status_t (*cng)    (pjmedia_jb2_frame *frame);
-} pjmedia_jb2_cb;