Changeset 3841 for pjproject/trunk/pjmedia/include/pjmedia/jbuf.h

Timestamp:

Oct 24, 2011 9:28:13 AM (13 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3557:r3832

TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/include/pjmedia/jbuf.h (modified) (4 diffs)

pjproject/trunk/pjmedia/include/pjmedia/jbuf.h

@@ -49 +49 @@
  * Types of frame returned by the jitter buffer.
  */
-enum pjmedia_jb_frame_type 
+typedef enum pjmedia_jb_frame_type 
 {
     PJMEDIA_JB_MISSING_FRAME       = 0, /**< No frame because it's missing  */
@@ -57 +57 @@
     PJMEDIA_JB_ZERO_EMPTY_FRAME    = 3  /**< Zero frame is being returned
                                              because JB is empty.           */
-};
-
-
-/**
- * @see pjmedia_jb_frame_type.
- */
-typedef enum pjmedia_jb_frame_type pjmedia_jb_frame_type;
+} pjmedia_jb_frame_type;
+
+
+/**
+ * Enumeration of jitter buffer discard algorithm. The jitter buffer
+ * continuously calculates the jitter level to get the optimum latency at
+ * any time and in order to adjust the latency, the jitter buffer may need
+ * to discard some frames.
+ */
+typedef enum pjmedia_jb_discard_algo
+{
+    /**
+     * Jitter buffer should not discard any frame, except when the jitter
+     * buffer is full and a new frame arrives, one frame will be discarded
+     * to make space for the new frame.
+     */
+    PJMEDIA_JB_DISCARD_NONE        = 0,
+
+    /**
+     * Only discard one frame in at least 200ms when the latency is considered
+     * much higher than it should be. When the jitter buffer is full and a new
+     * frame arrives, one frame will be discarded to make space for the new
+     * frame.
+     */
+    PJMEDIA_JB_DISCARD_STATIC,
+
+    /**
+     * The discard rate is dynamically calculated based on actual parameters
+     * such as jitter level and latency. When the jitter buffer is full and
+     * a new frame arrives, one frame will be discarded to make space for the
+     * new frame.
+     */
+    PJMEDIA_JB_DISCARD_PROGRESSIVE
+
+} pjmedia_jb_discard_algo;
 
 
@@ -108 +136 @@
  * Create an adaptive jitter buffer according to the specification. If
  * application wants to have a fixed jitter buffer, it may call
- * #pjmedia_jbuf_set_fixed() after the jitter buffer is created.
+ * #pjmedia_jbuf_set_fixed() after the jitter buffer is created. Also
+ * if application wants to alter the discard algorithm, which the default
+ * PJMEDIA_JB_DISCARD_PROGRESSIVE, it may call #pjmedia_jbuf_set_discard().
  *
  * This function may allocate large chunk of memory to keep the frames in 
@@ -175 +205 @@
 
 /**
- * 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);
+ * Set the jitter buffer discard algorithm. The default discard algorithm,
+ * set in jitter buffer creation, is PJMEDIA_JB_DISCARD_PROGRESSIVE.
+ *
+ * @param jb            The jitter buffer.
+ * @param algo          The discard algorithm to be used.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_jbuf_set_discard(pjmedia_jbuf *jb,
+                                              pjmedia_jb_discard_algo algo);