summaryrefslogtreecommitdiff
path: root/pjsip/src
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2015-05-08 11:27:49 +0000
committerNanang Izzuddin <nanang@teluu.com>2015-05-08 11:27:49 +0000
commita9070aca093b9c4e284f86ed6678fef73824aeac (patch)
tree4b91e26f721ff8d66dddde56e2943b7f0456947c /pjsip/src
parent3866e1c3e2173b477cfaceb1f13f8a9458dcfaa3 (diff)
Close #1850: Updated pjsua_vid_preview_start() to ignore any errors upon starting an already existed preview, just print a log, also apply the specified window handle.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5088 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src')
-rw-r--r--pjsip/src/pjsua-lib/pjsua_vid.c31
1 files changed, 26 insertions, 5 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_vid.c b/pjsip/src/pjsua-lib/pjsua_vid.c
index c74abf68..7d8e9b82 100644
--- a/pjsip/src/pjsua-lib/pjsua_vid.c
+++ b/pjsip/src/pjsua-lib/pjsua_vid.c
@@ -478,21 +478,42 @@ static pj_status_t create_vid_win(pjsua_vid_win_type type,
} else {
strm = pjmedia_vid_port_get_stream(w->vp_rend);
}
-
pj_assert(strm);
+
+ /* Try to apply show/hide, window flags, and output window */
+
status = pjmedia_vid_dev_stream_set_cap(
- strm, PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE,
- &hide);
+ strm, PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE,
+ &hide);
+ if (status != PJ_SUCCESS) {
+ PJ_PERROR(4,(THIS_FILE, status,
+ "Ignored error on setting window visibility "
+ "on wid=%d", wid));
+ }
- pjmedia_vid_dev_stream_set_cap(
+ status = pjmedia_vid_dev_stream_set_cap(
strm, PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS,
&wnd_flags);
+ if (status != PJ_SUCCESS) {
+ PJ_PERROR(4,(THIS_FILE, status,
+ "Ignored error on setting window flags "
+ "on wid=%d", wid));
+ }
+
+ status = pjmedia_vid_dev_stream_set_cap(
+ strm, PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW,
+ &wnd_flags);
+ if (status != PJ_SUCCESS) {
+ PJ_PERROR(4,(THIS_FILE, status,
+ "Ignored error on setting window handle "
+ "on wid=%d", wid));
+ }
/* Done */
*id = wid;
pj_log_pop_indent();
- return status;
+ return PJ_SUCCESS;
}
}