Merge pull request LaiFengiOS#4 from LaiFengiOS/master

toss156 · web-flow · commit ba1f7a383cc4 · 2016-07-15T09:29:21.000+08:00
update to last version
diff --git a/LFLiveKit.podspec b/LFLiveKit.podspec
@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "LFLiveKit"
-  s.version      = "1.6.3"
+  s.version      = "1.7.1"
   s.summary      = "LaiFeng ios Live. LFLiveKit."
   s.homepage     = "https://github.com/chenliming777"
   s.license      = { :type => "MIT", :file => "LICENSE" }
@@ -21,5 +21,6 @@ Pod::Spec.new do |s|
   s.dependency "CocoaAsyncSocket", "~> 7.4.1"
   s.dependency 'LMGPUImage', '~> 0.1.9'
   s.dependency "pili-librtmp", "~> 1.0.2"
+  s.dependency "YYDispatchQueuePool"
 
 end
diff --git a/LFLiveKit.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/LFLiveKit.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/LFLiveKit/Info.plist b/LFLiveKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.3</string>
+	<string>1.7.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/LFLiveKit/LFLiveSession.m b/LFLiveKit/LFLiveSession.m
@@ -282,7 +282,7 @@ - (LFVideoCapture*)videoCaptureSource{
 - (id<LFStreamSocket>)socket{
     if(!_socket){
         if(self.liveType == LFLiveRTMP){
-            _socket = [[LFStreamRtmpSocket alloc] initWithStream:self.streamInfo];
+            _socket = [[LFStreamRtmpSocket alloc] initWithStream:self.streamInfo videoSize:self.videoConfiguration.videoSize reconnectInterval:self.reconnectInterval reconnectCount:self.reconnectCount];
         }else if(self.liveType == LFLiveFLV){
             _socket = [[LFStreamTcpSocket alloc] initWithStream:self.streamInfo videoSize:self.videoConfiguration.videoSize reconnectInterval:self.reconnectInterval reconnectCount:self.reconnectCount];
         }
diff --git a/LFLiveKit/capture/LFAudioCapture.m b/LFLiveKit/capture/LFAudioCapture.m
@@ -32,7 +32,7 @@ - (instancetype)initWithAudioConfiguration:(LFLiveAudioConfiguration *)configura
         self.taskQueue = dispatch_queue_create("com.youku.Laifeng.audioCapture.Queue", NULL);
         
         AVAudioSession *session = [AVAudioSession sharedInstance];
-        [session setActive:YES withOptions:kAudioSessionSetActiveFlag_NotifyOthersOnDeactivation error:nil];
+        [session setActive:YES  error:nil];
         
         [[NSNotificationCenter defaultCenter] addObserver: self
                                                  selector: @selector(handleRouteChange:)
@@ -45,7 +45,7 @@ - (instancetype)initWithAudioConfiguration:(LFLiveAudioConfiguration *)configura
         
         NSError *error = nil;
         
-        [session setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker | AVAudioSessionCategoryOptionMixWithOthers error:nil];
+        [session setCategory:AVAudioSessionCategoryPlayAndRecord  error:nil];
         
         [session setMode:AVAudioSessionModeVideoRecording error:&error];
         
@@ -169,6 +169,7 @@ - (void)handleRouteChange:(NSNotification *)notification {
             break;
     }
     NSLog(@"handleRouteChange reason is %@",seccReason);
+    
     AVAudioSessionPortDescription *input = [[session.currentRoute.inputs count]?session.currentRoute.inputs:nil objectAtIndex:0];
     if (input.portType == AVAudioSessionPortHeadsetMic) {
         
diff --git a/LFLiveKit/upload/LFStreamRtmpSocket.m b/LFLiveKit/upload/LFStreamRtmpSocket.m
@@ -8,10 +8,17 @@
 
 #import "LFStreamRtmpSocket.h"
 #import "rtmp.h"
+#import "YYDispatchQueuePool.h"
 
 static const NSInteger RetryTimesBreaken = 20;///<  重连1分钟  3秒一次 一共20次
 static const NSInteger RetryTimesMargin = 3;
 
+static dispatch_queue_t YYRtmpSendQueue() {
+    YYDispatchQueuePool *pool = [[YYDispatchQueuePool alloc] initWithName:@"com.youku.laifeng.rtmpsendQueue" queueCount:1 qos:NSQualityOfServiceDefault];
+    dispatch_queue_t queue = [pool queue];
+    return queue;
+}
+#define RTMP_RECEIVE_TIMEOUT    2
 #define DATA_ITEMS_MAX_COUNT 100
 #define RTMP_DATA_RESERVE_SIZE 400
 #define RTMP_HEAD_SIZE (sizeof(RTMPPacket)+RTMP_MAX_HEADER_SIZE)
@@ -46,7 +53,6 @@ @interface LFStreamRtmpSocket ()<LFStreamingBufferDelegate>
 @property (nonatomic, weak) id<LFStreamSocketDelegate> delegate;
 @property (nonatomic, strong) LFLiveStreamInfo *stream;
 @property (nonatomic, strong) LFStreamingBuffer *buffer;
-@property (nonatomic, strong) dispatch_queue_t socketQueue;
 @property (nonatomic, strong) LFLiveDebug *debugInfo;
 //错误信息
 @property (nonatomic, assign) RTMPError error;
@@ -83,32 +89,41 @@ - (nullable instancetype)initWithStream:(nullable LFLiveStreamInfo*)stream video
 }
 
 - (void) start{
-    dispatch_async(self.socketQueue, ^{
-        if(!_stream) return;
-        if(_isConnecting) return;
-        if(_rtmp != NULL) return;
-        self.debugInfo.streamId = self.stream.streamId;
-        self.debugInfo.uploadUrl = self.stream.url;
-        self.debugInfo.isRtmp = YES;
-        [self clean];
-        [self RTMP264_Connect:(char*)[_stream.url cStringUsingEncoding:NSASCIIStringEncoding]];
+    dispatch_async(YYRtmpSendQueue(), ^{
+        [self _start];
     });
 }
 
+- (void)_start{
+    if(!_stream) return;
+    if(_isConnecting) return;
+    if(_rtmp != NULL) return;
+    self.debugInfo.streamId = self.stream.streamId;
+    self.debugInfo.uploadUrl = self.stream.url;
+    self.debugInfo.isRtmp = YES;
+    [self clean];
+    [self RTMP264_Connect:(char*)[_stream.url cStringUsingEncoding:NSASCIIStringEncoding]];
+}
+
 - (void) stop{
-    dispatch_async(self.socketQueue, ^{
-        if(_rtmp != NULL){
-            PILI_RTMP_Close(_rtmp, &_error);
-            PILI_RTMP_Free(_rtmp);
-            _rtmp = NULL;
-        }
+    dispatch_async(YYRtmpSendQueue(), ^{
+        [self _stop];
     });
 }
 
+- (void)_stop{
+    if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
+        [self.delegate socketStatus:self status:LFLiveStop];
+    }
+    if(_rtmp != NULL){
+        PILI_RTMP_Close(_rtmp, &_error);
+        PILI_RTMP_Free(_rtmp);
+        _rtmp = NULL;
+    }
+}
+
 - (void) sendFrame:(LFFrame*)frame{
-    __weak typeof(self) _self = self;
-    dispatch_async(self.socketQueue, ^{
-        __strong typeof(_self) self = _self;
+    dispatch_async(YYRtmpSendQueue(), ^{
         if(!frame) return;
         [self.buffer appendObject:frame];
         [self sendFrame];
@@ -209,6 +224,7 @@ -(NSInteger) RTMP264_Connect:(char *)push_url{
     _rtmp->m_connCallback = ConnectionTimeCallback;
     _rtmp->m_userData = (__bridge void*)self;
     _rtmp->m_msgCounter = 1;
+    _rtmp->Link.timeout = RTMP_RECEIVE_TIMEOUT;
     //设置可写，即发布流，这个函数必须在连接前使用，否则无效
     PILI_RTMP_EnableWrite(_rtmp);
     
@@ -398,7 +414,10 @@ - (NSInteger)RtmpPacketSend:(PILI_RTMPPacket*)packet{
         int success = PILI_RTMP_SendPacket(_rtmp,packet,0,&_error);
         if(success){
             self.isSending = NO;
-            [self sendFrame];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [self sendFrame];
+            });
+            
         }
         return success;
     }
@@ -438,30 +457,24 @@ - (void)sendAudio:(LFFrame*)frame {
 
 // 断线重连
 -(void) reconnect {
-    _isReconnecting = NO;
-    if(_isConnected) return;
-    if(_rtmp){
-        PILI_RTMP_ReconnectStream(_rtmp, 0, &_error);
-    }else{
-        [self stop];
-        [self start];
-    }
+    dispatch_async(YYRtmpSendQueue(), ^{
+        _isReconnecting = NO;
+        if(_isConnected) return;
+        
+        [self _stop];
+        [self _start];
+    });
 }
 
 #pragma mark -- CallBack
 void RTMPErrorCallback(RTMPError *error, void *userData){
     LFStreamRtmpSocket *socket = (__bridge LFStreamRtmpSocket*)userData;
-    if(error->code == RTMPErrorSocketClosedByPeer){
-        [socket stop];
-        if(socket.delegate && [socket.delegate respondsToSelector:@selector(socketStatus:status:)]){
-            [socket.delegate socketStatus:socket status:LFLiveError];
-        }
-    }else{
+    if(error->code < 0){
         if(socket.retryTimes4netWorkBreaken++ < socket.reconnectCount && !socket.isReconnecting){
             socket.isConnected = NO;
             socket.isConnecting = NO;
             socket.isReconnecting = YES;
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(socket.reconnectInterval * NSEC_PER_SEC)), socket.socketQueue, ^{
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(socket.reconnectInterval * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [socket reconnect];
             });
         }else if(socket.retryTimes4netWorkBreaken >= socket.reconnectCount){
@@ -480,12 +493,6 @@ void ConnectionTimeCallback(PILI_CONNECTION_TIME* conn_time, void *userData){
 }
 
 #pragma mark -- Getter Setter
-- (dispatch_queue_t)socketQueue{
-    if(!_socketQueue){
-        _socketQueue = dispatch_queue_create("com.youku.LaiFeng.live.socketQueue", NULL);
-    }
-    return _socketQueue;
-}
 
 - (LFStreamingBuffer*)buffer{
     if(!_buffer){
diff --git a/LFLiveKitDemo/LFLiveKitDemo.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/LFLiveKitDemo/LFLiveKitDemo.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/LFLiveKitDemo/LFLiveKitDemo/LFLivePreview.m b/LFLiveKitDemo/LFLiveKitDemo/LFLivePreview.m
@@ -59,7 +59,9 @@ - (void)requestAccessForVideo{
         }
         case AVAuthorizationStatusAuthorized:{
             // 已经开启授权，可继续
-            [_self.session setRunning:YES];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [_self.session setRunning:YES];
+            });
             break;
         }
         case AVAuthorizationStatusDenied:
@@ -218,7 +220,7 @@ - (LFLiveSession*)session{
         */
         
         
-        _session.running = YES;
+        _session.delegate = self;
         _session.preView = self;
     }
     return _session;
@@ -310,7 +312,7 @@ - (UIButton*)startLiveButton{
             if(_self.startLiveButton.selected){
                 [_self.startLiveButton setTitle:@"结束直播" forState:UIControlStateNormal];
                 LFLiveStreamInfo *stream = [LFLiveStreamInfo new];
-                stream.url = @"rtmp://30.96.179.95:1935/live/1234";
+                stream.url = @"rtmp://live.hkstv.hk.lxdns.com:1935/live/stream789";
                 //stream.url = @"rtmp://daniulive.com:1935/live/stream2399";
                 [_self.session startLive:stream];
             }else{
diff --git a/LFLiveKitDemo/Podfile b/LFLiveKitDemo/Podfile
@@ -3,6 +3,7 @@ platform :ios,'8.0'
 
 target "LFLiveKitDemo" do
 
-pod 'LFLiveKit', '~> 1.5.2'
+pod 'LFLiveKit', '~> 1.7.1'
+pod 'YYDispatchQueuePool'
 
 end
diff --git a/Podfile b/Podfile
@@ -6,5 +6,5 @@ target "LFLiveKit" do
 pod 'CocoaAsyncSocket', '~> 7.4.1'
 pod 'pili-librtmp', '~> 1.0.2'
 pod 'LMGPUImage', '~> 0.1.9'
-
+pod 'YYDispatchQueuePool'
 end

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ - (LFVideoCapture*)videoCaptureSource{`
`282`	`282`	`- (id<LFStreamSocket>)socket{`
`283`	`283`	`if(!_socket){`
`284`	`284`	`if(self.liveType == LFLiveRTMP){`
`285`		`- _socket = [[LFStreamRtmpSocket alloc] initWithStream:self.streamInfo];`
	`285`	`+ _socket = [[LFStreamRtmpSocket alloc] initWithStream:self.streamInfo videoSize:self.videoConfiguration.videoSize reconnectInterval:self.reconnectInterval reconnectCount:self.reconnectCount];`
`286`	`286`	`}else if(self.liveType == LFLiveFLV){`
`287`	`287`	`_socket = [[LFStreamTcpSocket alloc] initWithStream:self.streamInfo videoSize:self.videoConfiguration.videoSize reconnectInterval:self.reconnectInterval reconnectCount:self.reconnectCount];`
`288`	`288`	`}`