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

Timestamp:

Mar 17, 2015 9:59:42 AM (9 years ago)

Author:

ming

Message:

Re #1786: Add support to specify output window as well for video preview param.

File:

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

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

@@ -189 +189 @@
     p->wnd_flags = 0;
     pj_bzero(&p->format, sizeof(p->format));
+    pj_bzero(&p->wnd, sizeof(p->wnd));
 }
 
@@ -439 +440 @@
                                   pj_bool_t show,
                                   unsigned wnd_flags,
+                                  const pjmedia_vid_dev_hwnd *wnd,
                                   pjsua_vid_win_id *id)
 {
@@ -607 +609 @@
         vp_param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS;
         vp_param.vidparam.window_flags = wnd_flags;
+        if (wnd) {
+            vp_param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW;
+            vp_param.vidparam.window = *wnd;
+        }
 
         status = pjmedia_vid_port_create(w->pool, &vp_param, &w->vp_rend);
@@ -847 +853 @@
                                     acc->cfg.vid_in_auto_show,
                                     acc->cfg.vid_wnd_flags,
+                                    NULL,
                                     &wid);
             if (status != PJ_SUCCESS) {
@@ -917 +924 @@
                                         PJSUA_HIDE_WINDOW,
                                         acc->cfg.vid_wnd_flags,
+                                        NULL,
                                         &wid);
                 if (status != PJ_SUCCESS) {
@@ -1087 +1095 @@
         fmt = &prm->format;
     status = create_vid_win(PJSUA_WND_TYPE_PREVIEW, fmt, rend_id, id,
-                            prm->show, prm->wnd_flags, &wid);
+                            prm->show, prm->wnd_flags,
+                            (prm->wnd.info.window? &prm->wnd: NULL), &wid);
     if (status != PJ_SUCCESS) {
         PJSUA_UNLOCK();
@@ -1921 +1930 @@
                                 PJSUA_HIDE_WINDOW,
                                 acc->cfg.vid_wnd_flags,
+                                NULL,
                                 &new_wid);
         if (status != PJ_SUCCESS)