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

Timestamp:

Aug 25, 2011 11:59:39 AM (13 years ago)

Author:

bennylp

Message:

Re #1351: option to initially hide video preview window to avoid floating window. Also added pjsua_vid_preview_param_default()

File:

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

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

@@ -117 +117 @@
 }
 
+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;
+}
+
+
 /*****************************************************************************
  * Devices.
@@ -339 +346 @@
         if (wid != PJSUA_INVALID_ID) {
             /* Yes, it exists */
-
-            /* Show window if requested */
-            if (show) {
-                pjmedia_vid_dev_stream *rdr;
-                pj_bool_t hide = PJ_FALSE;
-                
-                rdr = pjmedia_vid_port_get_stream(pjsua_var.win[wid].vp_rend);
-                pj_assert(rdr);
-                status = pjmedia_vid_dev_stream_set_cap(
-                                        rdr,
-                                        PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE,
-                                        &hide);
-            }
+            /* Show/hide window */
+            pjmedia_vid_dev_stream *rdr;
+            pj_bool_t hide = !show;
+
+            rdr = pjmedia_vid_port_get_stream(pjsua_var.win[wid].vp_rend);
+            pj_assert(rdr);
+            status = pjmedia_vid_dev_stream_set_cap(
+                                    rdr, PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE,
+                                    &hide);
 
             /* Done */
@@ -833 +836 @@
  */
 PJ_DEF(pj_status_t) pjsua_vid_preview_start(pjmedia_vid_dev_index id,
-                                            pjsua_vid_preview_param *prm)
+                                            const pjsua_vid_preview_param *prm)
 {
     pjsua_vid_win_id wid;
     pjsua_vid_win *w;
     pjmedia_vid_dev_index rend_id;
+    pjsua_vid_preview_param default_param;
     pj_status_t status;
 
     PJSUA_LOCK();
 
-    if (prm) {
-        rend_id = prm->rend_id;
-    } else {
-        rend_id = PJMEDIA_VID_DEFAULT_RENDER_DEV;
-    }
+    if (!prm) {
+        pjsua_vid_preview_param_default(&default_param);
+        prm = &default_param;
+    }
+
+    rend_id = prm->rend_id;
 
     status = create_vid_win(PJSUA_WND_TYPE_PREVIEW, NULL, rend_id, id,
-                            PJ_TRUE, &wid);
+                            prm->show, &wid);
     if (status != PJ_SUCCESS) {
         PJSUA_UNLOCK();