Changeset 5406

Timestamp:

Aug 3, 2016 10:22:29 AM (8 years ago)

Author:

ming

Message:

Fixed #1948: Modify async dispatch to synchronous on Mac and iOS video device implementation

Thanks to Marc Etcheverry for the patch.

Location:

pjproject/trunk/pjmedia/src/pjmedia-videodev

Files:

• darwin_dev.m (modified) (13 diffs)
• ios_opengl_dev.m (modified) (7 diffs)

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

@@ -233 +233 @@
     darwin_sizes[idx++].preset_str = AVCaptureSessionPreset1920x1080;
 #endif
+}
+
+static void dispatch_sync_on_main_queue(void (^block)(void))
+{
+    if ([NSThread isMainThread]) {
+        block();
+    } else {
+        dispatch_sync(dispatch_get_main_queue(), block);
+    }
 }
 
@@ -944 +953 @@
                 if (strm->prev_layer) {
                     CALayer *prev_layer = strm->prev_layer;
-                    dispatch_async(dispatch_get_main_queue(), ^{
+                    dispatch_sync_on_main_queue(^{
                         [prev_layer removeFromSuperlayer];
                         [prev_layer release];
@@ -970 +979 @@
             
             /* Preview layer instantiation should be in main thread! */
-            dispatch_async(dispatch_get_main_queue(), ^{
+            dispatch_sync_on_main_queue(^{
                 /* Create preview layer */
                 AVCaptureVideoPreviewLayer *prev_layer =
@@ -1075 +1084 @@
             UIView *view = (UIView *)pval;
             strm->param.window.info.ios.window = (void *)pval;
-            dispatch_async(dispatch_get_main_queue(), ^{
+            dispatch_sync_on_main_queue(^{
                 [view addSubview:strm->render_view];
             });
@@ -1088 +1097 @@
             r.size = CGSizeMake(strm->param.disp_size.w,
                                 strm->param.disp_size.h);
-            dispatch_async(dispatch_get_main_queue(), ^{
+            dispatch_sync_on_main_queue(^{
                 strm->render_view.bounds = r;
                 if (strm->prev_layer)
@@ -1100 +1109 @@
             pj_memcpy(&strm->param.window_pos, pval,
                       sizeof(strm->param.window_pos));
-            dispatch_async(dispatch_get_main_queue(), ^{
+            dispatch_sync_on_main_queue(^{
                 strm->render_view.center =
                             CGPointMake(strm->param.window_pos.x +
@@ -1112 +1121 @@
         case PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE:
         {
-            dispatch_async(dispatch_get_main_queue(), ^{
+            dispatch_sync_on_main_queue(^{
                 strm->render_view.hidden = (BOOL)(*((pj_bool_t *)pval));
             });
@@ -1134 +1143 @@
             if (strm->param.dir == PJMEDIA_DIR_RENDER) {
 #if TARGET_OS_IPHONE
-                dispatch_async(dispatch_get_main_queue(), ^{
+                dispatch_sync_on_main_queue(^{
                     strm->render_view.transform =
                         CGAffineTransformMakeRotation(
@@ -1219 +1228 @@
 
     if (stream->cap_session) {
-        if ([NSThread isMainThread]) {
+        dispatch_sync_on_main_queue(^{
             [stream->cap_session startRunning];
-        } else {
-            dispatch_sync(dispatch_get_main_queue(), ^{
-                [stream->cap_session startRunning];
-            });
-        }
+        });
     
         if (![stream->cap_session isRunning]) {
@@ -1251 +1256 @@
     
     /* Perform video display in a background thread */
-    dispatch_async(dispatch_get_main_queue(), ^{
+    dispatch_sync_on_main_queue(^{
         [stream->vout_delegate update_image];
     });
@@ -1269 +1274 @@
     PJ_LOG(4, (THIS_FILE, "Stopping Darwin video stream"));
 
-    if ([NSThread isMainThread]) {
-        [stream->cap_session stopRunning];
-    } else {
-        dispatch_sync(dispatch_get_main_queue(), ^{
-            [stream->cap_session stopRunning];
-        });
-    }
+    dispatch_sync_on_main_queue(^{
+        [stream->cap_session stopRunning];
+    });
     
     return PJ_SUCCESS;
@@ -1313 +1314 @@
     if (stream->prev_layer) {
         CALayer *prev_layer = stream->prev_layer;
-        dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_sync_on_main_queue(^{
             [prev_layer removeFromSuperlayer];
             [prev_layer release];
@@ -1322 +1323 @@
     if (stream->render_view) {
         UIView *view = stream->render_view;
-        dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_sync_on_main_queue(^{
             [view removeFromSuperview];
             [view release];

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

@@ -20 +20 @@
 #include <pj/assert.h>
 #include <pj/log.h>
+#include <pj/os.h>
 
 #if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \
@@ -129 +130 @@
 }
 
+static void dispatch_sync_on_main_queue(void (^block)(void))
+{
+    if ([NSThread isMainThread]) {
+        block();
+    } else {
+        dispatch_sync(dispatch_get_main_queue(), block);
+    }
+}
+
 @implementation GLView
 
@@ -267 +277 @@
     
     rect = CGRectMake(0, 0, strm->param.disp_size.w, strm->param.disp_size.h);
-    strm->gl_view = [[GLView alloc] initWithFrame:rect];
+    dispatch_sync_on_main_queue(^{
+        strm->gl_view = [[GLView alloc] initWithFrame:rect];
+    });
     if (!strm->gl_view)
         return PJ_ENOMEM;
@@ -405 +417 @@
         UIView *view = (UIView *)pval;
         strm->param.window.info.ios.window = (void *)pval;
-        dispatch_async(dispatch_get_main_queue(),
-                       ^{[view addSubview:strm->gl_view];});
+        dispatch_sync_on_main_queue(^{[view addSubview:strm->gl_view];});
         return PJ_SUCCESS;
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE) {
         pj_memcpy(&strm->param.disp_size, pval, sizeof(strm->param.disp_size));
-        dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_sync_on_main_queue(^{
             strm->gl_view.bounds = CGRectMake(0, 0, strm->param.disp_size.w,
                                               strm->param.disp_size.h);
@@ -417 +428 @@
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION) {
         pj_memcpy(&strm->param.window_pos, pval, sizeof(strm->param.window_pos));
-        dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_sync_on_main_queue(^{
             strm->gl_view.center = CGPointMake(strm->param.window_pos.x +
                                                strm->param.disp_size.w/2.0,
@@ -425 +436 @@
         return PJ_SUCCESS;
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE) {
-        dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_sync_on_main_queue(^{
             strm->gl_view.hidden = (BOOL)(*((pj_bool_t *)pval));
         });
@@ -433 +444 @@
         if (strm->param.orient == PJMEDIA_ORIENT_UNKNOWN)
             return PJ_SUCCESS;
-        dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_sync_on_main_queue(^{
             strm->gl_view.transform =
                 CGAffineTransformMakeRotation(((int)strm->param.orient-1) *