Changeset 3592 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/videodev.c

Timestamp:

Jun 21, 2011 9:33:01 AM (13 years ago)

Author:

ming

Message:

Re #1312: Support for refreshing video device list
Add pjmedia-videodev API: pjmedia_vid_dev_refresh() and its implementation for Windows and Linux.

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/videodev.c (modified) (5 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/videodev.c

@@ -211 +211 @@
 
 /* Internal: init driver */
-static pj_status_t init_driver(unsigned drv_idx)
+static pj_status_t init_driver(unsigned drv_idx, pj_bool_t refresh)
 {
     struct driver *drv = &vid_subsys.drv[drv_idx];
@@ -218 +218 @@
     pj_status_t status;
 
-    /* Create the factory */
-    f = (*drv->create)(vid_subsys.pf);
-    if (!f)
-        return PJ_EUNKNOWN;
-
-    /* Call factory->init() */
-    status = f->op->init(f);
-    if (status != PJ_SUCCESS) {
-        f->op->destroy(f);
-        return status;
+    if (!refresh) {
+        /* Create the factory */
+        f = (*drv->create)(vid_subsys.pf);
+        if (!f)
+            return PJ_EUNKNOWN;
+
+        /* Call factory->init() */
+        status = f->op->init(f);
+        if (status != PJ_SUCCESS) {
+            f->op->destroy(f);
+            return status;
+        }
+    } else {
+        f = drv->f;
     }
 
@@ -357 +361 @@
     /* Initialize each factory and build the device ID list */
     for (i=0; i<vid_subsys.drv_cnt; ++i) {
-        status = init_driver(i);
+        status = init_driver(i, PJ_FALSE);
         if (status != PJ_SUCCESS) {
             deinit_driver(i);
@@ -377 +381 @@
 
     vid_subsys.drv[vid_subsys.drv_cnt].create = adf;
-    status = init_driver(vid_subsys.drv_cnt);
+    status = init_driver(vid_subsys.drv_cnt, PJ_FALSE);
     if (status == PJ_SUCCESS) {
         vid_subsys.drv_cnt++;
@@ -439 +443 @@
 
         vid_subsys.pf = NULL;
+    }
+    return PJ_SUCCESS;
+}
+
+/* API: Refresh the list of video devices installed in the system. */
+PJ_DEF(pj_status_t) pjmedia_vid_dev_refresh(void)
+{
+    unsigned i;
+    
+    vid_subsys.dev_cnt = 0;
+    for (i=0; i<vid_subsys.drv_cnt; ++i) {
+        struct driver *drv = &vid_subsys.drv[i];
+        
+        if (drv->f && drv->f->op->refresh) {
+            pj_status_t status = drv->f->op->refresh(drv->f);
+            if (status != PJ_SUCCESS) {
+                PJ_PERROR(4, (THIS_FILE, status, "Unable to refresh device "
+                                                 "list for %s", drv->name));
+            }
+        }
+        init_driver(i, PJ_TRUE);
     }
     return PJ_SUCCESS;