Changeset 5088 for pjproject/trunk

Timestamp:

May 8, 2015 11:27:49 AM (10 years ago)

Author:

nanang

Message:

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.

File:

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

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

@@ -479 +479 @@
                 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);
-
-            pjmedia_vid_dev_stream_set_cap(
+                                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));
+            }
+
+            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 */
@@ -493 +514 @@
             pj_log_pop_indent();
 
-            return status;
+            return PJ_SUCCESS;
         }
     }