Changeset 4998 for pjproject/trunk

Timestamp:

Mar 19, 2015 4:10:11 AM (10 years ago)

Author:

nanang

Message:

Fixed #1824: Convert global index to local index for fast-switching feature of video capture device.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/videodev.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-videodev/videodev.c

@@ -836 +836 @@
                                             const void *value)
 {
+    /* For fast switching, device global index needs to be converted to
+     * local index before forwarding the request to the device stream.
+     */
+    if (cap == PJMEDIA_VID_DEV_CAP_SWITCH) {
+        pjmedia_vid_dev_factory *f;
+        unsigned local_idx;
+        pj_status_t status;
+        pjmedia_vid_dev_switch_param p = *(pjmedia_vid_dev_switch_param*)value;
+
+        status = lookup_dev(p.target_id, &f, &local_idx);
+        if (status != PJ_SUCCESS)
+            return status;
+
+        /* Make sure that current & target devices share the same factory */
+        if (f->sys.drv_idx != strm->sys.drv_idx)
+            return PJMEDIA_EVID_INVDEV;
+
+        p.target_id = local_idx;
+        return strm->op->set_cap(strm, cap, &p);
+    }
+
     return strm->op->set_cap(strm, cap, value);
 }