Changeset 3634 for pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Jul 13, 2011 8:51:10 AM (13 years ago)

Author:

nanang

Message:

Re #1263:

• Renamed API pjsua_call_set_vid_out() with pjsua_call_set_vid_strm().
• Implemented initial version of the function, features covered:
  • add, remove video media stream during the call
  • change which device to use during the call
  • start/stop video stream transmission

File:

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

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

@@ -1314 +1314 @@
 
 /* Initialize the media line */
-static pj_status_t pjsua_call_media_init(pjsua_call_media *call_med,
-                                         pjmedia_type type,
-                                         const pjsua_transport_config *tcfg,
-                                         int security_level,
-                                         int *sip_err_code)
+pj_status_t pjsua_call_media_init(pjsua_call_media *call_med,
+                                  pjmedia_type type,
+                                  const pjsua_transport_config *tcfg,
+                                  int security_level,
+                                  int *sip_err_code)
 {
     pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id];
@@ -1343 +1343 @@
         
         call_med->tp_st = PJSUA_MED_TP_IDLE;
+
+        /* While in initial call, set default video devices */
+        if (type == PJMEDIA_TYPE_VIDEO) {
+            call_med->strm.v.rdr_dev = acc->cfg.vid_rend_dev;
+            call_med->strm.v.cap_dev = acc->cfg.vid_cap_dev;
+            if (call_med->strm.v.rdr_dev == PJMEDIA_VID_DEFAULT_RENDER_DEV) {
+                pjmedia_vid_dev_info info;
+                pjmedia_vid_dev_get_info(call_med->strm.v.rdr_dev, &info);
+                call_med->strm.v.rdr_dev = info.id;
+            }
+            if (call_med->strm.v.cap_dev == PJMEDIA_VID_DEFAULT_CAPTURE_DEV) {
+                pjmedia_vid_dev_info info;
+                pjmedia_vid_dev_get_info(call_med->strm.v.cap_dev, &info);
+                call_med->strm.v.cap_dev = info.id;
+            }
+        }
     } else if (call_med->tp_st == PJSUA_MED_TP_DISABLED) {
         /* Media is being reenabled. */