Changeset 3420 for pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia-videodev/videodev.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-videodev/videodev.h (modified) (12 diffs)

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

@@ -79 +79 @@
  *
  * Once video stream is running, application can also retrieve or set some
- * specific video capability, by using #pjmedia_vid_stream_get_cap() and
- * #pjmedia_vid_stream_set_cap() and specifying the desired capability. The
+ * specific video capability, by using #pjmedia_vid_dev_stream_get_cap() and
+ * #pjmedia_vid_dev_stream_set_cap() and specifying the desired capability. The
  * value of the capability is specified as pointer, and application needs to
  * supply the pointer with the correct value, according to the documentation
@@ -155 +155 @@
 
 
-/** Forward declaration for pjmedia_vid_stream */
-typedef struct pjmedia_vid_stream pjmedia_vid_stream;
+/** Forward declaration for pjmedia_vid_dev_stream */
+typedef struct pjmedia_vid_dev_stream pjmedia_vid_dev_stream;
 
 typedef enum pjmedia_event_type
@@ -188 +188 @@
     *                      stream to stop
     */
-    pj_status_t (*capture_cb)(pjmedia_vid_stream *stream,
+    pj_status_t (*capture_cb)(pjmedia_vid_dev_stream *stream,
                               void *user_data,
                               pjmedia_frame *frame);
@@ -211 +211 @@
     *                      stream to stop
     */
-    pj_status_t (*render_cb)(pjmedia_vid_stream *stream,
+    pj_status_t (*render_cb)(pjmedia_vid_dev_stream *stream,
                              void *user_data,
                              pjmedia_frame *frame);
@@ -227 +227 @@
     *                      video stream will ignore the particular event.
     */
-    pj_status_t (*on_event_cb)(pjmedia_vid_stream *stream,
+    pj_status_t (*on_event_cb)(pjmedia_vid_dev_stream *stream,
                                void *user_data,
                                pjmedia_vid_event *event);
@@ -477 +477 @@
  *                      error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_stream_create(const pjmedia_vid_param *param,
-                                               const pjmedia_vid_cb *cb,
-                                               void *user_data,
-                                               pjmedia_vid_stream **p_strm);
+PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_create(
+                                            const pjmedia_vid_param *param,
+                                            const pjmedia_vid_cb *cb,
+                                            void *user_data,
+                                            pjmedia_vid_dev_stream **p_strm);
 
 /**
@@ -492 +493 @@
  *                  error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_stream_get_param(pjmedia_vid_stream *strm,
-                                                  pjmedia_vid_param *param);
+PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_get_param(
+                                            pjmedia_vid_dev_stream *strm,
+                                            pjmedia_vid_param *param);
 
 /**
@@ -508 +510 @@
  *                  error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_stream_get_cap(pjmedia_vid_stream *strm,
-                                                pjmedia_vid_dev_cap cap,
-                                                void *value);
+PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_get_cap(
+                                            pjmedia_vid_dev_stream *strm,
+                                            pjmedia_vid_dev_cap cap,
+                                            void *value);
 
 /**
@@ -523 +526 @@
  *                  error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_stream_set_cap(pjmedia_vid_stream *strm,
-                                                pjmedia_vid_dev_cap cap,
-                                                const void *value);
+PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_set_cap(
+                                            pjmedia_vid_dev_stream *strm,
+                                            pjmedia_vid_dev_cap cap,
+                                            const void *value);
 
 /**
@@ -535 +539 @@
  *                  error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_stream_start(pjmedia_vid_stream *strm);
+PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_start(
+                                            pjmedia_vid_dev_stream *strm);
 
 /* Get/put frame API for passive stream */
-PJ_DECL(pj_status_t) pjmedia_vid_stream_get_frame(pjmedia_vid_stream *strm,
-                                                  pjmedia_frame *frame);
-
-PJ_DECL(pj_status_t) pjmedia_vid_stream_put_frame(pjmedia_vid_stream *strm,
-                                                  const pjmedia_frame *frame);
+PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_get_frame(
+                                            pjmedia_vid_dev_stream *strm,
+                                            pjmedia_frame *frame);
+
+PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_put_frame(
+                                            pjmedia_vid_dev_stream *strm,
+                                            const pjmedia_frame *frame);
 
 /**
@@ -552 +559 @@
  *                  error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_stream_stop(pjmedia_vid_stream *strm);
+PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_stop(
+                                            pjmedia_vid_dev_stream *strm);
 
 /**
@@ -562 +570 @@
  *                  error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_stream_destroy(pjmedia_vid_stream *strm);
+PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_destroy(
+                                            pjmedia_vid_dev_stream *strm);