summaryrefslogtreecommitdiff
path: root/pjsip/src/pjsua-lib
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2014-09-15 08:59:46 +0000
committerLiong Sauw Ming <ming@teluu.com>2014-09-15 08:59:46 +0000
commit57b41530ce3c94c94c135b90199b9cc013c402e7 (patch)
treea37892ebb180e40fe4efb19dbaa4c1fcb8b6397f /pjsip/src/pjsua-lib
parent0945eb513ed2cead6aa391b44cf998b8491d4c53 (diff)
Fixed #1786: Add support to specify video format when opening video preview
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4921 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib')
-rw-r--r--pjsip/src/pjsua-lib/pjsua_vid.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_vid.c b/pjsip/src/pjsua-lib/pjsua_vid.c
index 897b94c1..b0ae5e7b 100644
--- a/pjsip/src/pjsua-lib/pjsua_vid.c
+++ b/pjsip/src/pjsua-lib/pjsua_vid.c
@@ -187,6 +187,7 @@ PJ_DEF(void) pjsua_vid_preview_param_default(pjsua_vid_preview_param *p)
p->rend_id = PJMEDIA_VID_DEFAULT_RENDER_DEV;
p->show = PJ_TRUE;
p->wnd_flags = 0;
+ pj_bzero(&p->format, sizeof(p->format));
}
@@ -1066,6 +1067,7 @@ PJ_DEF(pj_status_t) pjsua_vid_preview_start(pjmedia_vid_dev_index id,
pjsua_vid_win *w;
pjmedia_vid_dev_index rend_id;
pjsua_vid_preview_param default_param;
+ const pjmedia_format *fmt = NULL;
pj_status_t status;
if (!prm) {
@@ -1081,7 +1083,9 @@ PJ_DEF(pj_status_t) pjsua_vid_preview_start(pjmedia_vid_dev_index id,
rend_id = prm->rend_id;
- status = create_vid_win(PJSUA_WND_TYPE_PREVIEW, NULL, rend_id, id,
+ if (prm->format.detail_type == PJMEDIA_FORMAT_DETAIL_VIDEO)
+ fmt = &prm->format;
+ status = create_vid_win(PJSUA_WND_TYPE_PREVIEW, fmt, rend_id, id,
prm->show, prm->wnd_flags, &wid);
if (status != PJ_SUCCESS) {
PJSUA_UNLOCK();