Changeset 3750 for pjproject

Timestamp:

Sep 16, 2011 2:32:12 AM (13 years ago)

Author:

ming

Message:

Re #1370: Use GCD instead of NSThread for iOS video device.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_dev.m (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_dev.m

@@ -93 +93 @@
     UIImageView         *imgView;
     void                *buf;
+    dispatch_queue_t     render_queue;
     
     pj_timestamp         frame_ts;
@@ -334 +335 @@
     CGImageRelease(quartzImage);
     
+    dispatch_async(dispatch_get_main_queue(),
+                   ^{[stream->imgView setImage:image];});
+    /*
     [stream->imgView performSelectorOnMainThread:@selector(setImage:)
                      withObject:image waitUntilDone:NO];
+     */
     
     [pool release];
@@ -507 +512 @@
             strm->vout_delegate->stream = strm;
         }
+        
+        strm->render_queue = dispatch_queue_create("com.pjsip.render_queue",
+                                                   NULL);
+        if (!strm->render_queue)
+            goto on_error;
         
         strm->buf = pj_pool_alloc(pool, strm->frame_size);
@@ -596 +606 @@
     PJ_UNUSED_ARG(stream);
 
-    PJ_LOG(4, (THIS_FILE, "Starting qt video stream"));
+    PJ_LOG(4, (THIS_FILE, "Starting ios video stream"));
 
     if (stream->cap_session) {
@@ -619 +629 @@
     pj_memcpy(stream->buf, frame->buf, frame->size);
     /* Perform video display in a background thread */
-//    [stream->vout_delegate update_image];
+/*   
+    [stream->vout_delegate update_image];
     [NSThread detachNewThreadSelector:@selector(update_image)
               toTarget:stream->vout_delegate withObject:nil];
+*/
+    dispatch_async(stream->render_queue,
+                   ^{[stream->vout_delegate update_image];});
     
     [pool release];
@@ -635 +649 @@
     PJ_UNUSED_ARG(stream);
 
-    PJ_LOG(4, (THIS_FILE, "Stopping qt video stream"));
+    PJ_LOG(4, (THIS_FILE, "Stopping ios video stream"));
 
     if (stream->cap_session && [stream->cap_session isRunning])
@@ -677 +691 @@
     }
 */
+    if (stream->render_queue) {
+        dispatch_release(stream->render_queue);
+        stream->render_queue = NULL;
+    }
 
     pj_pool_release(stream->pool);