Changeset 3629 for pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Jul 12, 2011 11:08:32 AM (13 years ago)

Author:

nanang

Message:

Re #1263:

• implemented video window management (get/set visibility, pos, resize)
• integrated video window and video capture preview into call

File:

• pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_call.c

@@ -111 +111 @@
         call_med->ssrc = pj_rand();
         call_med->strm.a.conf_slot = PJSUA_INVALID_ID;
+        call_med->strm.v.cap_win_id = PJSUA_INVALID_ID;
+        call_med->strm.v.rdr_win_id = PJSUA_INVALID_ID;
         call_med->call = call;
         call_med->idx = i;
@@ -1317 +1319 @@
                                                 call_med->strm.a.conf_slot;
         } else if (call_med->type == PJMEDIA_TYPE_VIDEO) {
-            PJ_TODO(vid_fill_in_call_info);
-            info->media[info->media_cnt].stream.vid.win_in = PJSUA_INVALID_ID;
-            info->media[info->media_cnt].stream.vid.cap_dev =
-                    PJMEDIA_VID_INVALID_DEV;
+            pjmedia_vid_dev_index cap_dev = PJMEDIA_VID_INVALID_DEV;
+
+            info->media[info->media_cnt].stream.vid.win_in = 
+                                                call_med->strm.v.rdr_win_id;
+
+            if (call_med->strm.v.cap_win_id != PJSUA_INVALID_ID) {
+                pjsua_vid_win *w = &pjsua_var.win[call_med->strm.v.cap_win_id];
+                cap_dev = w->preview_cap_id;
+            }
+            info->media[info->media_cnt].stream.vid.cap_dev = cap_dev;
         } else {
             continue;