Changeset 5049 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

Timestamp:

Apr 7, 2015 9:25:07 AM (10 years ago)

Author:

riza

Message:

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.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -1251 +1251 @@
     PJSUA_LOCK();
     w = &pjsua_var.win[wid];
-
+    
     wi->is_native = w->is_native;
 
@@ -1258 +1258 @@
         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;