Changeset 3399 for pjproject

Timestamp:

Dec 17, 2010 1:17:23 PM (14 years ago)

Author:

ming

Message:

Re #1183:

• Add PJMEDA_VID_DEV_CAP_OUTPUT_WINDOW capability to ios_dev to allow application to provide their own window for the renderer to display the video.
• Perform image setting function in the main thread.

File:

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

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

@@ -190 +190 @@
     strcpy(qdi->info.driver, "iOS");        
     qdi->info.dir = PJMEDIA_DIR_RENDER;
-    qdi->info.has_callback = PJ_FALSE;   
+    qdi->info.has_callback = PJ_FALSE;
+    qdi->info.caps = PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW;
     
     if (NSClassFromString(@"AVCaptureSession")) {
@@ -204 +205 @@
         qdi = &qf->dev_info[i];
         qdi->info.fmt_cnt = PJ_ARRAY_SIZE(ios_fmts);        
-        qdi->info.caps = PJMEDIA_VID_DEV_CAP_FORMAT;
+        qdi->info.caps |= PJMEDIA_VID_DEV_CAP_FORMAT;
         qdi->info.fmt = (pjmedia_format*)
                         pj_pool_calloc(qf->pool, qdi->info.fmt_cnt,
@@ -329 +330 @@
     CGImageRelease(quartzImage);
     
-    [stream->imgView setImage:image];
+    [stream->imgView performSelectorOnMainThread:@selector(setImage:)
+                     withObject:image waitUntilDone:NO];
     
     [pool release];
@@ -453 +455 @@
         [strm->cap_session addOutput:strm->video_output];
         
-        // Configure your output.
+        /* Configure the video output */
         strm->vout_delegate = [VOutDelegate alloc];
         strm->vout_delegate->stream = strm;
@@ -477 +479 @@
         /* Get the main window */
         UIWindow *window = [[UIApplication sharedApplication] keyWindow];
+        
+        if (param->flags & PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW && param->window)
+            window = param->window;
         
         pj_assert(window);