diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-09-19 08:26:35 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-09-19 08:26:35 +0000 |
| commit | 1e1b229434f1fc558c0aa26746334186c97c80fe (patch) | |
| tree | a6bfd3f2b579defcddc18f1f47e2eba20d9ba64e /pjsip/include/pjsua-lib/pjsua_internal.h | |
| parent | 62bf8d3a35a49a55c97eaf50d71241ee512d1282 (diff) | |
Implemented native video preview support. This closes #1340
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3756 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/include/pjsua-lib/pjsua_internal.h')
| -rw-r--r-- | pjsip/include/pjsua-lib/pjsua_internal.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pjsip/include/pjsua-lib/pjsua_internal.h b/pjsip/include/pjsua-lib/pjsua_internal.h index ab3d2149..46547eec 100644 --- a/pjsip/include/pjsua-lib/pjsua_internal.h +++ b/pjsip/include/pjsua-lib/pjsua_internal.h @@ -307,6 +307,7 @@ typedef struct pjsua_stun_resolve pj_stun_sock *stun_sock; /**< Testing STUN sock */ } pjsua_stun_resolve; +/* See also pjsua_vid_win_type_name() */ typedef enum pjsua_vid_win_type { PJSUA_WND_TYPE_NONE, @@ -322,7 +323,8 @@ typedef struct pjsua_vid_win pjmedia_vid_port *vp_cap; /**< Capture vidport. */ pjmedia_vid_port *vp_rend; /**< Renderer vidport */ pjmedia_port *tee; /**< Video tee */ - pjmedia_vid_dev_index preview_cap_id;/* Capture dev id */ + pjmedia_vid_dev_index preview_cap_id;/**< Capture dev id */ + pj_bool_t is_native; /**< Preview is by dev */ } pjsua_vid_win; /** @@ -675,21 +677,11 @@ 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->ref_cnt = 0; - w->pool = pool; - w->preview_cap_id = PJMEDIA_VID_INVALID_DEV; +PJ_DECL(void) pjsua_vid_win_reset(pjsua_vid_win_id wid); #else - PJ_UNUSED_ARG(wid); +# define pjsua_vid_win_reset(wid) #endif -} PJ_END_DECL |