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

Timestamp:

Oct 26, 2011 9:01:53 AM (12 years ago)

Author:

ming

Message:

Fixed #1401: Add support for video device's window flags

Now support flags PJMEDIA_VID_DEV_WND_BORDER and PJMEDIA_VID_DEV_WND_RESIZABLE.

File:

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

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

@@ -389 +389 @@
                                   pjmedia_vid_dev_index cap_id,
                                   pj_bool_t show,
+                                  unsigned wnd_flags,
                                   pjsua_vid_win_id *id)
 {
@@ -433 +434 @@
                                     &hide);
 
+            pjmedia_vid_dev_stream_set_cap(
+                                strm, PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS,
+                                &wnd_flags);
+
             /* Done */
             *id = wid;
@@ -483 +488 @@
             vp_param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE;
             vp_param.vidparam.window_hide = !show;
+            vp_param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS;
+            vp_param.vidparam.window_flags = wnd_flags;
         }
 
@@ -544 +551 @@
         vp_param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE;
         vp_param.vidparam.window_hide = !show;
+        vp_param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS;
+        vp_param.vidparam.window_flags = wnd_flags;
 
         status = pjmedia_vid_port_create(w->pool, &vp_param, &w->vp_rend);
@@ -787 +796 @@
                                     PJSUA_INVALID_ID,
                                     acc->cfg.vid_in_auto_show,
+                                    acc->cfg.vid_wnd_flags,
                                     &wid);
             if (status != PJ_SUCCESS) {
@@ -826 +836 @@
         if (si->dir & PJMEDIA_DIR_ENCODING && !call->local_hold)
         {
+            pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id];
             pjsua_vid_win *w;
             pjsua_vid_win_id wid;
@@ -856 +867 @@
                                         //acc->cfg.vid_cap_dev,
                                         PJSUA_HIDE_WINDOW,
+                                        acc->cfg.vid_wnd_flags,
                                         &wid);
                 if (status != PJ_SUCCESS) {
@@ -1071 +1083 @@
 
     status = create_vid_win(PJSUA_WND_TYPE_PREVIEW, NULL, rend_id, id,
-                            prm->show, &wid);
+                            prm->show, prm->wnd_flags, &wid);
     if (status != PJ_SUCCESS) {
         PJSUA_UNLOCK();
@@ -1848 +1860 @@
     new_wid = vid_preview_get_win(cap_dev, PJ_FALSE);
     if (new_wid == PJSUA_INVALID_ID) {
+        pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id];
+
         /* Create preview video window */
         status = create_vid_win(PJSUA_WND_TYPE_PREVIEW,
@@ -1854 +1868 @@
                                 cap_dev,
                                 PJSUA_HIDE_WINDOW,
-                                &new_wid);
+                                acc->cfg.vid_wnd_flags,
+                                &new_wid);
         if (status != PJ_SUCCESS)
             goto on_error;