解决ijk第一次初始化时异步线程调用主线程造成的线程卡顿问题

config/module-lite.sh

@@ -257,3 +257,4 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-videotoolbox"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-linux-perf"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bzlib"
 
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-openssl"

ios/IJKMediaDemo/IJKMediaDemo.xcodeproj/project.pbxproj

@@ -50,6 +50,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		2551A86A225D8EE0009873DC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = E6D74F2918A5F94B00165BFD /* IJKMediaPlayer.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5450B0431E63EA4300568494;
+			remoteInfo = IJKMediaFrameworkWithSSL;
+		};
 		E654EAD61B6B28B100B0F2D0 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = E6D74F2918A5F94B00165BFD /* IJKMediaPlayer.xcodeproj */;
@@ -68,7 +75,7 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = E6D74F2918A5F94B00165BFD /* IJKMediaPlayer.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = E654EA891B6B27E600B0F2D0;
+			remoteGlobalIDString = 5450AFC11E63EA4300568494;
 			remoteInfo = IJKMediaFramework;
 		};
 /* End PBXContainerItemProxy section */
@@ -274,6 +281,7 @@
 			isa = PBXGroup;
 			children = (
 				E654EAD71B6B28B100B0F2D0 /* IJKMediaFramework.framework */,
+				2551A86B225D8EE0009873DC /* IJKMediaFrameworkWithSSL.framework */,
 				E654EAD91B6B28B100B0F2D0 /* IJKMediaFrameworkTests.xctest */,
 			);
 			name = Products;
@@ -309,12 +317,19 @@
 				CLASSPREFIX = IJK;
 				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = bilibili;
+				TargetAttributes = {
+					E6903EFB17EAF70200CFD954 = {
+						DevelopmentTeam = 6FNUHS4H7D;
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = E6903EF717EAF70200CFD954 /* Build configuration list for PBXProject "IJKMediaDemo" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = E6903EF317EAF70200CFD954;
@@ -334,6 +349,13 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		2551A86B225D8EE0009873DC /* IJKMediaFrameworkWithSSL.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = IJKMediaFrameworkWithSSL.framework;
+			remoteRef = 2551A86A225D8EE0009873DC /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		E654EAD71B6B28B100B0F2D0 /* IJKMediaFramework.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -481,6 +503,8 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = 6FNUHS4H7D;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "IJKMediaDemo/IJKMediaDemo-Prefix.pch";
 				INFOPLIST_FILE = "IJKMediaDemo/IJKMediaDemo-Info.plist";
@@ -489,6 +513,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "tv.danmaku.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "T_*";
 				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};
@@ -501,6 +526,8 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = 6FNUHS4H7D;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "IJKMediaDemo/IJKMediaDemo-Prefix.pch";
 				INFOPLIST_FILE = "IJKMediaDemo/IJKMediaDemo-Info.plist";
@@ -509,6 +536,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "tv.danmaku.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "T_*";
 				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};

ios/IJKMediaDemo/IJKMediaDemo/IJKDemoInputURLViewController.m

@@ -40,6 +40,7 @@ - (void)viewDidLoad {
 }
 
 - (void)onClickPlayButton {
+    self.textView.text = @"https://api.huoshan.com/hotsoon/item/video/_playback/?video_id=bea0903abb954f58ac0e17c21226a3c3&line=1&app_id=1115&watermark=1";
     NSURL *url = [NSURL URLWithString:self.textView.text];
     NSString *scheme = [[url scheme] lowercaseString];
 

ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLAudioQueueController.m

@@ -26,6 +26,7 @@
 #import "IJKSDLAudioQueueController.h"
 #import "IJKSDLAudioKit.h"
 #import "ijksdl_log.h"
+#import "ijksdl_thread_ios.h"
 
 #import <AVFoundation/AVFoundation.h>
 
@@ -41,8 +42,7 @@ @implementation IJKSDLAudioQueueController {
     NSLock *_lock;
 }
 
-- (id)initWithAudioSpec:(const SDL_AudioSpec *)aSpec
-{
+- (id)initWithAudioSpec:(const SDL_AudioSpec *)aSpec {
     self = [super init];
     if (self) {
         if (aSpec == NULL) {
@@ -52,12 +52,12 @@ - (id)initWithAudioSpec:(const SDL_AudioSpec *)aSpec
         _spec = *aSpec;
 
         if (aSpec->format != AUDIO_S16SYS) {
-            NSLog(@"aout_open_audio: unsupported format %d\n", (int)aSpec->format);
+            NSLog(@"aout_open_audio: unsupported format %d\n", (int) aSpec->format);
             return nil;
         }
 
         if (aSpec->channels > 2) {
-            NSLog(@"aout_open_audio: unsupported channels %d\n", (int)aSpec->channels);
+            NSLog(@"aout_open_audio: unsupported channels %d\n", (int) aSpec->channels);
             return nil;
         }
 
@@ -75,14 +75,14 @@ - (id)initWithAudioSpec:(const SDL_AudioSpec *)aSpec
         /* Set the desired format */
         AudioQueueRef audioQueueRef;
         OSStatus status = AudioQueueNewOutput(&streamDescription,
-                                              IJKSDLAudioQueueOuptutCallback,
-                                              (__bridge void *) self,
-                                              NULL,
-                                              kCFRunLoopCommonModes,
-                                              0,
-                                              &audioQueueRef);
+                IJKSDLAudioQueueOuptutCallback,
+                (__bridge void *) self,
+                NULL,
+                kCFRunLoopCommonModes,
+                0,
+                &audioQueueRef);
         if (status != noErr) {
-            NSLog(@"AudioQueue: AudioQueueNewOutput failed (%d)\n", (int)status);
+            NSLog(@"AudioQueue: AudioQueueNewOutput failed (%d)\n", (int) status);
             self = nil;
             return nil;
         }
@@ -96,15 +96,14 @@ - (id)initWithAudioSpec:(const SDL_AudioSpec *)aSpec
 
         status = AudioQueueStart(audioQueueRef, NULL);
         if (status != noErr) {
-            NSLog(@"AudioQueue: AudioQueueStart failed (%d)\n", (int)status);
+            NSLog(@"AudioQueue: AudioQueueStart failed (%d)\n", (int) status);
             self = nil;
             return nil;
         }
 
         _audioQueueRef = audioQueueRef;
 
-        for (int i = 0;i < kIJKAudioQueueNumberBuffers; i++)
-        {
+        for (int i = 0; i < kIJKAudioQueueNumberBuffers; i++) {
             AudioQueueAllocateBuffer(audioQueueRef, _spec.size, &_audioQueueBufferRefArray[i]);
             _audioQueueBufferRefArray[i]->mAudioDataByteSize = _spec.size;
             memset(_audioQueueBufferRefArray[i]->mAudioData, 0, _spec.size);
@@ -126,59 +125,56 @@ - (id)initWithAudioSpec:(const SDL_AudioSpec *)aSpec
     return self;
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
     [self close];
 }
 
-- (void)play
-{
+- (void)play {
     if (!_audioQueueRef)
         return;
 
     self.spec.callback(self.spec.userdata, NULL, 0);
 
-    @synchronized(_lock) {
+    @synchronized (_lock) {
         _isPaused = NO;
         NSError *error = nil;
-        if (NO == [[AVAudioSession sharedInstance] setActive:YES error:&error]) {
+        if (![[AVAudioSession sharedInstance] setActive:YES error:&error]) {
             NSLog(@"AudioQueue: AVAudioSession.setActive(YES) failed: %@\n", error ? [error localizedDescription] : @"nil");
         }
 
         OSStatus status = AudioQueueStart(_audioQueueRef, NULL);
         if (status != noErr)
-            NSLog(@"AudioQueue: AudioQueueStart failed (%d)\n", (int)status);
+            NSLog(@"AudioQueue: AudioQueueStart failed (%d)\n", (int) status);
     }
 }
 
-- (void)pause
-{
+- (void)pause {
     if (!_audioQueueRef)
         return;
 
-    @synchronized(_lock) {
+    @synchronized (_lock) {
         if (_isStopped)
             return;
 
         _isPaused = YES;
-        OSStatus status = AudioQueuePause(_audioQueueRef);
-        if (status != noErr)
-            NSLog(@"AudioQueue: AudioQueuePause failed (%d)\n", (int)status);
+        IJKMainThredExecute(^{
+            OSStatus status = AudioQueuePause(_audioQueueRef);
+            if (status != noErr)
+                NSLog(@"AudioQueue: AudioQueuePause failed (%d)\n", (int) status);
+        });
     }
 }
 
-- (void)flush
-{
+- (void)flush {
     if (!_audioQueueRef)
         return;
 
-    @synchronized(_lock) {
+    @synchronized (_lock) {
         if (_isStopped)
             return;
 
-        if (_isPaused == YES) {
-            for (int i = 0; i < kIJKAudioQueueNumberBuffers; i++)
-            {
+        if (_isPaused) {
+            for (int i = 0; i < kIJKAudioQueueNumberBuffers; i++) {
                 if (_audioQueueBufferRefArray[i] && _audioQueueBufferRefArray[i]->mAudioData) {
                     _audioQueueBufferRefArray[i]->mAudioDataByteSize = _spec.size;
                     memset(_audioQueueBufferRefArray[i]->mAudioData, 0, _spec.size);
@@ -190,31 +186,29 @@ - (void)flush
     }
 }
 
-- (void)stop
-{
+- (void)stop {
     if (!_audioQueueRef)
         return;
 
-    @synchronized(_lock) {
+    @synchronized (_lock) {
         if (_isStopped)
             return;
 
         _isStopped = YES;
     }
-
-    // do not lock AudioQueueStop, or may be run into deadlock
-    AudioQueueStop(_audioQueueRef, true);
-    AudioQueueDispose(_audioQueueRef, true);
+    IJKMainThredExecute(^{
+        // do not lock AudioQueueStop, or may be run into deadlock
+        AudioQueueStop(_audioQueueRef, true);
+        AudioQueueDispose(_audioQueueRef, true);
+    });
 }
 
-- (void)close
-{
+- (void)close {
     [self stop];
     _audioQueueRef = nil;
 }
 
-- (void)setPlaybackRate:(float)playbackRate
-{
+- (void)setPlaybackRate:(float)playbackRate {
     if (fabsf(playbackRate - 1.0f) <= 0.000001) {
         UInt32 propValue = 1;
         AudioQueueSetProperty(_audioQueueRef, kAudioQueueProperty_TimePitchBypass, &propValue, sizeof(propValue));
@@ -226,8 +220,7 @@ - (void)setPlaybackRate:(float)playbackRate
     }
 }
 
-- (void)setPlaybackVolume:(float)playbackVolume
-{
+- (void)setPlaybackVolume:(float)playbackVolume {
     float aq_volume = playbackVolume;
     if (fabsf(aq_volume - 1.0f) <= 0.000001) {
         AudioQueueSetParameter(_audioQueueRef, kAudioQueueParam_Volume, 1.f);
@@ -236,14 +229,13 @@ - (void)setPlaybackVolume:(float)playbackVolume
     }
 }
 
-- (double)get_latency_seconds
-{
-    return ((double)(kIJKAudioQueueNumberBuffers)) * _spec.samples / _spec.freq;
+- (double)get_latency_seconds {
+    return ((double) (kIJKAudioQueueNumberBuffers)) * _spec.samples / _spec.freq;
 }
 
-static void IJKSDLAudioQueueOuptutCallback(void * inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer) {
+static void IJKSDLAudioQueueOuptutCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer) {
     @autoreleasepool {
-        IJKSDLAudioQueueController* aqController = (__bridge IJKSDLAudioQueueController *) inUserData;
+        IJKSDLAudioQueueController *aqController = (__bridge IJKSDLAudioQueueController *) inUserData;
 
         if (!aqController) {
             // do nothing;