Changeset 3787 for pjproject

Timestamp:

Oct 4, 2011 1:35:41 PM (13 years ago)

Author:

bennylp

Message:

More re #1362: actually try to use the device switching capability in pjsua-lib, in pjsua_call_set_vid_strm(PJSUA_CALL_VID_STRM_CHANGE_CAP_DEV) operation

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia-videodev/videodev.h (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia-videodev/videodev.h

@@ -98 +98 @@
 /**
  * Parameter for switching device with PJMEDIA_VID_DEV_CAP_SWITCH capability.
+ * Initialize this with pjmedia_vid_dev_switch_param_default()
  */
 typedef struct pjmedia_vid_dev_switch_param
@@ -431 +432 @@
 (*pjmedia_vid_dev_factory_create_func_ptr)(pj_pool_factory*);
 
+/**
+ * Initialize pjmedia_vid_dev_switch_param.
+ *
+ * @param p         Parameter to be initialized.
+ */
+PJ_INLINE(void)
+pjmedia_vid_dev_switch_param_default(pjmedia_vid_dev_switch_param *p)
+{
+    pj_bzero(p, sizeof(*p));
+    p->target_id = PJMEDIA_VID_INVALID_DEV;
+}
 
 /**

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

@@ -1757 +1757 @@
 {
     pjsua_call_media *call_med;
+    pjmedia_vid_dev_stream *old_dev;
+    pjmedia_vid_dev_switch_param switch_prm;
     pjmedia_vid_dev_info info;
     pjsua_vid_win *w, *new_w = NULL;
@@ -1795 +1797 @@
     pj_assert(w->type == PJSUA_WND_TYPE_PREVIEW && w->vp_cap);
 
+    /* If the old device supports fast switching, then that's excellent! */
+    old_dev = pjmedia_vid_port_get_stream(w->vp_cap);
+    pjmedia_vid_dev_switch_param_default(&switch_prm);
+    switch_prm.target_id = cap_dev;
+    status = pjmedia_vid_dev_stream_set_cap(old_dev,
+                                            PJMEDIA_VID_DEV_CAP_SWITCH,
+                                            &switch_prm);
+    if (status == PJ_SUCCESS) {
+        w->preview_cap_id = cap_dev;
+        return PJ_SUCCESS;
+    }
+
+    /* No it doesn't support fast switching. Do slow switching then.. */
     status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
                                          PJMEDIA_DIR_ENCODING, &media_port);