Changeset 3420 for pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/jbuf.h

Timestamp:

Feb 24, 2011 7:47:55 AM (13 years ago)

Author:

nanang

Message:

Re #1182:

• Added video stream interface in vid_stream.h, the video stream will be able to handle different video formats in encoding and decoding direction.
• Renamed video device stream class identifiers from 'pjmedia_vid_stream*' to 'pjmedia_vid_dev_stream*' as 'pjmedia_vid_stream' is used by video stream interface.
• Added ffmpeg video capability to be able to parse SDP format param for H263 and also decide video format for encoding direction based on remote preference and local format-capability setting.
• Added some new APIs in jitter buffer for handling video stream: pjmedia_jbuf_put_frame3(), pjmedia_jbuf_get_frame3(), pjmedia_jbuf_peek_frame(), and pjmedia_jbuf_remove_frame().
• Moved pjmedia_stream_info_from_sdp() from session to stream

File:

• pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/jbuf.h (modified) (5 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/jbuf.h

@@ -69 +69 @@
  * This structure describes jitter buffer state.
  */
-struct pjmedia_jb_state
+typedef struct pjmedia_jb_state
 {
     /* Setting */
@@ -90 +90 @@
     unsigned    discard;            /**< Number of discarded frames.        */
     unsigned    empty;              /**< Number of empty on GET events.     */
-};
-
-
-/**
- * @see pjmedia_jb_state
- */
-typedef struct pjmedia_jb_state pjmedia_jb_state;
+} pjmedia_jb_state;
 
 
@@ -181 +175 @@
 
 /**
+ * Enable/disable the jitter buffer drift detection and handling mechanism.
+ * The default behavior is enabled.
+ *
+ * @param jb            The jitter buffer
+ * @param enable        Set to PJ_TRUE to enable or PJ_FALSE to disable.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_jbuf_enable_discard(pjmedia_jbuf *jb,
+                                                 pj_bool_t enable);
+
+
+/**
  * Destroy jitter buffer instance.
  *
@@ -244 +251 @@
                                        pj_bool_t *discarded);
 
+/**
+ * Put a frame to the jitter buffer. If the frame can be accepted (based
+ * on the sequence number), the jitter buffer will copy the frame and put
+ * it in the appropriate position in the buffer.
+ *
+ * Application MUST manage it's own synchronization when multiple threads
+ * are accessing the jitter buffer at the same time.
+ *
+ * @param jb            The jitter buffer.
+ * @param frame         Pointer to frame buffer to be stored in the jitter
+ *                      buffer.
+ * @param size          The frame size.
+ * @param bit_info      Bit precise info of the frame, e.g: a frame may not 
+ *                      exactly start and end at the octet boundary, so this
+ *                      field may be used for specifying start & end bit offset.
+ * @param frame_seq     The frame sequence number.
+ * @param frame_ts      The frame timestamp.
+ * @param discarded     Flag whether the frame is discarded by jitter buffer.
+ */
+PJ_DECL(void) pjmedia_jbuf_put_frame3( pjmedia_jbuf *jb, 
+                                       const void *frame, 
+                                       pj_size_t size, 
+                                       pj_uint32_t bit_info,
+                                       int frame_seq,
+                                       pj_uint32_t frame_ts,
+                                       pj_bool_t *discarded);
 /**
  * Get a frame from the jitter buffer. The jitter buffer will return the
@@ -294 +327 @@
 
 
+PJ_DECL(void) pjmedia_jbuf_get_frame3(pjmedia_jbuf *jb, 
+                                      void *frame, 
+                                      pj_size_t *size, 
+                                      char *p_frm_type,
+                                      pj_uint32_t *bit_info,
+                                      pj_uint32_t *ts);
+
+PJ_DECL(void) pjmedia_jbuf_peek_frame(pjmedia_jbuf *jb,
+                                      unsigned idx,
+                                      const void **frame, 
+                                      pj_size_t *size, 
+                                      char *p_frm_type,
+                                      pj_uint32_t *bit_info,
+                                      pj_uint32_t *ts);
+
+PJ_DECL(unsigned) pjmedia_jbuf_remove_frame(pjmedia_jbuf *jb, 
+                                            unsigned frame_cnt);
+
+
 /**
  * Get jitter buffer current state/settings.