Changeset 3593 for pjproject

Timestamp:

Jun 21, 2011 10:23:53 AM (13 years ago)

Author:

ming

Message:

Closed #1312. Add implementation for Mac OS X and iPhone OS.

Location:

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

Files:

• ios_dev.m (modified) (3 diffs)
• qt_dev.m (modified) (10 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/ios_dev.m

@@ -102 +102 @@
 static pj_status_t ios_factory_init(pjmedia_vid_dev_factory *f);
 static pj_status_t ios_factory_destroy(pjmedia_vid_dev_factory *f);
+static pj_status_t ios_factory_refresh(pjmedia_vid_dev_factory *f);
 static unsigned    ios_factory_get_dev_count(pjmedia_vid_dev_factory *f);
 static pj_status_t ios_factory_get_dev_info(pjmedia_vid_dev_factory *f,
@@ -139 +140 @@
     &ios_factory_get_dev_info,
     &ios_factory_default_param,
-    &ios_factory_create_stream
+    &ios_factory_create_stream,
+    &ios_factory_refresh
 };
 
@@ -239 +241 @@
     pj_pool_release(pool);
 
+    return PJ_SUCCESS;
+}
+
+/* API: refresh the list of devices */
+static pj_status_t ios_factory_refresh(pjmedia_vid_dev_factory *f)
+{
+    PJ_UNUSED_ARG(f);
     return PJ_SUCCESS;
 }

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/qt_dev.m

@@ -59 +59 @@
     pjmedia_vid_dev_factory      base;
     pj_pool_t                   *pool;
+    pj_pool_t                   *dev_pool;
     pj_pool_factory             *pf;
 
@@ -101 +102 @@
 static pj_status_t qt_factory_init(pjmedia_vid_dev_factory *f);
 static pj_status_t qt_factory_destroy(pjmedia_vid_dev_factory *f);
+static pj_status_t qt_factory_refresh(pjmedia_vid_dev_factory *f);
 static unsigned    qt_factory_get_dev_count(pjmedia_vid_dev_factory *f);
 static pj_status_t qt_factory_get_dev_info(pjmedia_vid_dev_factory *f,
@@ -136 +138 @@
     &qt_factory_get_dev_info,
     &qt_factory_default_param,
-    &qt_factory_create_stream
+    &qt_factory_create_stream,
+    &qt_factory_refresh
 };
 
@@ -176 +179 @@
 static pj_status_t qt_factory_init(pjmedia_vid_dev_factory *f)
 {
+    return qt_factory_refresh(f);
+}
+
+/* API: destroy factory */
+static pj_status_t qt_factory_destroy(pjmedia_vid_dev_factory *f)
+{
+    struct qt_factory *qf = (struct qt_factory*)f;
+    pj_pool_t *pool = qf->pool;
+
+    if (qf->dev_pool)
+        pj_pool_release(qf->dev_pool);
+    qf->pool = NULL;
+    if (pool)
+        pj_pool_release(pool);
+
+    return PJ_SUCCESS;
+}
+
+/* API: refresh the list of devices */
+static pj_status_t qt_factory_refresh(pjmedia_vid_dev_factory *f)
+{
     struct qt_factory *qf = (struct qt_factory*)f;
     struct qt_dev_info *qdi;
@@ -181 +205 @@
     NSAutoreleasePool *apool = [[NSAutoreleasePool alloc]init];
     NSArray *dev_array;
-
+    
+    if (qf->dev_pool) {
+        pj_pool_release(qf->dev_pool);
+        qf->dev_pool = NULL;
+    }
+    
     dev_array = [QTCaptureDevice inputDevices];
     for (i = 0; i < [dev_array count]; i++) {
@@ -194 +223 @@
     /* Initialize input and output devices here */
     qf->dev_count = 0;
+    qf->dev_pool = pj_pool_create(qf->pf, "qt video", 500, 500, NULL);
+    
     qf->dev_info = (struct qt_dev_info*)
-                   pj_pool_calloc(qf->pool, dev_count,
-                                  sizeof(struct qt_dev_info));
+    pj_pool_calloc(qf->dev_pool, dev_count,
+                   sizeof(struct qt_dev_info));
     for (i = 0; i < [dev_array count]; i++) {
         QTCaptureDevice *dev = [dev_array objectAtIndex:i];
@@ -207 +238 @@
             pj_bzero(qdi, sizeof(*qdi));
             [[dev localizedDisplayName] getCString:qdi->info.name
-                                        maxLength:sizeof(qdi->info.name)
-                                        encoding:
-                                        [NSString defaultCStringEncoding]];
+                                        maxLength:sizeof(qdi->info.name)
+                                        encoding:
+                                        [NSString defaultCStringEncoding]];
             [[dev uniqueID] getCString:qdi->dev_id
-                            maxLength:sizeof(qdi->dev_id)
-                            encoding:[NSString defaultCStringEncoding]];
+                            maxLength:sizeof(qdi->dev_id)
+                            encoding:[NSString defaultCStringEncoding]];
             strcpy(qdi->info.driver, "QT");         
             qdi->info.dir = PJMEDIA_DIR_CAPTURE;
             qdi->info.has_callback = PJ_TRUE;
-
+            
             qdi->info.fmt_cnt = 0;
             for (k = 0; k < [[dev formatDescriptions] count]; k++) {
@@ -231 +262 @@
             qdi->info.caps = PJMEDIA_VID_DEV_CAP_FORMAT;
             qdi->info.fmt = (pjmedia_format*)
-                            pj_pool_calloc(qf->pool, qdi->info.fmt_cnt,
-                                           sizeof(pjmedia_format));
+            pj_pool_calloc(qf->dev_pool, qdi->info.fmt_cnt,
+                           sizeof(pjmedia_format));
             for (j = k = 0; k < [[dev formatDescriptions] count]; k++) {
                 unsigned l;
@@ -249 +280 @@
                 }
             }
-
+            
             PJ_LOG(4, (THIS_FILE, " dev_id %d: %s", i, qdi->info.name));    
         }
     }
-
+    
     [apool release];
     
-    PJ_LOG(4, (THIS_FILE, "qt video initialized with %d devices",
+    PJ_LOG(4, (THIS_FILE, "qt video has %d devices",
                qf->dev_count));
     
-    return PJ_SUCCESS;
-}
-
-/* API: destroy factory */
-static pj_status_t qt_factory_destroy(pjmedia_vid_dev_factory *f)
-{
-    struct qt_factory *qf = (struct qt_factory*)f;
-    pj_pool_t *pool = qf->pool;
-
-    qf->pool = NULL;
-    pj_pool_release(pool);
-
     return PJ_SUCCESS;
 }
@@ -384 +403 @@
     PJ_ASSERT_RETURN(param->fmt.type == PJMEDIA_TYPE_VIDEO &&
                      param->fmt.detail_type == PJMEDIA_FORMAT_DETAIL_VIDEO &&
-                     param->dir == PJMEDIA_DIR_RENDER,
+                     param->dir == PJMEDIA_DIR_CAPTURE,
                      PJ_EINVAL);