Changeset 3592 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/v4l2_dev.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/v4l2_dev.c (modified) (7 diffs)

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

@@ -82 +82 @@
     pjmedia_vid_dev_factory      base;
     pj_pool_t                   *pool;
+    pj_pool_t                   *dev_pool;
     pj_pool_factory             *pf;
 
@@ -120 +121 @@
 static pj_status_t vid4lin_factory_init(pjmedia_vid_dev_factory *f);
 static pj_status_t vid4lin_factory_destroy(pjmedia_vid_dev_factory *f);
+static pj_status_t vid4lin_factory_refresh(pjmedia_vid_dev_factory *f);
 static unsigned    vid4lin_factory_get_dev_count(pjmedia_vid_dev_factory *f);
 static pj_status_t vid4lin_factory_get_dev_info(pjmedia_vid_dev_factory *f,
@@ -156 +158 @@
     &vid4lin_factory_get_dev_info,
     &vid4lin_factory_default_param,
-    &vid4lin_factory_create_stream
+    &vid4lin_factory_create_stream,
+    &vid4lin_factory_refresh
 };
 
@@ -213 +216 @@
     pj_status_t status;
 
+    if (f->dev_pool) {
+        pj_pool_release(f->dev_pool);
+        f->dev_pool = NULL;
+    }
+
     pj_bzero(vdi, sizeof(vdi));
     old_count = f->dev_count;
     f->dev_count = 0;
+    f->dev_pool = pj_pool_create(f->pf, DRIVER_NAME, 500, 500, NULL);
 
     for (i=0; i<V4L2_MAX_DEVS && f->dev_count < V4L2_MAX_DEVS; ++i) {
         int fd;
         vid4lin_dev_info *pdi;
-        pj_pool_t *pool = f->pool;
+        pj_pool_t *pool = f->dev_pool;
         pj_uint32_t fmt_cap[8];
         int j, fmt_cnt=0;
@@ -313 +322 @@
     if (f->dev_count > old_count || f->dev_info == NULL) {
         f->dev_info = (vid4lin_dev_info*)
-                      pj_pool_calloc(f->pool,
+                      pj_pool_calloc(f->dev_pool,
                                      f->dev_count,
                                      sizeof(vid4lin_dev_info));
@@ -325 +334 @@
 /* API: init factory */
 static pj_status_t vid4lin_factory_init(pjmedia_vid_dev_factory *f)
+{
+    return vid4lin_factory_refresh(f);
+}
+
+/* API: destroy factory */
+static pj_status_t vid4lin_factory_destroy(pjmedia_vid_dev_factory *f)
+{
+    vid4lin_factory *cf = (vid4lin_factory*)f;
+    pj_pool_t *pool = cf->pool;
+
+    if (cf->dev_pool)
+        pj_pool_release(cf->dev_pool);
+    if (cf->pool) {
+        cf->pool = NULL;
+        pj_pool_release(pool);
+    }
+
+    return PJ_SUCCESS;
+}
+
+/* API: refresh the list of devices */
+static pj_status_t vid4lin_factory_refresh(pjmedia_vid_dev_factory *f)
 {
     vid4lin_factory *cf = (vid4lin_factory*)f;
@@ -333 +364 @@
         return status;
 
-    PJ_LOG(4, (THIS_FILE, "Video4Linux2 initialized with %d devices",
+    PJ_LOG(4, (THIS_FILE, "Video4Linux2 has %d devices",
                cf->dev_count));
-
-    return PJ_SUCCESS;
-}
-
-/* API: destroy factory */
-static pj_status_t vid4lin_factory_destroy(pjmedia_vid_dev_factory *f)
-{
-    vid4lin_factory *cf = (vid4lin_factory*)f;
-    pj_pool_t *pool = cf->pool;
-
-    if (cf->pool) {
-        cf->pool = NULL;
-        pj_pool_release(pool);
-    }
 
     return PJ_SUCCESS;