diff options
| author | Riza Sulistyo <riza@teluu.com> | 2015-04-07 09:25:07 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2015-04-07 09:25:07 +0000 |
| commit | de96cb3477a2d96bf03cd1d9e541d36ce75f3b08 (patch) | |
| tree | 2a7db3e8cde849693e0939f1afb03d77b2b2c8b4 | |
| parent | 294449e59b44d5cb7cae6fd5c9c4a35d9d277080 (diff) | |
Misc (re #1782): Check if capturer is opened when getting window information. On slow devices (iPhone 3GS) the capturer might not be opened when the format changed is requested.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5049 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_vid.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_vid.c b/pjsip/src/pjsua-lib/pjsua_vid.c index a1f54f34..c74abf68 100644 --- a/pjsip/src/pjsua-lib/pjsua_vid.c +++ b/pjsip/src/pjsua-lib/pjsua_vid.c @@ -1250,20 +1250,24 @@ PJ_DEF(pj_status_t) pjsua_vid_win_get_info( pjsua_vid_win_id wid, PJSUA_LOCK(); w = &pjsua_var.win[wid]; - + wi->is_native = w->is_native; if (w->is_native) { pjmedia_vid_dev_stream *cap_strm; pjmedia_vid_dev_cap cap = PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW; - cap_strm = pjmedia_vid_port_get_stream(w->vp_cap); - if (!cap_strm) { + if (!w->vp_cap) { status = PJ_EINVAL; } else { - status = pjmedia_vid_dev_stream_get_cap(cap_strm, cap, &wi->hwnd); + cap_strm = pjmedia_vid_port_get_stream(w->vp_cap); + if (!cap_strm) { + status = PJ_EINVAL; + } else { + status = pjmedia_vid_dev_stream_get_cap(cap_strm, cap, + &wi->hwnd); + } } - PJSUA_UNLOCK(); return status; } |