Changeset 6078

Timestamp:

Sep 25, 2019 3:34:38 AM (5 years ago)

Author:

nanang

Message:

Fix #2236: Fixed exception in iOS Video Toolbox H264 due to UI API called on background thread.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/vid_toolbox.m (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/vid_toolbox.m

@@ -180 +180 @@
 /* Prototypes */
 static OSStatus create_decoder(struct vtool_codec_data *vtool_data);
+
+static void dispatch_sync_on_main_queue(void (^block)(void))
+{
+    if ([NSThread isMainThread]) {
+        block();
+    } else {
+        dispatch_sync(dispatch_get_main_queue(), block);
+    }
+}
 
 PJ_DEF(pj_status_t) pjmedia_codec_vid_toolbox_init(pjmedia_vid_codec_mgr *mgr,
@@ -760 +769 @@
     NSDictionary *frm_prop = NULL;
     OSStatus ret;
-#if TARGET_OS_IPHONE
-    UIApplicationState state;
-#endif
  
     PJ_ASSERT_RETURN(codec && input && out_size && output && has_more,
                      PJ_EINVAL);
-
-#if TARGET_OS_IPHONE
-    /* Skip encoding if app is not active, i.e. in the bg. */
-    state = [UIApplication sharedApplication].applicationState;
-    if (state != UIApplicationStateActive) {
-        *has_more = PJ_FALSE;
-        output->size = 0;
-        output->type = PJMEDIA_FRAME_TYPE_NONE;
-
-        return PJ_SUCCESS;
-    }
-#endif
 
     vtool_data = (vtool_codec_data*) codec->codec_data;
@@ -849 +843 @@
                                           NULL, NULL);
     if (ret == kVTInvalidSessionErr) {
+#if TARGET_OS_IPHONE
+        /* Just return if app is not active, i.e. in the bg. */
+        __block UIApplicationState state;
+
+        dispatch_sync_on_main_queue(^{
+            state = [UIApplication sharedApplication].applicationState;
+        });
+        if (state != UIApplicationStateActive) {
+            *has_more = PJ_FALSE;
+            output->size = 0;
+            output->type = PJMEDIA_FRAME_TYPE_NONE;
+
+            CVPixelBufferRelease(image_buf);
+            return PJ_SUCCESS;
+        }
+#endif
+
         /* Reset compression session */
         ret = create_encoder(vtool_data);
@@ -1113 +1124 @@
     pj_bool_t decode_whole = DECODE_WHOLE;
     OSStatus ret;
-#if TARGET_OS_IPHONE
-    UIApplicationState state;
-#endif
 
     PJ_ASSERT_RETURN(codec && count && packets && out_size && output,
                      PJ_EINVAL);
     PJ_ASSERT_RETURN(output->buf, PJ_EINVAL);
-
-#if TARGET_OS_IPHONE
-    /* Skip decoding if app is not active, i.e. in the bg. */
-    state = [UIApplication sharedApplication].applicationState;
-    if (state != UIApplicationStateActive) {
-        output->type = PJMEDIA_FRAME_TYPE_NONE;
-        output->size = 0;
-        output->timestamp = packets[0].timestamp;
-        return PJ_SUCCESS;
-    }
-#endif
 
     vtool_data = (vtool_codec_data*) codec->codec_data;
@@ -1281 +1278 @@
                           NULL, NULL);
                 if (ret == kVTInvalidSessionErr) {
+#if TARGET_OS_IPHONE
+                    /* Just return if app is not active, i.e. in the bg. */
+                    __block UIApplicationState state;
+
+                    dispatch_sync_on_main_queue(^{
+                        state = [UIApplication sharedApplication].applicationState;
+                    });
+                    if (state != UIApplicationStateActive) {
+                        output->type = PJMEDIA_FRAME_TYPE_NONE;
+                        output->size = 0;
+                        output->timestamp = packets[0].timestamp;
+
+                        CFRelease(block_buf);
+                        CFRelease(sample_buf);
+                        return PJ_SUCCESS;
+                    }
+#endif
                     if (vtool_data->dec_format)
                         CFRelease(vtool_data->dec_format);