Changeset 3609 for pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua_internal.h

Timestamp:

Jul 7, 2011 7:46:33 AM (13 years ago)

Author:

bennylp

Message:

Initial commit re #1263 (PJSUA-LIB Video API):

• API designed and reviewed (pjsua.h)
• Implemented these APIs and added to pjsua sample application:
  • video device enums API
  • video capture preview API
• refactoring in PJSUA-LIB:
  • video stuffs go to pjsua_vid.c
  • call dump goes to pjsua_dump.c

We're still missing:

• video call API implementation
• media info and statistic API implementation

File:

• pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua_internal.h (modified) (3 diffs)

pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -304 +304 @@
 } pjsua_stun_resolve;
 
+typedef enum pjsua_vid_win_type
+{
+    PJSUA_WND_TYPE_NONE,
+    PJSUA_WND_TYPE_PREVIEW,
+    PJSUA_WND_TYPE_STREAM
+} pjsua_vid_win_type;
+
+typedef struct pjsua_vid_win
+{
+    pjsua_vid_win_type           type;          /**< Type.              */
+    pj_pool_t                   *pool;          /**< Own pool.          */
+    pjsua_call_id                call_id;       /**< Owner call or -1   */
+    pjmedia_vid_port            *vp_cap;        /**< Capture vidport.   */
+    pjmedia_vid_port            *vp_rend;       /**< Renderer vidport   */
+    pjmedia_vid_dev_index        preview_cap_id;/* Capture dev id       */
+} pjsua_vid_win;
 
 /**
@@ -398 +414 @@
     unsigned             rec_cnt;   /**< Number of file recorders.      */
     pjsua_file_data      recorder[PJSUA_MAX_RECORDERS];/**< Array of recs.*/
+
+    /* Video windows */
+#if PJSUA_HAS_VIDEO
+    pjsua_vid_win        win[PJSUA_MAX_VID_WINS]; /**< Array of windows */
+#endif
 };
 
@@ -632 +653 @@
                 char *buf, pj_size_t size);
 
+/*
+ * Video
+ */
+pj_status_t pjsua_vid_subsys_init(void);
+pj_status_t pjsua_vid_subsys_start(void);
+pj_status_t pjsua_vid_subsys_destroy(void);
+
+PJ_INLINE(void) pjsua_vid_win_reset(pjsua_vid_win_id wid)
+{
+#if PJSUA_HAS_VIDEO
+    pjsua_vid_win *w = &pjsua_var.win[wid];
+    pj_pool_t *pool = w->pool;
+
+    pj_bzero(w, sizeof(*w));
+    if (pool) pj_pool_reset(pool);
+    w->call_id = PJSUA_INVALID_ID;
+    w->pool = pool;
+    w->preview_cap_id = PJMEDIA_VID_INVALID_DEV;
+#endif
+}
+
 
 PJ_END_DECL