update version

修复首帧音视频不同步问题

LFLiveKit.podspec

@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "LFLiveKit"
-  s.version      = "1.6.7"
+  s.version      = "1.9.0"
   s.summary      = "LaiFeng ios Live. LFLiveKit."
   s.homepage     = "https://github.com/chenliming777"
   s.license      = { :type => "MIT", :file => "LICENSE" }
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "8.0"
   s.ios.deployment_target = "8.0"
   s.source       = { :git => "https://github.com/LaiFengiOS/LFLiveKit.git", :tag => "#{s.version}" }
-  s.source_files  = "LFLiveKit/**/*.{*}"
+  s.source_files  = "LFLiveKit/**/*.{h,m}"
   s.public_header_files = "LFLiveKit/**/*.h"
 
   s.frameworks = "VideoToolbox", "AudioToolbox","AVFoundation","Foundation","UIKit"
@@ -18,8 +18,8 @@ Pod::Spec.new do |s|
 
   s.requires_arc = true
 
-  s.dependency "CocoaAsyncSocket", "~> 7.4.1"
   s.dependency 'LMGPUImage', '~> 0.1.9'
-  s.dependency "pili-librtmp", "~> 1.0.2"
+  s.dependency "pili-librtmp", "~>  1.0.3"
+  s.dependency "YYDispatchQueuePool"
 
 end

LFLiveKit.xcodeproj/project.pbxproj

@@ -40,35 +40,21 @@
 		84001FEC1D0016380026C63F /* LFLiveStreamInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 84001FC41D0016380026C63F /* LFLiveStreamInfo.m */; };
 		84001FED1D0016380026C63F /* LFVideoFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 84001FC51D0016380026C63F /* LFVideoFrame.h */; };
 		84001FEE1D0016380026C63F /* LFVideoFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 84001FC61D0016380026C63F /* LFVideoFrame.m */; };
-		84001FEF1D0016380026C63F /* LFStreamingBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 84001FCA1D0016380026C63F /* LFStreamingBuffer.h */; };
-		84001FF01D0016380026C63F /* LFStreamingBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = 84001FCB1D0016380026C63F /* LFStreamingBuffer.m */; };
-		84001FF11D0016380026C63F /* LFStreamRtmpSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 84001FCC1D0016380026C63F /* LFStreamRtmpSocket.h */; };
-		84001FF21D0016380026C63F /* LFStreamRtmpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 84001FCD1D0016380026C63F /* LFStreamRtmpSocket.m */; };
-		84001FF31D0016380026C63F /* LFStreamSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 84001FCE1D0016380026C63F /* LFStreamSocket.h */; };
-		84001FF41D0016380026C63F /* NSMutableArray+LFAdd.h in Headers */ = {isa = PBXBuildFile; fileRef = 84001FCF1D0016380026C63F /* NSMutableArray+LFAdd.h */; };
-		84001FF51D0016380026C63F /* NSMutableArray+LFAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = 84001FD01D0016380026C63F /* NSMutableArray+LFAdd.m */; };
 		84001FF71D0017590026C63F /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84001FF61D0017590026C63F /* AVFoundation.framework */; };
 		84001FF91D00175D0026C63F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84001FF81D00175D0026C63F /* Foundation.framework */; };
 		84001FFB1D0017630026C63F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84001FFA1D0017630026C63F /* UIKit.framework */; };
 		84001FFD1D0017680026C63F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84001FFC1D0017680026C63F /* AudioToolbox.framework */; };
 		84001FFF1D00176C0026C63F /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84001FFE1D00176C0026C63F /* VideoToolbox.framework */; };
 		840020011D0017850026C63F /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 840020001D0017850026C63F /* libz.tbd */; };
-		840762C51D07BC7D000FD0BF /* LFStreamTcpSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 840762C31D07BC7D000FD0BF /* LFStreamTcpSocket.h */; };
-		840762C61D07BC7D000FD0BF /* LFStreamTcpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 840762C41D07BC7D000FD0BF /* LFStreamTcpSocket.m */; };
-		840762D61D07BC8B000FD0BF /* amf.c in Sources */ = {isa = PBXBuildFile; fileRef = 840762C91D07BC8B000FD0BF /* amf.c */; };
-		840762D71D07BC8B000FD0BF /* amf.h in Headers */ = {isa = PBXBuildFile; fileRef = 840762CA1D07BC8B000FD0BF /* amf.h */; };
-		840762D81D07BC8B000FD0BF /* avc.c in Sources */ = {isa = PBXBuildFile; fileRef = 840762CB1D07BC8B000FD0BF /* avc.c */; };
-		840762D91D07BC8B000FD0BF /* avc.h in Headers */ = {isa = PBXBuildFile; fileRef = 840762CC1D07BC8B000FD0BF /* avc.h */; };
-		840762DA1D07BC8B000FD0BF /* flv.c in Sources */ = {isa = PBXBuildFile; fileRef = 840762CD1D07BC8B000FD0BF /* flv.c */; };
-		840762DB1D07BC8B000FD0BF /* flv.h in Headers */ = {isa = PBXBuildFile; fileRef = 840762CE1D07BC8B000FD0BF /* flv.h */; };
-		840762DC1D07BC8B000FD0BF /* info.c in Sources */ = {isa = PBXBuildFile; fileRef = 840762CF1D07BC8B000FD0BF /* info.c */; };
-		840762DD1D07BC8B000FD0BF /* info.h in Headers */ = {isa = PBXBuildFile; fileRef = 840762D01D07BC8B000FD0BF /* info.h */; };
-		840762DE1D07BC8B000FD0BF /* types.c in Sources */ = {isa = PBXBuildFile; fileRef = 840762D11D07BC8B000FD0BF /* types.c */; };
-		840762DF1D07BC8B000FD0BF /* types.h in Headers */ = {isa = PBXBuildFile; fileRef = 840762D21D07BC8B000FD0BF /* types.h */; };
-		840762E01D07BC8B000FD0BF /* LFFlvPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 840762D31D07BC8B000FD0BF /* LFFlvPackage.h */; };
-		840762E11D07BC8B000FD0BF /* LFFlvPackage.m in Sources */ = {isa = PBXBuildFile; fileRef = 840762D41D07BC8B000FD0BF /* LFFlvPackage.m */; };
-		840762E21D07BC8B000FD0BF /* LFStreamPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 840762D51D07BC8B000FD0BF /* LFStreamPackage.h */; };
 		AD7F89B4621A7EFEBEA72D49 /* libPods-LFLiveKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B8CB02D2A92EA1F5A262F154 /* libPods-LFLiveKit.a */; };
+		B289F1DB1D3DE77F00D9C7A5 /* LFStreamingBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B289F1D41D3DE77F00D9C7A5 /* LFStreamingBuffer.h */; };
+		B289F1DC1D3DE77F00D9C7A5 /* LFStreamingBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = B289F1D51D3DE77F00D9C7A5 /* LFStreamingBuffer.m */; };
+		B289F1DD1D3DE77F00D9C7A5 /* LFStreamRtmpSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = B289F1D61D3DE77F00D9C7A5 /* LFStreamRtmpSocket.h */; };
+		B289F1DE1D3DE77F00D9C7A5 /* LFStreamRtmpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = B289F1D71D3DE77F00D9C7A5 /* LFStreamRtmpSocket.m */; };
+		B289F1DF1D3DE77F00D9C7A5 /* LFStreamSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = B289F1D81D3DE77F00D9C7A5 /* LFStreamSocket.h */; };
+		B289F1E01D3DE77F00D9C7A5 /* NSMutableArray+LFAdd.h in Headers */ = {isa = PBXBuildFile; fileRef = B289F1D91D3DE77F00D9C7A5 /* NSMutableArray+LFAdd.h */; };
+		B289F1E11D3DE77F00D9C7A5 /* NSMutableArray+LFAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = B289F1DA1D3DE77F00D9C7A5 /* NSMutableArray+LFAdd.m */; };
+		BE55DA79155500CDEF87FB5C /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B5758EB2A15DAA132D8BF380 /* libPods.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -118,35 +104,21 @@
 		84001FC41D0016380026C63F /* LFLiveStreamInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFLiveStreamInfo.m; sourceTree = "<group>"; };
 		84001FC51D0016380026C63F /* LFVideoFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFVideoFrame.h; sourceTree = "<group>"; };
 		84001FC61D0016380026C63F /* LFVideoFrame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFVideoFrame.m; sourceTree = "<group>"; };
-		84001FCA1D0016380026C63F /* LFStreamingBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFStreamingBuffer.h; sourceTree = "<group>"; };
-		84001FCB1D0016380026C63F /* LFStreamingBuffer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFStreamingBuffer.m; sourceTree = "<group>"; };
-		84001FCC1D0016380026C63F /* LFStreamRtmpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFStreamRtmpSocket.h; sourceTree = "<group>"; };
-		84001FCD1D0016380026C63F /* LFStreamRtmpSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFStreamRtmpSocket.m; sourceTree = "<group>"; };
-		84001FCE1D0016380026C63F /* LFStreamSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFStreamSocket.h; sourceTree = "<group>"; };
-		84001FCF1D0016380026C63F /* NSMutableArray+LFAdd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+LFAdd.h"; sourceTree = "<group>"; };
-		84001FD01D0016380026C63F /* NSMutableArray+LFAdd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+LFAdd.m"; sourceTree = "<group>"; };
 		84001FF61D0017590026C63F /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 		84001FF81D00175D0026C63F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		84001FFA1D0017630026C63F /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		84001FFC1D0017680026C63F /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		84001FFE1D00176C0026C63F /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
 		840020001D0017850026C63F /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		840762C31D07BC7D000FD0BF /* LFStreamTcpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFStreamTcpSocket.h; sourceTree = "<group>"; };
-		840762C41D07BC7D000FD0BF /* LFStreamTcpSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFStreamTcpSocket.m; sourceTree = "<group>"; };
-		840762C91D07BC8B000FD0BF /* amf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = amf.c; sourceTree = "<group>"; };
-		840762CA1D07BC8B000FD0BF /* amf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = amf.h; sourceTree = "<group>"; };
-		840762CB1D07BC8B000FD0BF /* avc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = avc.c; sourceTree = "<group>"; };
-		840762CC1D07BC8B000FD0BF /* avc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avc.h; sourceTree = "<group>"; };
-		840762CD1D07BC8B000FD0BF /* flv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = flv.c; sourceTree = "<group>"; };
-		840762CE1D07BC8B000FD0BF /* flv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flv.h; sourceTree = "<group>"; };
-		840762CF1D07BC8B000FD0BF /* info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = info.c; sourceTree = "<group>"; };
-		840762D01D07BC8B000FD0BF /* info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = info.h; sourceTree = "<group>"; };
-		840762D11D07BC8B000FD0BF /* types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = types.c; sourceTree = "<group>"; };
-		840762D21D07BC8B000FD0BF /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
-		840762D31D07BC8B000FD0BF /* LFFlvPackage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFFlvPackage.h; sourceTree = "<group>"; };
-		840762D41D07BC8B000FD0BF /* LFFlvPackage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFFlvPackage.m; sourceTree = "<group>"; };
-		840762D51D07BC8B000FD0BF /* LFStreamPackage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFStreamPackage.h; sourceTree = "<group>"; };
 		A17586B27CD6843997425CCF /* Pods-LFLiveKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LFLiveKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LFLiveKit/Pods-LFLiveKit.debug.xcconfig"; sourceTree = "<group>"; };
+		B289F1D41D3DE77F00D9C7A5 /* LFStreamingBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LFStreamingBuffer.h; path = LFLiveKit/publish/LFStreamingBuffer.h; sourceTree = SOURCE_ROOT; };
+		B289F1D51D3DE77F00D9C7A5 /* LFStreamingBuffer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LFStreamingBuffer.m; path = LFLiveKit/publish/LFStreamingBuffer.m; sourceTree = SOURCE_ROOT; };
+		B289F1D61D3DE77F00D9C7A5 /* LFStreamRtmpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LFStreamRtmpSocket.h; path = LFLiveKit/publish/LFStreamRtmpSocket.h; sourceTree = SOURCE_ROOT; };
+		B289F1D71D3DE77F00D9C7A5 /* LFStreamRtmpSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LFStreamRtmpSocket.m; path = LFLiveKit/publish/LFStreamRtmpSocket.m; sourceTree = SOURCE_ROOT; };
+		B289F1D81D3DE77F00D9C7A5 /* LFStreamSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LFStreamSocket.h; path = LFLiveKit/publish/LFStreamSocket.h; sourceTree = SOURCE_ROOT; };
+		B289F1D91D3DE77F00D9C7A5 /* NSMutableArray+LFAdd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSMutableArray+LFAdd.h"; path = "LFLiveKit/publish/NSMutableArray+LFAdd.h"; sourceTree = SOURCE_ROOT; };
+		B289F1DA1D3DE77F00D9C7A5 /* NSMutableArray+LFAdd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSMutableArray+LFAdd.m"; path = "LFLiveKit/publish/NSMutableArray+LFAdd.m"; sourceTree = SOURCE_ROOT; };
+		B5758EB2A15DAA132D8BF380 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		B75B965E6B94DE4CBCC82EA7 /* Pods-LFLiveKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LFLiveKit.release.xcconfig"; path = "Pods/Target Support Files/Pods-LFLiveKit/Pods-LFLiveKit.release.xcconfig"; sourceTree = "<group>"; };
 		B8CB02D2A92EA1F5A262F154 /* libPods-LFLiveKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-LFLiveKit.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -163,6 +135,7 @@
 				84001FF91D00175D0026C63F /* Foundation.framework in Frameworks */,
 				84001FF71D0017590026C63F /* AVFoundation.framework in Frameworks */,
 				AD7F89B4621A7EFEBEA72D49 /* libPods-LFLiveKit.a in Frameworks */,
+				BE55DA79155500CDEF87FB5C /* libPods.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -187,6 +160,7 @@
 				84001FF81D00175D0026C63F /* Foundation.framework */,
 				84001FF61D0017590026C63F /* AVFoundation.framework */,
 				B8CB02D2A92EA1F5A262F154 /* libPods-LFLiveKit.a */,
+				B5758EB2A15DAA132D8BF380 /* libPods.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -222,7 +196,6 @@
 				84001FA41D0016380026C63F /* capture */,
 				84001FA91D0016380026C63F /* coder */,
 				84001FB51D0016380026C63F /* filter */,
-				840762C71D07BC8B000FD0BF /* packet */,
 				84001FC91D0016380026C63F /* publish */,
 				84001F8F1D0015D10026C63F /* Info.plist */,
 			);
@@ -304,49 +277,18 @@
 		84001FC91D0016380026C63F /* publish */ = {
 			isa = PBXGroup;
 			children = (
-				84001FCE1D0016380026C63F /* LFStreamSocket.h */,
-				84001FCA1D0016380026C63F /* LFStreamingBuffer.h */,
-				84001FCB1D0016380026C63F /* LFStreamingBuffer.m */,
-				84001FCC1D0016380026C63F /* LFStreamRtmpSocket.h */,
-				84001FCD1D0016380026C63F /* LFStreamRtmpSocket.m */,
-				840762C31D07BC7D000FD0BF /* LFStreamTcpSocket.h */,
-				840762C41D07BC7D000FD0BF /* LFStreamTcpSocket.m */,
-				84001FCF1D0016380026C63F /* NSMutableArray+LFAdd.h */,
-				84001FD01D0016380026C63F /* NSMutableArray+LFAdd.m */,
+				B289F1D41D3DE77F00D9C7A5 /* LFStreamingBuffer.h */,
+				B289F1D51D3DE77F00D9C7A5 /* LFStreamingBuffer.m */,
+				B289F1D61D3DE77F00D9C7A5 /* LFStreamRtmpSocket.h */,
+				B289F1D71D3DE77F00D9C7A5 /* LFStreamRtmpSocket.m */,
+				B289F1D81D3DE77F00D9C7A5 /* LFStreamSocket.h */,
+				B289F1D91D3DE77F00D9C7A5 /* NSMutableArray+LFAdd.h */,
+				B289F1DA1D3DE77F00D9C7A5 /* NSMutableArray+LFAdd.m */,
 			);
 			name = publish;
 			path = upload;
 			sourceTree = "<group>";
 		};
-		840762C71D07BC8B000FD0BF /* packet */ = {
-			isa = PBXGroup;
-			children = (
-				840762C81D07BC8B000FD0BF /* flv */,
-				840762D31D07BC8B000FD0BF /* LFFlvPackage.h */,
-				840762D41D07BC8B000FD0BF /* LFFlvPackage.m */,
-				840762D51D07BC8B000FD0BF /* LFStreamPackage.h */,
-			);
-			name = packet;
-			path = LFLiveKit/packet;
-			sourceTree = SOURCE_ROOT;
-		};
-		840762C81D07BC8B000FD0BF /* flv */ = {
-			isa = PBXGroup;
-			children = (
-				840762C91D07BC8B000FD0BF /* amf.c */,
-				840762CA1D07BC8B000FD0BF /* amf.h */,
-				840762CB1D07BC8B000FD0BF /* avc.c */,
-				840762CC1D07BC8B000FD0BF /* avc.h */,
-				840762CD1D07BC8B000FD0BF /* flv.c */,
-				840762CE1D07BC8B000FD0BF /* flv.h */,
-				840762CF1D07BC8B000FD0BF /* info.c */,
-				840762D01D07BC8B000FD0BF /* info.h */,
-				840762D11D07BC8B000FD0BF /* types.c */,
-				840762D21D07BC8B000FD0BF /* types.h */,
-			);
-			path = flv;
-			sourceTree = "<group>";
-		};
 		EDD4B76A07A6817C79BB4E5C /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -363,34 +305,26 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				840762DD1D07BC8B000FD0BF /* info.h in Headers */,
 				84001FDB1D0016380026C63F /* LFLiveAudioConfiguration.h in Headers */,
-				840762E01D07BC8B000FD0BF /* LFFlvPackage.h in Headers */,
+				B289F1DD1D3DE77F00D9C7A5 /* LFStreamRtmpSocket.h in Headers */,
 				84001FDD1D0016380026C63F /* LFLiveVideoConfiguration.h in Headers */,
-				840762D71D07BC8B000FD0BF /* amf.h in Headers */,
 				84001FE31D0016380026C63F /* LFLiveSession.h in Headers */,
-				840762C51D07BC7D000FD0BF /* LFStreamTcpSocket.h in Headers */,
-				840762DF1D07BC8B000FD0BF /* types.h in Headers */,
+				B289F1DB1D3DE77F00D9C7A5 /* LFStreamingBuffer.h in Headers */,
 				84001FEB1D0016380026C63F /* LFLiveStreamInfo.h in Headers */,
 				84001FE91D0016380026C63F /* LFLiveDebug.h in Headers */,
-				840762E21D07BC8B000FD0BF /* LFStreamPackage.h in Headers */,
-				840762DB1D07BC8B000FD0BF /* flv.h in Headers */,
-				84001FF11D0016380026C63F /* LFStreamRtmpSocket.h in Headers */,
 				84001FE71D0016380026C63F /* LFFrame.h in Headers */,
-				84001FEF1D0016380026C63F /* LFStreamingBuffer.h in Headers */,
 				84001FD61D0016380026C63F /* LFHardwareAudioEncoder.h in Headers */,
+				B289F1E01D3DE77F00D9C7A5 /* NSMutableArray+LFAdd.h in Headers */,
 				84001FDF1D0016380026C63F /* LFGPUImageBeautyFilter.h in Headers */,
 				84001FD31D0016380026C63F /* LFVideoCapture.h in Headers */,
 				84001FD11D0016380026C63F /* LFAudioCapture.h in Headers */,
-				84001FF41D0016380026C63F /* NSMutableArray+LFAdd.h in Headers */,
 				84001FE11D0016380026C63F /* LFGPUImageEmptyFilter.h in Headers */,
 				84001FDA1D0016380026C63F /* LFVideoEncoding.h in Headers */,
 				84001FE51D0016380026C63F /* LFAudioFrame.h in Headers */,
 				84001FED1D0016380026C63F /* LFVideoFrame.h in Headers */,
 				84001FD81D0016380026C63F /* LFHardwareVideoEncoder.h in Headers */,
+				B289F1DF1D3DE77F00D9C7A5 /* LFStreamSocket.h in Headers */,
 				84001FD51D0016380026C63F /* LFAudioEncoding.h in Headers */,
-				840762D91D07BC8B000FD0BF /* avc.h in Headers */,
-				84001FF31D0016380026C63F /* LFStreamSocket.h in Headers */,
 				84001F8E1D0015D10026C63F /* LFLiveKit.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -403,11 +337,13 @@
 			buildConfigurationList = 84001F9E1D0015D10026C63F /* Build configuration list for PBXNativeTarget "LFLiveKit" */;
 			buildPhases = (
 				8EE9401DCA9508E918B7FB68 /* 📦 Check Pods Manifest.lock */,
+				98F2C3F394BD79A6D6B8424F /* Check Pods Manifest.lock */,
 				84001F851D0015D10026C63F /* Sources */,
 				84001F861D0015D10026C63F /* Frameworks */,
 				84001F871D0015D10026C63F /* Headers */,
 				84001F881D0015D10026C63F /* Resources */,
 				817C22141AD3F2EB34365AA3 /* 📦 Copy Pods Resources */,
+				8A5D8B623E50AAC1575D1741 /* Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -504,6 +440,21 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LFLiveKit/Pods-LFLiveKit-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		8A5D8B623E50AAC1575D1741 /* Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		8EE9401DCA9508E918B7FB68 /* 📦 Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -519,6 +470,21 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
+		98F2C3F394BD79A6D6B8424F /* Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -526,29 +492,22 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				840762DA1D07BC8B000FD0BF /* flv.c in Sources */,
 				84001FE21D0016380026C63F /* LFGPUImageEmptyFilter.m in Sources */,
 				84001FE41D0016380026C63F /* LFLiveSession.m in Sources */,
 				84001FE61D0016380026C63F /* LFAudioFrame.m in Sources */,
-				840762DE1D07BC8B000FD0BF /* types.c in Sources */,
 				84001FDC1D0016380026C63F /* LFLiveAudioConfiguration.m in Sources */,
-				840762D81D07BC8B000FD0BF /* avc.c in Sources */,
 				84001FD41D0016380026C63F /* LFVideoCapture.m in Sources */,
 				84001FE81D0016380026C63F /* LFFrame.m in Sources */,
-				840762D61D07BC8B000FD0BF /* amf.c in Sources */,
-				84001FF01D0016380026C63F /* LFStreamingBuffer.m in Sources */,
-				84001FF51D0016380026C63F /* NSMutableArray+LFAdd.m in Sources */,
+				B289F1DC1D3DE77F00D9C7A5 /* LFStreamingBuffer.m in Sources */,
+				B289F1E11D3DE77F00D9C7A5 /* NSMutableArray+LFAdd.m in Sources */,
 				84001FDE1D0016380026C63F /* LFLiveVideoConfiguration.m in Sources */,
 				84001FD21D0016380026C63F /* LFAudioCapture.m in Sources */,
-				84001FF21D0016380026C63F /* LFStreamRtmpSocket.m in Sources */,
-				840762E11D07BC8B000FD0BF /* LFFlvPackage.m in Sources */,
+				B289F1DE1D3DE77F00D9C7A5 /* LFStreamRtmpSocket.m in Sources */,
 				84001FD91D0016380026C63F /* LFHardwareVideoEncoder.m in Sources */,
 				84001FEC1D0016380026C63F /* LFLiveStreamInfo.m in Sources */,
 				84001FEA1D0016380026C63F /* LFLiveDebug.m in Sources */,
-				840762DC1D07BC8B000FD0BF /* info.c in Sources */,
 				84001FEE1D0016380026C63F /* LFVideoFrame.m in Sources */,
 				84001FD71D0016380026C63F /* LFHardwareAudioEncoder.m in Sources */,
-				840762C61D07BC7D000FD0BF /* LFStreamTcpSocket.m in Sources */,
 				84001FE01D0016380026C63F /* LFGPUImageBeautyFilter.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

LFLiveKit.xcworkspace/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   type = "0"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "LFLiveKitTests/LFLiveKitTests.m"
-            timestampString = "486890388.753673"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "18"
-            endingLineNumber = "18"
-            landmarkName = "-setUp"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "LFLiveKitTests/LFLiveKitTests.m"
-            timestampString = "486890389.93478"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "24"
-            endingLineNumber = "24"
-            landmarkName = "-tearDown"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "LFLiveKitTests/LFLiveKitTests.m"
-            timestampString = "486890391.195074"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "30"
-            endingLineNumber = "30"
-            landmarkName = "-testExample"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "LFLiveKitTests/LFLiveKitTests.m"
-            timestampString = "486890392.195974"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "37"
-            endingLineNumber = "37"
-            landmarkName = "-testPerformanceExample"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>

LFLiveKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.7</string>
+	<string>1.9.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

LFLiveKit/LFLiveSession.h

@@ -15,15 +15,6 @@
 #import "LFLiveVideoConfiguration.h"
 #import "LFLiveDebug.h"
 
-typedef void (^ LFRequestComplete)(_Nullable id info,NSError *_Nullable errorMsg);
-
-/// 流类型
-typedef NS_ENUM(NSUInteger, LFLiveType){
-    /// rtmp格式
-    LFLiveRTMP = 0,
-    /// tcp 传输flv格式
-    LFLiveFLV = 1,
-};
 
 @class LFLiveSession;
 @protocol LFLiveSessionDelegate <NSObject>
@@ -32,9 +23,9 @@ typedef NS_ENUM(NSUInteger, LFLiveType){
 /** live status changed will callback */
 - (void)liveSession:(nullable LFLiveSession *)session liveStateDidChange:(LFLiveState)state;
 /** live debug info callback */
-- (void)liveSession:(nullable LFLiveSession *)session debugInfo:(nullable LFLiveDebug*)debugInfo;
+- (void)liveSession:(nullable LFLiveSession *)session debugInfo:(nullable LFLiveDebug *)debugInfo;
 /** callback socket errorcode */
-- (void)liveSession:(nullable LFLiveSession*)session errorCode:(LFLiveSocketErrorCode)errorCode;
+- (void)liveSession:(nullable LFLiveSession *)session errorCode:(LFLiveSocketErrorCode)errorCode;
 @end
 
 @class LFLiveStreamInfo;
@@ -46,13 +37,13 @@ typedef NS_ENUM(NSUInteger, LFLiveType){
 /// @name Attribute
 ///=============================================================================
 /** The delegate of the capture. captureData callback */
-@property (nullable,nonatomic, weak) id<LFLiveSessionDelegate> delegate;
+@property (nullable, nonatomic, weak) id<LFLiveSessionDelegate> delegate;
 
 /** The running control start capture or stop capture*/
 @property (nonatomic, assign) BOOL running;
 
 /** The preView will show OpenGL ES view*/
-@property (nonatomic, strong,null_resettable) UIView *preView;
+@property (nonatomic, strong, null_resettable) UIView *preView;
 
 /** The captureDevicePosition control camraPosition ,default front*/
 @property (nonatomic, assign) AVCaptureDevicePosition captureDevicePosition;
@@ -76,22 +67,22 @@ typedef NS_ENUM(NSUInteger, LFLiveType){
 @property (nonatomic, assign) BOOL mirror;
 
 /** The muted control callbackAudioData,muted will memset 0.*/
-@property (nonatomic,assign) BOOL muted;
+@property (nonatomic, assign) BOOL muted;
 
 /** The stream control upload and package*/
-@property (nullable,nonatomic, strong,readonly) LFLiveStreamInfo * streamInfo;
+@property (nullable, nonatomic, strong, readonly) LFLiveStreamInfo *streamInfo;
 
 /** The status of the stream .*/
-@property (nonatomic,assign,readonly) LFLiveState state;
+@property (nonatomic, assign, readonly) LFLiveState state;
 
 /** The showDebugInfo control streamInfo and uploadInfo(1s) *.*/
-@property (nonatomic,assign) BOOL showDebugInfo;
+@property (nonatomic, assign) BOOL showDebugInfo;
 
 /** The reconnectInterval control reconnect timeInterval(重连间隔) *.*/
-@property (nonatomic,assign) NSUInteger reconnectInterval;
+@property (nonatomic, assign) NSUInteger reconnectInterval;
 
 /** The reconnectCount control reconnect count (重连次数) *.*/
-@property (nonatomic,assign) NSUInteger reconnectCount;
+@property (nonatomic, assign) NSUInteger reconnectCount;
 
 #pragma mark - Initializer
 ///=============================================================================
@@ -101,13 +92,13 @@ typedef NS_ENUM(NSUInteger, LFLiveType){
 + (nullable instancetype)new UNAVAILABLE_ATTRIBUTE;
 
 /**
- The designated initializer. Multiple instances with the same configuration will make the
- capture unstable.
+   The designated initializer. Multiple instances with the same configuration will make the
+   capture unstable.
  */
-- (nullable instancetype)initWithAudioConfiguration:(nullable LFLiveAudioConfiguration*)audioConfiguration videoConfiguration:(nullable LFLiveVideoConfiguration*)videoConfiguration liveType:(LFLiveType)liveType NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithAudioConfiguration:(nullable LFLiveAudioConfiguration *)audioConfiguration videoConfiguration:(nullable LFLiveVideoConfiguration *)videoConfiguration NS_DESIGNATED_INITIALIZER;
 
 /** The start stream .*/
-- (void)startLive:(nonnull LFLiveStreamInfo*)streamInfo;
+- (void)startLive:(nonnull LFLiveStreamInfo *)streamInfo;
 
 /** The stop stream .*/
 - (void)stopLive;

LFLiveKit/LFLiveSession.m

@@ -11,19 +11,16 @@
 #import "LFAudioCapture.h"
 #import "LFHardwareVideoEncoder.h"
 #import "LFHardwareAudioEncoder.h"
-#import "LFStreamRtmpSocket.h"
-#import "LFStreamTcpSocket.h"
+#import "LFStreamRTMPSocket.h"
 #import "LFLiveStreamInfo.h"
 #import "LFGPUImageBeautyFilter.h"
 
 #define LFLiveReportKey @"com.youku.liveSessionReport"
 
-@interface LFLiveSession ()<LFAudioCaptureDelegate,LFVideoCaptureDelegate,LFAudioEncodingDelegate,LFVideoEncodingDelegate,LFStreamSocketDelegate>
+@interface LFLiveSession ()<LFAudioCaptureDelegate, LFVideoCaptureDelegate, LFAudioEncodingDelegate, LFVideoEncodingDelegate, LFStreamSocketDelegate>
 {
     dispatch_semaphore_t _lock;
 }
-///流媒体格式
-@property (nonatomic, assign) LFLiveType liveType;
 ///音频配置
 @property (nonatomic, strong) LFLiveAudioConfiguration *audioConfiguration;
 ///视频配置
@@ -49,7 +46,7 @@
 /// uploading
 @property (nonatomic, assign) BOOL uploading;
 /// state
-@property (nonatomic,assign,readwrite) LFLiveState state;
+@property (nonatomic, assign, readwrite) LFLiveState state;
 
 @end
 
@@ -66,99 +63,100 @@
 @implementation LFLiveSession
 
 #pragma mark -- LifeCycle
-- (instancetype)initWithAudioConfiguration:(LFLiveAudioConfiguration *)audioConfiguration videoConfiguration:(LFLiveVideoConfiguration *)videoConfiguration liveType:(LFLiveType)liveType{
-    if(!audioConfiguration || !videoConfiguration) @throw [NSException exceptionWithName:@"LFLiveSession init error" reason:@"audioConfiguration or videoConfiguration is nil " userInfo:nil];
-    if(self = [super init]){
+- (instancetype)initWithAudioConfiguration:(LFLiveAudioConfiguration *)audioConfiguration videoConfiguration:(LFLiveVideoConfiguration *)videoConfiguration {
+    if (!audioConfiguration || !videoConfiguration) @throw [NSException exceptionWithName:@"LFLiveSession init error" reason:@"audioConfiguration or videoConfiguration is nil " userInfo:nil];
+    if (self = [super init]) {
         _audioConfiguration = audioConfiguration;
         _videoConfiguration = videoConfiguration;
-        _liveType = liveType;
         _lock = dispatch_semaphore_create(1);
     }
     return self;
 }
 
-- (void)dealloc{
+- (void)dealloc {
     self.audioCaptureSource.running = NO;
     self.videoCaptureSource.running = NO;
 }
 
 #pragma mark -- CustomMethod
-- (void)startLive:(LFLiveStreamInfo*)streamInfo{
-    if(!streamInfo) return;
+- (void)startLive:(LFLiveStreamInfo *)streamInfo {
+    if (!streamInfo) return;
     _streamInfo = streamInfo;
     _streamInfo.videoConfiguration = _videoConfiguration;
     _streamInfo.audioConfiguration = _audioConfiguration;
     [self.socket start];
 }
 
-- (void)stopLive{
+- (void)stopLive {
     self.uploading = NO;
     [self.socket stop];
 }
 
 #pragma mark -- CaptureDelegate
-- (void)captureOutput:(nullable LFAudioCapture*)capture audioBuffer:(AudioBufferList)inBufferList{
-    [self.audioEncoder encodeAudioData:inBufferList timeStamp:self.currentTimestamp];
+- (void)captureOutput:(nullable LFAudioCapture *)capture audioBuffer:(AudioBufferList)inBufferList {
+    if (self.uploading) [self.audioEncoder encodeAudioData:inBufferList timeStamp:self.currentTimestamp];
 }
 
-- (void)captureOutput:(nullable LFVideoCapture*)capture pixelBuffer:(nullable CVImageBufferRef)pixelBuffer{
-    [self.videoEncoder encodeVideoData:pixelBuffer timeStamp:self.currentTimestamp];
+- (void)captureOutput:(nullable LFVideoCapture *)capture pixelBuffer:(nullable CVImageBufferRef)pixelBuffer {
+    if (self.uploading) [self.videoEncoder encodeVideoData:pixelBuffer timeStamp:self.currentTimestamp];
 }
 
 #pragma mark -- EncoderDelegate
-- (void)audioEncoder:(nullable id<LFAudioEncoding>)encoder audioFrame:(nullable LFAudioFrame*)frame{
-    if(self.uploading) [self.socket sendFrame:frame];//<上传
+- (void)audioEncoder:(nullable id<LFAudioEncoding>)encoder audioFrame:(nullable LFAudioFrame *)frame {
+    if (self.uploading) [self.socket sendFrame:frame];  //<上传
 }
 
-- (void)videoEncoder:(nullable id<LFVideoEncoding>)encoder videoFrame:(nullable LFVideoFrame*)frame{
-    if(self.uploading) [self.socket sendFrame:frame];//<上传
+- (void)videoEncoder:(nullable id<LFVideoEncoding>)encoder videoFrame:(nullable LFVideoFrame *)frame {
+    if (self.uploading) [self.socket sendFrame:frame];  //<上传
 }
 
 #pragma mark -- LFStreamTcpSocketDelegate
-- (void)socketStatus:(nullable id<LFStreamSocket>)socket status:(LFLiveState)status{
-    if(status == LFLiveStart){
-        if(!self.uploading){
+- (void)socketStatus:(nullable id<LFStreamSocket>)socket status:(LFLiveState)status {
+    if (status == LFLiveStart) {
+        if (!self.uploading) {
             self.timestamp = 0;
             self.isFirstFrame = YES;
             self.uploading = YES;
         }
+    }else if(status == LFLiveStop || status == LFLiveError){
+        self.uploading = NO;
     }
     dispatch_async(dispatch_get_main_queue(), ^{
         self.state = status;
-        if(self.delegate && [self.delegate respondsToSelector:@selector(liveSession:liveStateDidChange:)]){
+        if (self.delegate && [self.delegate respondsToSelector:@selector(liveSession:liveStateDidChange:)]) {
             [self.delegate liveSession:self liveStateDidChange:status];
         }
     });
 }
 
-- (void)socketDidError:(nullable id<LFStreamSocket>)socket errorCode:(LFLiveSocketErrorCode)errorCode{
+- (void)socketDidError:(nullable id<LFStreamSocket>)socket errorCode:(LFLiveSocketErrorCode)errorCode {
     dispatch_async(dispatch_get_main_queue(), ^{
-        if(self.delegate && [self.delegate respondsToSelector:@selector(liveSession:errorCode:)]){
+        if (self.delegate && [self.delegate respondsToSelector:@selector(liveSession:errorCode:)]) {
             [self.delegate liveSession:self errorCode:errorCode];
         }
     });
 }
 
-- (void)socketDebug:(nullable id<LFStreamSocket>)socket debugInfo:(nullable LFLiveDebug*)debugInfo{
+- (void)socketDebug:(nullable id<LFStreamSocket>)socket debugInfo:(nullable LFLiveDebug *)debugInfo {
     self.debugInfo = debugInfo;
-    if(self.showDebugInfo){
+    if (self.showDebugInfo) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            if(self.delegate && [self.delegate respondsToSelector:@selector(liveSession:debugInfo:)]){
+            if (self.delegate && [self.delegate respondsToSelector:@selector(liveSession:debugInfo:)]) {
                 [self.delegate liveSession:self debugInfo:debugInfo];
             }
         });
     }
 }
 
-- (void)socketBufferStatus:(nullable id<LFStreamSocket>)socket status:(LFLiveBuffferState)status{
+- (void)socketBufferStatus:(nullable id<LFStreamSocket>)socket status:(LFLiveBuffferState)status {
     NSUInteger videoBitRate = [_videoEncoder videoBitRate];
-    if(status == LFLiveBuffferIncrease){
-        if(videoBitRate < _videoConfiguration.videoMaxBitRate){
+    if (status == LFLiveBuffferDecline) {
+        if (videoBitRate < _videoConfiguration.videoMaxBitRate) {
             videoBitRate = videoBitRate + 50 * 1000;
             [_videoEncoder setVideoBitRate:videoBitRate];
         }
-    }else{
-        if(videoBitRate > _videoConfiguration.videoMinBitRate){
+    } else {
+        if (videoBitRate > _videoConfiguration.videoMinBitRate) {
             videoBitRate = videoBitRate - 100 * 1000;
             [_videoEncoder setVideoBitRate:videoBitRate];
         }
@@ -166,8 +164,8 @@
 }
 
 #pragma mark -- Getter Setter
-- (void)setRunning:(BOOL)running{
-    if(_running == running) return;
+- (void)setRunning:(BOOL)running {
+    if (_running == running) return;
     [self willChangeValueForKey:@"running"];
     _running = running;
     [self didChangeValueForKey:@"running"];
@@ -175,32 +173,40 @@
     self.audioCaptureSource.running = _running;
 }
 
-- (void)setPreView:(UIView *)preView{
+- (void)setPreView:(UIView *)preView {
+    [self willChangeValueForKey:@"preView"];
     [self.videoCaptureSource setPreView:preView];
+    [self didChangeValueForKey:@"preView"];
 }
 
-- (UIView*)preView{
+- (UIView *)preView {
     return self.videoCaptureSource.preView;
 }
 
-- (void)setCaptureDevicePosition:(AVCaptureDevicePosition)captureDevicePosition{
+- (void)setCaptureDevicePosition:(AVCaptureDevicePosition)captureDevicePosition {
+    [self willChangeValueForKey:@"captureDevicePosition"];
     [self.videoCaptureSource setCaptureDevicePosition:captureDevicePosition];
+    [self didChangeValueForKey:@"captureDevicePosition"];
 }
 
-- (AVCaptureDevicePosition)captureDevicePosition{
+- (AVCaptureDevicePosition)captureDevicePosition {
     return self.videoCaptureSource.captureDevicePosition;
 }
 
-- (void)setBeautyFace:(BOOL)beautyFace{
+- (void)setBeautyFace:(BOOL)beautyFace {
+    [self willChangeValueForKey:@"beautyFace"];
     [self.videoCaptureSource setBeautyFace:beautyFace];
+    [self didChangeValueForKey:@"beautyFace"];
 }
 
-- (BOOL)beautyFace{
+- (BOOL)beautyFace {
     return self.videoCaptureSource.beautyFace;
 }
 
 - (void)setBeautyLevel:(CGFloat)beautyLevel {
+    [self willChangeValueForKey:@"beautyLevel"];
     [self.videoCaptureSource setBeautyLevel:beautyLevel];
+    [self didChangeValueForKey:@"beautyLevel"];
 }
 
 - (CGFloat)beautyLevel {
@@ -208,7 +214,9 @@
 }
 
 - (void)setBrightLevel:(CGFloat)brightLevel {
+    [self willChangeValueForKey:@"brightLevel"];
     [self.videoCaptureSource setBrightLevel:brightLevel];
+    [self didChangeValueForKey:@"brightLevel"];
 }
 
 - (CGFloat)brightLevel {
@@ -216,7 +224,9 @@
 }
 
 - (void)setZoomScale:(CGFloat)zoomScale {
+    [self willChangeValueForKey:@"zoomScale"];
     [self.videoCaptureSource setZoomScale:zoomScale];
+    [self didChangeValueForKey:@"zoomScale"];
 }
 
 - (CGFloat)zoomScale {
@@ -224,7 +234,9 @@
 }
 
 - (void)setTorch:(BOOL)torch {
+    [self willChangeValueForKey:@"torch"];
     [self.videoCaptureSource setTorch:torch];
+    [self didChangeValueForKey:@"torch"];
 }
 
 - (BOOL)torch {
@@ -232,76 +244,76 @@
 }
 
 - (void)setMirror:(BOOL)mirror {
+    [self willChangeValueForKey:@"mirror"];
     [self.videoCaptureSource setMirror:mirror];
+    [self didChangeValueForKey:@"mirror"];
 }
 
 - (BOOL)mirror {
     return self.videoCaptureSource.mirror;
 }
 
-- (void)setMuted:(BOOL)muted{
+- (void)setMuted:(BOOL)muted {
+    [self willChangeValueForKey:@"muted"];
     [self.audioCaptureSource setMuted:muted];
+    [self didChangeValueForKey:@"muted"];
 }
 
-- (BOOL)muted{
+- (BOOL)muted {
     return self.audioCaptureSource.muted;
 }
 
-- (LFAudioCapture*)audioCaptureSource{
-    if(!_audioCaptureSource){
+- (LFAudioCapture *)audioCaptureSource {
+    if (!_audioCaptureSource) {
         _audioCaptureSource = [[LFAudioCapture alloc] initWithAudioConfiguration:_audioConfiguration];
         _audioCaptureSource.delegate = self;
     }
     return _audioCaptureSource;
 }
 
-- (LFVideoCapture*)videoCaptureSource{
-    if(!_videoCaptureSource){
+- (LFVideoCapture *)videoCaptureSource {
+    if (!_videoCaptureSource) {
         _videoCaptureSource = [[LFVideoCapture alloc] initWithVideoConfiguration:_videoConfiguration];
         _videoCaptureSource.delegate = self;
     }
     return _videoCaptureSource;
 }
 
-- (id<LFAudioEncoding>)audioEncoder{
-    if(!_audioEncoder){
+- (id<LFAudioEncoding>)audioEncoder {
+    if (!_audioEncoder) {
         _audioEncoder = [[LFHardwareAudioEncoder alloc] initWithAudioStreamConfiguration:_audioConfiguration];
         [_audioEncoder setDelegate:self];
     }
     return _audioEncoder;
 }
 
-- (id<LFVideoEncoding>)videoEncoder{
-    if(!_videoEncoder){
+- (id<LFVideoEncoding>)videoEncoder {
+    if (!_videoEncoder) {
         _videoEncoder = [[LFHardwareVideoEncoder alloc] initWithVideoStreamConfiguration:_videoConfiguration];
         [_videoEncoder setDelegate:self];
     }
     return _videoEncoder;
 }
 
-- (id<LFStreamSocket>)socket{
-    if(!_socket){
-        if(self.liveType == LFLiveRTMP){
-            _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];
-        }
+- (id<LFStreamSocket>)socket {
+    if (!_socket) {
+        _socket = [[LFStreamRTMPSocket alloc] initWithStream:self.streamInfo videoSize:self.videoConfiguration.videoSize reconnectInterval:self.reconnectInterval reconnectCount:self.reconnectCount];
         [_socket setDelegate:self];
     }
     return _socket;
 }
 
-- (LFLiveStreamInfo*)streamInfo{
-    if(!_streamInfo){
+- (LFLiveStreamInfo *)streamInfo {
+    if (!_streamInfo) {
         _streamInfo = [[LFLiveStreamInfo alloc] init];
     }
     return _streamInfo;
 }
 
-- (uint64_t)currentTimestamp{
+- (uint64_t)currentTimestamp {
     dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER);
     uint64_t currentts = 0;
-    if(_isFirstFrame == true) {
+    if (_isFirstFrame == true) {
         _timestamp = NOW;
         _isFirstFrame = false;
         currentts = 0;

LFLiveKit/capture/LFAudioCapture.h

@@ -17,7 +17,7 @@ extern NSString *_Nullable const LFAudioComponentFailedToCreateNotification;
 @class LFAudioCapture;
 /** LFAudioCapture callback audioData */
 @protocol LFAudioCaptureDelegate <NSObject>
-- (void)captureOutput:(nullable LFAudioCapture*)capture audioBuffer:(AudioBufferList)inBufferList;
+- (void)captureOutput:(nullable LFAudioCapture *)capture audioBuffer:(AudioBufferList)inBufferList;
 @end
 
 
@@ -29,10 +29,10 @@ extern NSString *_Nullable const LFAudioComponentFailedToCreateNotification;
 ///=============================================================================
 
 /** The delegate of the capture. captureData callback */
-@property (nullable,nonatomic, weak) id<LFAudioCaptureDelegate> delegate;
+@property (nullable, nonatomic, weak) id<LFAudioCaptureDelegate> delegate;
 
 /** The muted control callbackAudioData,muted will memset 0.*/
-@property (nonatomic,assign) BOOL muted;
+@property (nonatomic, assign) BOOL muted;
 
 /** The running control start capture or stop capture*/
 @property (nonatomic, assign) BOOL running;
@@ -45,8 +45,8 @@ extern NSString *_Nullable const LFAudioComponentFailedToCreateNotification;
 + (nullable instancetype)new UNAVAILABLE_ATTRIBUTE;
 
 /**
- The designated initializer. Multiple instances with the same configuration will make the
- capture unstable.
+   The designated initializer. Multiple instances with the same configuration will make the
+   capture unstable.
  */
 - (nullable instancetype)initWithAudioConfiguration:(nullable LFLiveAudioConfiguration *)configuration NS_DESIGNATED_INITIALIZER;
 

LFLiveKit/capture/LFAudioCapture.m

@@ -14,9 +14,9 @@ NSString *const LFAudioComponentFailedToCreateNotification = @"LFAudioComponentF
 
 @interface LFAudioCapture ()
 
-@property (nonatomic, assign) AudioComponentInstance    componetInstance;
-@property (nonatomic, assign) AudioComponent            component;
-@property (nonatomic, strong) dispatch_queue_t       taskQueue;
+@property (nonatomic, assign) AudioComponentInstance componetInstance;
+@property (nonatomic, assign) AudioComponent component;
+@property (nonatomic, strong) dispatch_queue_t taskQueue;
 @property (nonatomic, assign) BOOL isRunning;
 @property (nonatomic, strong) LFLiveAudioConfiguration *configuration;
 
@@ -25,54 +25,54 @@ NSString *const LFAudioComponentFailedToCreateNotification = @"LFAudioComponentF
 @implementation LFAudioCapture
 
 #pragma mark -- LiftCycle
-- (instancetype)initWithAudioConfiguration:(LFLiveAudioConfiguration *)configuration{
-    if(self = [super init]){
+- (instancetype)initWithAudioConfiguration:(LFLiveAudioConfiguration *)configuration {
+    if (self = [super init]) {
         _configuration = configuration;
         self.isRunning = NO;
         self.taskQueue = dispatch_queue_create("com.youku.Laifeng.audioCapture.Queue", NULL);
-        
+
         AVAudioSession *session = [AVAudioSession sharedInstance];
-        [session setActive:YES withOptions:kAudioSessionSetActiveFlag_NotifyOthersOnDeactivation error:nil];
-        
-        [[NSNotificationCenter defaultCenter] addObserver: self
-                                                 selector: @selector(handleRouteChange:)
-                                                     name: AVAudioSessionRouteChangeNotification
-                                                   object: session];
-        [[NSNotificationCenter defaultCenter] addObserver: self
-                                                 selector: @selector(handleInterruption:)
-                                                     name: AVAudioSessionInterruptionNotification
-                                                   object: session];
-        
+        [session setActive:YES error:nil];
+
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(handleRouteChange:)
+                                                     name:AVAudioSessionRouteChangeNotification
+                                                   object:session];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(handleInterruption:)
+                                                     name:AVAudioSessionInterruptionNotification
+                                                   object:session];
+
         NSError *error = nil;
-        
-        [session setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker | AVAudioSessionCategoryOptionMixWithOthers error:nil];
-        
+
+        [session setCategory:AVAudioSessionCategoryPlayAndRecord error:nil];
+
         [session setMode:AVAudioSessionModeVideoRecording error:&error];
-        
+
         if (![session setActive:YES error:&error]) {
             [self handleAudioComponentCreationFailure];
         }
-        
+
         AudioComponentDescription acd;
         acd.componentType = kAudioUnitType_Output;
         acd.componentSubType = kAudioUnitSubType_RemoteIO;
         acd.componentManufacturer = kAudioUnitManufacturer_Apple;
         acd.componentFlags = 0;
         acd.componentFlagsMask = 0;
-        
+
         self.component = AudioComponentFindNext(NULL, &acd);
-        
+
         OSStatus status = noErr;
         status = AudioComponentInstanceNew(self.component, &_componetInstance);
-        
+
         if (noErr != status) {
             [self handleAudioComponentCreationFailure];
         }
-        
+
         UInt32 flagOne = 1;
-        
+
         AudioUnitSetProperty(self.componetInstance, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Input, 1, &flagOne, sizeof(flagOne));
-        
+
         AudioStreamBasicDescription desc = {0};
         desc.mSampleRate = _configuration.audioSampleRate;
         desc.mFormatID = kAudioFormatLinearPCM;
@@ -82,32 +82,32 @@ NSString *const LFAudioComponentFailedToCreateNotification = @"LFAudioComponentF
         desc.mBitsPerChannel = 16;
         desc.mBytesPerFrame = desc.mBitsPerChannel / 8 * desc.mChannelsPerFrame;
         desc.mBytesPerPacket = desc.mBytesPerFrame * desc.mFramesPerPacket;
-        
+
         AURenderCallbackStruct cb;
         cb.inputProcRefCon = (__bridge void *)(self);
         cb.inputProc = handleInputBuffer;
         AudioUnitSetProperty(self.componetInstance, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, 1, &desc, sizeof(desc));
         AudioUnitSetProperty(self.componetInstance, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Global, 1, &cb, sizeof(cb));
-        
+
         status = AudioUnitInitialize(self.componetInstance);
-        
+
         if (noErr != status) {
             [self handleAudioComponentCreationFailure];
         }
-        
+
         [session setPreferredSampleRate:_configuration.audioSampleRate error:nil];
-        
-        
+
+
         [session setActive:YES error:nil];
     }
     return self;
 }
 
-- (void)dealloc{
+- (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-    
+
     dispatch_sync(self.taskQueue, ^{
-        if(self.componetInstance){
+        if (self.componetInstance) {
             AudioOutputUnitStop(self.componetInstance);
             AudioComponentInstanceDispose(self.componetInstance);
             self.componetInstance = nil;
@@ -117,16 +117,16 @@ NSString *const LFAudioComponentFailedToCreateNotification = @"LFAudioComponentF
 }
 
 #pragma mark -- Setter
-- (void)setRunning:(BOOL)running{
-    if(_running == running) return;
+- (void)setRunning:(BOOL)running {
+    if (_running == running) return;
     _running = running;
-    if(_running){
+    if (_running) {
         dispatch_async(self.taskQueue, ^{
             self.isRunning = YES;
             NSLog(@"MicrophoneSource: startRunning");
             AudioOutputUnitStart(self.componetInstance);
         });
-    }else{
+    } else {
         self.isRunning = NO;
     }
 }
@@ -141,43 +141,44 @@ NSString *const LFAudioComponentFailedToCreateNotification = @"LFAudioComponentF
 #pragma mark -- NSNotification
 - (void)handleRouteChange:(NSNotification *)notification {
     AVAudioSession *session = [ AVAudioSession sharedInstance ];
-    NSString* seccReason = @"";
-    NSInteger  reason = [[[notification userInfo] objectForKey:AVAudioSessionRouteChangeReasonKey] integerValue];
+    NSString *seccReason = @"";
+    NSInteger reason = [[[notification userInfo] objectForKey:AVAudioSessionRouteChangeReasonKey] integerValue];
     //  AVAudioSessionRouteDescription* prevRoute = [[notification userInfo] objectForKey:AVAudioSessionRouteChangePreviousRouteKey];
     switch (reason) {
-        case AVAudioSessionRouteChangeReasonNoSuitableRouteForCategory:
-            seccReason = @"The route changed because no suitable route is now available for the specified category.";
-            break;
-        case AVAudioSessionRouteChangeReasonWakeFromSleep:
-            seccReason = @"The route changed when the device woke up from sleep.";
-            break;
-        case AVAudioSessionRouteChangeReasonOverride:
-            seccReason = @"The output route was overridden by the app.";
-            break;
-        case AVAudioSessionRouteChangeReasonCategoryChange:
-            seccReason = @"The category of the session object changed.";
-            break;
-        case AVAudioSessionRouteChangeReasonOldDeviceUnavailable:
-            seccReason = @"The previous audio output path is no longer available.";
-            break;
-        case AVAudioSessionRouteChangeReasonNewDeviceAvailable:
-            seccReason = @"A preferred new audio output path is now available.";
-            break;
-        case AVAudioSessionRouteChangeReasonUnknown:
-        default:
-            seccReason = @"The reason for the change is unknown.";
-            break;
+    case AVAudioSessionRouteChangeReasonNoSuitableRouteForCategory:
+        seccReason = @"The route changed because no suitable route is now available for the specified category.";
+        break;
+    case AVAudioSessionRouteChangeReasonWakeFromSleep:
+        seccReason = @"The route changed when the device woke up from sleep.";
+        break;
+    case AVAudioSessionRouteChangeReasonOverride:
+        seccReason = @"The output route was overridden by the app.";
+        break;
+    case AVAudioSessionRouteChangeReasonCategoryChange:
+        seccReason = @"The category of the session object changed.";
+        break;
+    case AVAudioSessionRouteChangeReasonOldDeviceUnavailable:
+        seccReason = @"The previous audio output path is no longer available.";
+        break;
+    case AVAudioSessionRouteChangeReasonNewDeviceAvailable:
+        seccReason = @"A preferred new audio output path is now available.";
+        break;
+    case AVAudioSessionRouteChangeReasonUnknown:
+    default:
+        seccReason = @"The reason for the change is unknown.";
+        break;
     }
-    NSLog(@"handleRouteChange reason is %@",seccReason);
-    AVAudioSessionPortDescription *input = [[session.currentRoute.inputs count]?session.currentRoute.inputs:nil objectAtIndex:0];
+    NSLog(@"handleRouteChange reason is %@", seccReason);
+
+    AVAudioSessionPortDescription *input = [[session.currentRoute.inputs count] ? session.currentRoute.inputs : nil objectAtIndex:0];
     if (input.portType == AVAudioSessionPortHeadsetMic) {
-        
+
     }
 }
 
 - (void)handleInterruption:(NSNotification *)notification {
     NSInteger reason = 0;
-    NSString* reasonStr = @"";
+    NSString *reasonStr = @"";
     if ([notification.name isEqualToString:AVAudioSessionInterruptionNotification]) {
         //Posted when an audio interruption occurs.
         reason = [[[notification userInfo] objectForKey:AVAudioSessionInterruptionTypeKey] integerValue];
@@ -189,27 +190,28 @@ NSString *const LFAudioComponentFailedToCreateNotification = @"LFAudioComponentF
                 });
             }
         }
-        
+
         if (reason == AVAudioSessionInterruptionTypeEnded) {
             reasonStr = @"AVAudioSessionInterruptionTypeEnded";
-            NSNumber* seccondReason = [[notification userInfo] objectForKey:AVAudioSessionInterruptionOptionKey] ;
+            NSNumber *seccondReason = [[notification userInfo] objectForKey:AVAudioSessionInterruptionOptionKey];
             switch ([seccondReason integerValue]) {
-                case AVAudioSessionInterruptionOptionShouldResume:
-                    if (self.isRunning) {
-                        dispatch_async(self.taskQueue, ^{
-                            NSLog(@"MicrophoneSource: stopRunning");
-                            AudioOutputUnitStart(self.componetInstance);
-                        });
-                    }
-                    // Indicates that the audio session is active and immediately ready to be used. Your app can resume the audio operation that was interrupted.
-                    break;
-                default:
-                    break;
+            case AVAudioSessionInterruptionOptionShouldResume:
+                if (self.isRunning) {
+                    dispatch_async(self.taskQueue, ^{
+                        NSLog(@"MicrophoneSource: stopRunning");
+                        AudioOutputUnitStart(self.componetInstance);
+                    });
+                }
+                // Indicates that the audio session is active and immediately ready to be used. Your app can resume the audio operation that was interrupted.
+                break;
+            default:
+                break;
             }
         }
-        
-    };
-    NSLog(@"handleInterruption: %@ reason %@",[notification name], reasonStr);
+
+    }
+    ;
+    NSLog(@"handleInterruption: %@ reason %@", [notification name], reasonStr);
 }
 
 #pragma mark -- CallBack
@@ -221,42 +223,42 @@ static OSStatus handleInputBuffer(void *inRefCon,
                                   AudioBufferList *ioData) {
     @autoreleasepool {
         LFAudioCapture *source = (__bridge LFAudioCapture *)inRefCon;
-        if(!source) return -1;
-        
+        if (!source) return -1;
+
         AudioBuffer buffer;
         buffer.mData = NULL;
         buffer.mDataByteSize = 0;
         buffer.mNumberChannels = 1;
-        
+
         AudioBufferList buffers;
         buffers.mNumberBuffers = 1;
         buffers.mBuffers[0] = buffer;
-        
+
         OSStatus status = AudioUnitRender(source.componetInstance,
                                           ioActionFlags,
                                           inTimeStamp,
                                           inBusNumber,
                                           inNumberFrames,
                                           &buffers);
-        
+
         if (!source.isRunning) {
             dispatch_sync(source.taskQueue, ^{
                 NSLog(@"MicrophoneSource: stopRunning");
                 AudioOutputUnitStop(source.componetInstance);
             });
-            
+
             return status;
         }
-        
+
         if (source.muted) {
             for (int i = 0; i < buffers.mNumberBuffers; i++) {
                 AudioBuffer ab = buffers.mBuffers[i];
                 memset(ab.mData, 0, ab.mDataByteSize);
             }
         }
-        
-        if(!status) {
-            if(source.delegate && [source.delegate respondsToSelector:@selector(captureOutput:audioBuffer:)]){
+
+        if (!status) {
+            if (source.delegate && [source.delegate respondsToSelector:@selector(captureOutput:audioBuffer:)]) {
                 [source.delegate captureOutput:source audioBuffer:buffers];
             }
         }

LFLiveKit/capture/LFVideoCapture.h

@@ -13,7 +13,7 @@
 @class LFVideoCapture;
 /** LFVideoCapture callback videoData */
 @protocol LFVideoCaptureDelegate <NSObject>
-- (void)captureOutput:(nullable LFVideoCapture*)capture pixelBuffer:(nullable CVImageBufferRef)pixelBuffer;
+- (void)captureOutput:(nullable LFVideoCapture *)capture pixelBuffer:(nullable CVImageBufferRef)pixelBuffer;
 @end
 
 @interface LFVideoCapture : NSObject
@@ -24,13 +24,13 @@
 ///=============================================================================
 
 /** The delegate of the capture. captureData callback */
-@property (nullable,nonatomic, weak) id<LFVideoCaptureDelegate> delegate;
+@property (nullable, nonatomic, weak) id<LFVideoCaptureDelegate> delegate;
 
 /** The running control start capture or stop capture*/
 @property (nonatomic, assign) BOOL running;
 
 /** The preView will show OpenGL ES view*/
-@property (null_resettable,nonatomic, strong) UIView * preView;
+@property (null_resettable, nonatomic, strong) UIView *preView;
 
 /** The captureDevicePosition control camraPosition ,default front*/
 @property (nonatomic, assign) AVCaptureDevicePosition captureDevicePosition;
@@ -64,8 +64,8 @@
 + (nullable instancetype)new UNAVAILABLE_ATTRIBUTE;
 
 /**
- The designated initializer. Multiple instances with the same configuration will make the
- capture unstable.
+   The designated initializer. Multiple instances with the same configuration will make the
+   capture unstable.
  */
 - (nullable instancetype)initWithVideoConfiguration:(nullable LFLiveVideoConfiguration *)configuration NS_DESIGNATED_INITIALIZER;
 

LFLiveKit/capture/LFVideoCapture.m

@@ -30,23 +30,43 @@
 @synthesize zoomScale = _zoomScale;
 
 #pragma mark -- LifeCycle
-- (instancetype)initWithVideoConfiguration:(LFLiveVideoConfiguration *)configuration{
-    if(self = [super init]){
+- (instancetype)initWithVideoConfiguration:(LFLiveVideoConfiguration *)configuration {
+    if (self = [super init]) {
         _configuration = configuration;
         _videoCamera = [[GPUImageVideoCamera alloc] initWithSessionPreset:_configuration.avSessionPreset cameraPosition:AVCaptureDevicePositionFront];
-        _videoCamera.outputImageOrientation = _configuration.orientation;
+        UIInterfaceOrientation statusBar = [[UIApplication sharedApplication] statusBarOrientation];
+        if (configuration.landscape) {
+            if (statusBar != UIInterfaceOrientationLandscapeLeft && statusBar != UIInterfaceOrientationLandscapeRight) {
+                NSLog(@"当前设置方向出错");
+                NSLog(@"当前设置方向出错");
+                NSLog(@"当前设置方向出错");
+                _videoCamera.outputImageOrientation = UIInterfaceOrientationLandscapeLeft;
+            } else {
+                _videoCamera.outputImageOrientation = statusBar;
+            }
+        } else {
+            if (statusBar != UIInterfaceOrientationPortrait && statusBar != UIInterfaceOrientationPortraitUpsideDown) {
+                NSLog(@"当前设置方向出错");
+                NSLog(@"当前设置方向出错");
+                NSLog(@"当前设置方向出错");
+                _videoCamera.outputImageOrientation = UIInterfaceOrientationPortrait;
+            } else {
+                _videoCamera.outputImageOrientation = statusBar;
+            }
+        }
+
         _videoCamera.horizontallyMirrorFrontFacingCamera = NO;
         _videoCamera.horizontallyMirrorRearFacingCamera = NO;
         _videoCamera.frameRate = (int32_t)_configuration.videoFrameRate;
-        
+
         _gpuImageView = [[GPUImageView alloc] initWithFrame:[UIScreen mainScreen].bounds];
         [_gpuImageView setFillMode:kGPUImageFillModePreserveAspectRatioAndFill];
         [_gpuImageView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
         [_gpuImageView setInputRotation:kGPUImageFlipHorizonal atIndex:0];
-        
+
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterBackground:) name:UIApplicationWillResignActiveNotification object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterForeground:) name:UIApplicationDidBecomeActiveNotification object:nil];
-        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarChanged:) name:UIApplicationWillChangeStatusBarOrientationNotification object:nil];
         self.beautyFace = YES;
         self.beautyLevel = 0.5;
         self.brightLevel = 0.5;
@@ -55,36 +75,36 @@
     return self;
 }
 
-- (void)dealloc{
+- (void)dealloc {
     [UIApplication sharedApplication].idleTimerDisabled = NO;
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [_videoCamera stopCameraCapture];
 }
 
 #pragma mark -- Setter Getter
-- (void)setRunning:(BOOL)running{
-    if(_running == running) return;
+- (void)setRunning:(BOOL)running {
+    if (_running == running) return;
     _running = running;
-    
-    if(!_running){
+
+    if (!_running) {
         [UIApplication sharedApplication].idleTimerDisabled = NO;
         [_videoCamera stopCameraCapture];
-    }else{
+    } else {
         [UIApplication sharedApplication].idleTimerDisabled = YES;
         [_videoCamera startCameraCapture];
     }
 }
 
-- (void)setPreView:(UIView *)preView{
-    if(_gpuImageView.superview) [_gpuImageView removeFromSuperview];
+- (void)setPreView:(UIView *)preView {
+    if (_gpuImageView.superview) [_gpuImageView removeFromSuperview];
     [preView insertSubview:_gpuImageView atIndex:0];
 }
 
-- (UIView*)preView{
+- (UIView *)preView {
     return _gpuImageView.superview;
 }
 
-- (void)setCaptureDevicePosition:(AVCaptureDevicePosition)captureDevicePosition{
+- (void)setCaptureDevicePosition:(AVCaptureDevicePosition)captureDevicePosition {
     [_videoCamera rotateCamera];
     _videoCamera.frameRate = (int32_t)_configuration.videoFrameRate;
     if (captureDevicePosition == AVCaptureDevicePositionFront) {
@@ -94,30 +114,30 @@
     }
 }
 
-- (AVCaptureDevicePosition)captureDevicePosition{
+- (AVCaptureDevicePosition)captureDevicePosition {
     return [_videoCamera cameraPosition];
 }
 
-- (void)setVideoFrameRate:(NSInteger)videoFrameRate{
-    if(videoFrameRate <= 0) return;
-    if(videoFrameRate == _videoCamera.frameRate) return;
+- (void)setVideoFrameRate:(NSInteger)videoFrameRate {
+    if (videoFrameRate <= 0) return;
+    if (videoFrameRate == _videoCamera.frameRate) return;
     _videoCamera.frameRate = (uint32_t)videoFrameRate;
 }
 
-- (NSInteger)videoFrameRate{
+- (NSInteger)videoFrameRate {
     return _videoCamera.frameRate;
 }
 
 - (void)setTorch:(BOOL)torch {
     BOOL ret;
-    if(!_videoCamera.captureSession) return;
-    AVCaptureSession* session = (AVCaptureSession*)_videoCamera.captureSession;
+    if (!_videoCamera.captureSession) return;
+    AVCaptureSession *session = (AVCaptureSession *)_videoCamera.captureSession;
     [session beginConfiguration];
     if (_videoCamera.inputCamera) {
         if (_videoCamera.inputCamera.torchAvailable) {
-            NSError* err = nil;
+            NSError *err = nil;
             if ([_videoCamera.inputCamera lockForConfiguration:&err]) {
-                [_videoCamera.inputCamera setTorchMode:( torch ? AVCaptureTorchModeOn : AVCaptureTorchModeOff ) ];
+                [_videoCamera.inputCamera setTorchMode:(torch ? AVCaptureTorchModeOn : AVCaptureTorchModeOff) ];
                 [_videoCamera.inputCamera unlockForConfiguration];
                 ret = (_videoCamera.inputCamera.torchMode == AVCaptureTorchModeOn);
             } else {
@@ -131,37 +151,45 @@
     [session commitConfiguration];
     _torch = ret;
 }
+
 - (BOOL)torch {
     return _videoCamera.inputCamera.torchMode;
 }
+
 - (void)setMirror:(BOOL)mirror {
     _videoCamera.horizontallyMirrorFrontFacingCamera = mirror;
     _videoCamera.horizontallyMirrorRearFacingCamera = mirror;
 }
+
 - (BOOL)mirror {
     return _videoCamera.horizontallyMirrorFrontFacingCamera;
 }
+
 - (void)setBeautyLevel:(CGFloat)beautyLevel {
     _beautyLevel = beautyLevel;
     if (_beautyFilter) {
         [_beautyFilter setBeautyLevel:_beautyLevel];
     }
 }
+
 - (CGFloat)beautyLevel {
     return _beautyLevel;
 }
+
 - (void)setBrightLevel:(CGFloat)brightLevel {
     _brightLevel = brightLevel;
     if (_beautyFilter) {
         [_beautyFilter setBrightLevel:brightLevel];
     }
 }
+
 - (CGFloat)brightLevel {
     return _brightLevel;
 }
+
 - (void)setZoomScale:(CGFloat)zoomScale {
     if (self.videoCamera && self.videoCamera.inputCamera) {
-        AVCaptureDevice* device = (AVCaptureDevice*)self.videoCamera.inputCamera;
+        AVCaptureDevice *device = (AVCaptureDevice *)self.videoCamera.inputCamera;
         if ([device lockForConfiguration:nil]) {
             device.videoZoomFactor = zoomScale;
             [device unlockForConfiguration];
@@ -174,14 +202,14 @@
     return _zoomScale;
 }
 
-- (void)setBeautyFace:(BOOL)beautyFace{
-    if(_beautyFace == beautyFace) return;
-    
+- (void)setBeautyFace:(BOOL)beautyFace {
+    if (_beautyFace == beautyFace) return;
+
     _beautyFace = beautyFace;
     [_filter removeAllTargets];
     [_cropfilter removeAllTargets];
     [_videoCamera removeAllTargets];
-    
+
     if (_beautyFace) {
         _output = [[LFGPUImageEmptyFilter alloc] init];
         _filter = [[LFGPUImageBeautyFilter alloc] init];
@@ -198,9 +226,9 @@
             [_self processVideo:output];
         }];
     }
-    
+
     if (_configuration.isClipVideo) {
-        if (_configuration.orientation == UIInterfaceOrientationPortrait || _configuration.orientation == UIInterfaceOrientationPortraitUpsideDown){
+        if (_configuration.landscape) {
             _cropfilter = [[GPUImageCropFilter alloc] initWithCropRegion:CGRectMake(0.125, 0, 0.75, 1)];
         } else {
             _cropfilter = [[GPUImageCropFilter alloc] initWithCropRegion:CGRectMake(0, 0.125, 1, 0.75)];
@@ -210,14 +238,14 @@
     } else {
         [_videoCamera addTarget:_filter];
     }
-    
+
     if (_beautyFace) {
         [_filter addTarget:_output];
         [_output addTarget:_gpuImageView];
     } else {
         [_filter addTarget:_gpuImageView];
     }
-    
+
     if (_videoCamera.cameraPosition == AVCaptureDevicePositionFront) {
         [_gpuImageView setInputRotation:kGPUImageFlipHorizonal atIndex:0];
     } else {
@@ -226,13 +254,13 @@
 }
 
 #pragma mark -- Custom Method
-- (void)processVideo:(GPUImageOutput *)output{
+- (void)processVideo:(GPUImageOutput *)output {
     __weak typeof(self) _self = self;
     @autoreleasepool {
         GPUImageFramebuffer *imageFramebuffer = output.framebufferForOutput;
         CVPixelBufferRef pixelBuffer = [imageFramebuffer pixelBuffer];
-        
-        if(pixelBuffer && _self.delegate && [_self.delegate respondsToSelector:@selector(captureOutput:pixelBuffer:)]){
+
+        if (pixelBuffer && _self.delegate && [_self.delegate respondsToSelector:@selector(captureOutput:pixelBuffer:)]) {
             [_self.delegate captureOutput:_self pixelBuffer:pixelBuffer];
         }
 
@@ -241,7 +269,7 @@
 
 #pragma mark Notification
 
-- (void)willEnterBackground:(NSNotification*)notification{
+- (void)willEnterBackground:(NSNotification *)notification {
     [UIApplication sharedApplication].idleTimerDisabled = NO;
     [_videoCamera pauseCameraCapture];
     runSynchronouslyOnVideoProcessingQueue(^{
@@ -249,9 +277,27 @@
     });
 }
 
-- (void)willEnterForeground:(NSNotification*)notification{
+- (void)willEnterForeground:(NSNotification *)notification {
     [_videoCamera resumeCameraCapture];
     [UIApplication sharedApplication].idleTimerDisabled = YES;
 }
 
+- (void)statusBarChanged:(NSNotification *)notification {
+    NSLog(@"UIApplicationWillChangeStatusBarOrientationNotification. UserInfo: %@", notification.userInfo);
+    UIInterfaceOrientation statusBar = [[UIApplication sharedApplication] statusBarOrientation];
+    if (_configuration.landscape) {
+        if (statusBar == UIInterfaceOrientationLandscapeLeft) {
+            self.videoCamera.outputImageOrientation = UIInterfaceOrientationLandscapeRight;
+        } else if (statusBar == UIInterfaceOrientationLandscapeRight) {
+            self.videoCamera.outputImageOrientation = UIInterfaceOrientationLandscapeLeft;
+        }
+    } else {
+        if (statusBar == UIInterfaceOrientationPortrait) {
+            self.videoCamera.outputImageOrientation = UIInterfaceOrientationPortraitUpsideDown;
+        } else if (statusBar == UIInterfaceOrientationPortraitUpsideDown) {
+            self.videoCamera.outputImageOrientation = UIInterfaceOrientationPortrait;
+        }
+    }
+}
+
 @end

LFLiveKit/coder/LFAudioEncoding.h

@@ -15,7 +15,7 @@
 /// 编码器编码后回调
 @protocol LFAudioEncodingDelegate <NSObject>
 @required
-- (void)audioEncoder:(nullable id<LFAudioEncoding>)encoder audioFrame:(nullable LFAudioFrame*)frame;
+- (void)audioEncoder:(nullable id<LFAudioEncoding>)encoder audioFrame:(nullable LFAudioFrame *)frame;
 @end
 
 /// 编码器抽象的接口
@@ -24,8 +24,8 @@
 - (void)encodeAudioData:(AudioBufferList)inBufferList timeStamp:(uint64_t)timeStamp;
 - (void)stopEncoder;
 @optional
-- (nullable instancetype)initWithAudioStreamConfiguration:(nullable LFLiveAudioConfiguration*)configuration;
+- (nullable instancetype)initWithAudioStreamConfiguration:(nullable LFLiveAudioConfiguration *)configuration;
 - (void)setDelegate:(nullable id<LFAudioEncodingDelegate>)delegate;
-- (nullable NSData*)adtsData:(NSInteger)channel rawDataLength:(NSInteger)rawDataLength;
+- (nullable NSData *)adtsData:(NSInteger)channel rawDataLength:(NSInteger)rawDataLength;
 @end
 

LFLiveKit/coder/LFHardwareAudioEncoder.m

@@ -19,39 +19,39 @@
 
 @implementation LFHardwareAudioEncoder
 
-- (instancetype)initWithAudioStreamConfiguration:(LFLiveAudioConfiguration *)configuration{
-    if(self = [super init]){
+- (instancetype)initWithAudioStreamConfiguration:(LFLiveAudioConfiguration *)configuration {
+    if (self = [super init]) {
         _configuration = configuration;
     }
     return self;
 }
 
-- (void)dealloc{
-    if(aacBuf) free(aacBuf);
+- (void)dealloc {
+    if (aacBuf) free(aacBuf);
 }
 
 #pragma mark -- LFAudioEncoder
-- (void)setDelegate:(id<LFAudioEncodingDelegate>)delegate{
+- (void)setDelegate:(id<LFAudioEncodingDelegate>)delegate {
     _aacDeleage = delegate;
 }
 
-- (void)encodeAudioData:(AudioBufferList)inBufferList timeStamp:(uint64_t)timeStamp{
-    if (![self createAudioConvert]){
+- (void)encodeAudioData:(AudioBufferList)inBufferList timeStamp:(uint64_t)timeStamp {
+    if (![self createAudioConvert]) {
         return;
     }
-    
-    if(!aacBuf){
+
+    if (!aacBuf) {
         aacBuf = malloc(inBufferList.mBuffers[0].mDataByteSize);
     }
-    
+
     // 初始化一个输出缓冲列表
     AudioBufferList outBufferList;
-    outBufferList.mNumberBuffers              = 1;
+    outBufferList.mNumberBuffers = 1;
     outBufferList.mBuffers[0].mNumberChannels = inBufferList.mBuffers[0].mNumberChannels;
-    outBufferList.mBuffers[0].mDataByteSize   = inBufferList.mBuffers[0].mDataByteSize; // 设置缓冲区大小
-    outBufferList.mBuffers[0].mData           = aacBuf; // 设置AAC缓冲区
-    UInt32 outputDataPacketSize               = 1;
-    if (AudioConverterFillComplexBuffer(m_converter, inputDataProc, &inBufferList, &outputDataPacketSize, &outBufferList, NULL) != noErr){
+    outBufferList.mBuffers[0].mDataByteSize = inBufferList.mBuffers[0].mDataByteSize;   // 设置缓冲区大小
+    outBufferList.mBuffers[0].mData = aacBuf;           // 设置AAC缓冲区
+    UInt32 outputDataPacketSize = 1;
+    if (AudioConverterFillComplexBuffer(m_converter, inputDataProc, &inBufferList, &outputDataPacketSize, &outBufferList, NULL) != noErr) {
         return;
     }
     LFAudioFrame *audioFrame = [LFAudioFrame new];
@@ -61,22 +61,22 @@
     char exeData[2];
     exeData[0] = _configuration.asc[0];
     exeData[1] = _configuration.asc[1];
-    audioFrame.audioInfo =[NSData dataWithBytes:exeData length:2];
-    if(self.aacDeleage && [self.aacDeleage respondsToSelector:@selector(audioEncoder:audioFrame:)]){
+    audioFrame.audioInfo = [NSData dataWithBytes:exeData length:2];
+    if (self.aacDeleage && [self.aacDeleage respondsToSelector:@selector(audioEncoder:audioFrame:)]) {
         [self.aacDeleage audioEncoder:self audioFrame:audioFrame];
     }
 }
 
-- (void)stopEncoder{
-    
+- (void)stopEncoder {
+
 }
 
 #pragma mark -- CustomMethod
--(BOOL)createAudioConvert{ //根据输入样本初始化一个编码转换器
-    if (m_converter != nil){
+- (BOOL)createAudioConvert { //根据输入样本初始化一个编码转换器
+    if (m_converter != nil) {
         return TRUE;
     }
-    
+
     AudioStreamBasicDescription inputFormat = {0};
     inputFormat.mSampleRate = _configuration.audioSampleRate;
     inputFormat.mFormatID = kAudioFormatLinearPCM;
@@ -86,14 +86,14 @@
     inputFormat.mBitsPerChannel = 16;
     inputFormat.mBytesPerFrame = inputFormat.mBitsPerChannel / 8 * inputFormat.mChannelsPerFrame;
     inputFormat.mBytesPerPacket = inputFormat.mBytesPerFrame * inputFormat.mFramesPerPacket;
-    
+
     AudioStreamBasicDescription outputFormat; // 这里开始是输出音频格式
     memset(&outputFormat, 0, sizeof(outputFormat));
-    outputFormat.mSampleRate       = inputFormat.mSampleRate; // 采样率保持一致
-    outputFormat.mFormatID         = kAudioFormatMPEG4AAC;    // AAC编码 kAudioFormatMPEG4AAC kAudioFormatMPEG4AAC_HE_V2
+    outputFormat.mSampleRate = inputFormat.mSampleRate;       // 采样率保持一致
+    outputFormat.mFormatID = kAudioFormatMPEG4AAC;            // AAC编码 kAudioFormatMPEG4AAC kAudioFormatMPEG4AAC_HE_V2
     outputFormat.mChannelsPerFrame = (UInt32)_configuration.numberOfChannels;;
-    outputFormat.mFramesPerPacket  = 1024;                    // AAC一帧是1024个字节
-    
+    outputFormat.mFramesPerPacket = 1024;                     // AAC一帧是1024个字节
+
     const OSType subtype = kAudioFormatMPEG4AAC;
     AudioClassDescription requestedCodecs[2] = {
         {
@@ -108,30 +108,30 @@
         }
     };
     OSStatus result = AudioConverterNewSpecific(&inputFormat, &outputFormat, 2, requestedCodecs, &m_converter);
-    
-    
-    if(result != noErr) return NO;
-    
+
+
+    if (result != noErr) return NO;
+
     return YES;
 }
 
--(AudioClassDescription*)getAudioClassDescriptionWithType:(UInt32)type fromManufacturer:(UInt32)manufacturer { // 获得相应的编码器
+- (AudioClassDescription *)getAudioClassDescriptionWithType:(UInt32)type fromManufacturer:(UInt32)manufacturer { // 获得相应的编码器
     static AudioClassDescription audioDesc;
-    
+
     UInt32 encoderSpecifier = type, size = 0;
     OSStatus status;
-    
+
     memset(&audioDesc, 0, sizeof(audioDesc));
     status = AudioFormatGetPropertyInfo(kAudioFormatProperty_Encoders, sizeof(encoderSpecifier), &encoderSpecifier, &size);
     if (status) {
         return nil;
     }
-    
+
     uint32_t count = size / sizeof(AudioClassDescription);
     AudioClassDescription descs[count];
     AudioFormatGetProperty(kAudioFormatProperty_Encoders, sizeof(encoderSpecifier), &encoderSpecifier, &size, descs);
-    for (uint32_t i = 0; i < count; i++){
-        if ((type == descs[i].mSubType) && (manufacturer == descs[i].mManufacturer)){
+    for (uint32_t i = 0; i < count; i++) {
+        if ((type == descs[i].mSubType) && (manufacturer == descs[i].mManufacturer)) {
             memcpy(&audioDesc, &descs[i], sizeof(audioDesc));
             break;
         }
@@ -140,11 +140,11 @@
 }
 
 #pragma mark -- AudioCallBack
-OSStatus inputDataProc(AudioConverterRef inConverter, UInt32 *ioNumberDataPackets, AudioBufferList *ioData,AudioStreamPacketDescription **outDataPacketDescription, void *inUserData) { //<span style="font-family: Arial, Helvetica, sans-serif;">AudioConverterFillComplexBuffer 编码过程中，会要求这个函数来填充输入数据，也就是原始PCM数据</span>
-    AudioBufferList bufferList = *(AudioBufferList*)inUserData;
+OSStatus inputDataProc(AudioConverterRef inConverter, UInt32 *ioNumberDataPackets, AudioBufferList *ioData, AudioStreamPacketDescription * *outDataPacketDescription, void *inUserData) { //<span style="font-family: Arial, Helvetica, sans-serif;">AudioConverterFillComplexBuffer 编码过程中，会要求这个函数来填充输入数据，也就是原始PCM数据</span>
+    AudioBufferList bufferList = *(AudioBufferList *)inUserData;
     ioData->mBuffers[0].mNumberChannels = 1;
-    ioData->mBuffers[0].mData           = bufferList.mBuffers[0].mData;
-    ioData->mBuffers[0].mDataByteSize   = bufferList.mBuffers[0].mDataByteSize;
+    ioData->mBuffers[0].mData = bufferList.mBuffers[0].mData;
+    ioData->mBuffers[0].mDataByteSize = bufferList.mBuffers[0].mDataByteSize;
     return noErr;
 }
 
@@ -157,7 +157,7 @@ OSStatus inputDataProc(AudioConverterRef inConverter, UInt32 *ioNumberDataPacket
  *  See: http://wiki.multimedia.cx/index.php?title=ADTS
  *  Also: http://wiki.multimedia.cx/index.php?title=MPEG-4_Audio#Channel_Configurations
  **/
-- (NSData*)adtsData:(NSInteger)channel rawDataLength:(NSInteger)rawDataLength {
+- (NSData *)adtsData:(NSInteger)channel rawDataLength:(NSInteger)rawDataLength {
     int adtsLength = 7;
     char *packet = malloc(sizeof(char) * adtsLength);
     // Variables Recycled by addADTStoPacket
@@ -167,8 +167,8 @@ OSStatus inputDataProc(AudioConverterRef inConverter, UInt32 *ioNumberDataPacket
     int chanCfg = (int)channel;  //MPEG-4 Audio Channel Configuration. 1 Channel front-center
     NSUInteger fullLength = adtsLength + rawDataLength;
     // fill in ADTS data
-    packet[0] = (char)0xFF;	// 11111111  	= syncword
-    packet[1] = (char)0xF9;	// 1111 1 00 1  = syncword MPEG-2 Layer CRC
+    packet[0] = (char)0xFF;     // 11111111     = syncword
+    packet[1] = (char)0xF9;     // 1111 1 00 1  = syncword MPEG-2 Layer CRC
     packet[2] = (char)(((profile-1)<<6) + (freqIdx<<2) +(chanCfg>>2));
     packet[3] = (char)(((chanCfg&3)<<6) + (fullLength>>11));
     packet[4] = (char)((fullLength&0x7FF) >> 3);

LFLiveKit/coder/LFHardwareVideoEncoder.m

@@ -19,7 +19,7 @@
 }
 
 @property (nonatomic, strong) LFLiveVideoConfiguration *configuration;
-@property (nonatomic,weak) id<LFVideoEncodingDelegate> h264Delegate;
+@property (nonatomic, weak) id<LFVideoEncodingDelegate> h264Delegate;
 @property (nonatomic) BOOL isBackGround;
 @property (nonatomic) NSInteger currentVideoBitRate;
 
@@ -28,68 +28,67 @@
 @implementation LFHardwareVideoEncoder
 
 #pragma mark -- LifeCycle
-- (instancetype)initWithVideoStreamConfiguration:(LFLiveVideoConfiguration *)configuration{
-    if(self = [super init]){
+- (instancetype)initWithVideoStreamConfiguration:(LFLiveVideoConfiguration *)configuration {
+    if (self = [super init]) {
         _configuration = configuration;
         [self initCompressionSession];
-        
+
 #ifdef DEBUG
         enabledWriteVideoFile = NO;
         [self initForFilePath];
 #endif
-        
+
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterBackground:) name:UIApplicationWillResignActiveNotification object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterForeground:) name:UIApplicationDidBecomeActiveNotification object:nil];
     }
     return self;
 }
 
-- (void)initCompressionSession{
-    if(compressionSession){
+- (void)initCompressionSession {
+    if (compressionSession) {
         VTCompressionSessionCompleteFrames(compressionSession, kCMTimeInvalid);
-        
+
         VTCompressionSessionInvalidate(compressionSession);
         CFRelease(compressionSession);
         compressionSession = NULL;
     }
-    
+
     OSStatus status = VTCompressionSessionCreate(NULL, _configuration.videoSize.width, _configuration.videoSize.height, kCMVideoCodecType_H264, NULL, NULL, NULL, VideoCompressonOutputCallback, (__bridge void *)self, &compressionSession);
-    if(status != noErr){
+    if (status != noErr) {
         return;
     }
-    
+
     _currentVideoBitRate = _configuration.videoBitRate;
-    VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_MaxKeyFrameInterval,(__bridge CFTypeRef)@(_configuration.videoMaxKeyframeInterval));
-    VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_MaxKeyFrameIntervalDuration,(__bridge CFTypeRef)@(_configuration.videoMaxKeyframeInterval));
+    VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_MaxKeyFrameInterval, (__bridge CFTypeRef)@(_configuration.videoMaxKeyframeInterval));
+    VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_MaxKeyFrameIntervalDuration, (__bridge CFTypeRef)@(_configuration.videoMaxKeyframeInterval));
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_ExpectedFrameRate, (__bridge CFTypeRef)@(_configuration.videoFrameRate));
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_AverageBitRate, (__bridge CFTypeRef)@(_configuration.videoBitRate));
-    NSArray *limit = @[@(_configuration.videoBitRate * 1.5/8),@(1)];
+    NSArray *limit = @[@(_configuration.videoBitRate * 1.5/8), @(1)];
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_DataRateLimits, (__bridge CFArrayRef)limit);
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_RealTime, kCFBooleanFalse);
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_ProfileLevel, kVTProfileLevel_H264_Main_AutoLevel);
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_AllowFrameReordering, kCFBooleanFalse);
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_H264EntropyMode, kVTH264EntropyMode_CABAC);
     VTCompressionSessionPrepareToEncodeFrames(compressionSession);
-    
+
 }
 
-- (void)setVideoBitRate:(NSInteger)videoBitRate{
-    if(_isBackGround) return;
+- (void)setVideoBitRate:(NSInteger)videoBitRate {
+    if (_isBackGround) return;
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_AverageBitRate, (__bridge CFTypeRef)@(videoBitRate));
-    NSArray *limit = @[@(videoBitRate * 1.5/8),@(1)];
+    NSArray *limit = @[@(videoBitRate * 1.5/8), @(1)];
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_DataRateLimits, (__bridge CFArrayRef)limit);
     _currentVideoBitRate = videoBitRate;
 }
 
--(NSInteger)videoBitRate{
+- (NSInteger)videoBitRate {
     return _currentVideoBitRate;
 }
 
-- (void)dealloc{
-    if(compressionSession != NULL)
-    {
+- (void)dealloc {
+    if (compressionSession != NULL) {
         VTCompressionSessionCompleteFrames(compressionSession, kCMTimeInvalid);
-        
+
         VTCompressionSessionInvalidate(compressionSession);
         CFRelease(compressionSession);
         compressionSession = NULL;
@@ -98,90 +97,86 @@
 }
 
 #pragma mark -- LFVideoEncoder
-- (void)encodeVideoData:(CVImageBufferRef)pixelBuffer timeStamp:(uint64_t)timeStamp{
-    if(_isBackGround) return;
-    
-    frameCount ++;
+- (void)encodeVideoData:(CVImageBufferRef)pixelBuffer timeStamp:(uint64_t)timeStamp {
+    if (_isBackGround) return;
+
+    frameCount++;
     CMTime presentationTimeStamp = CMTimeMake(frameCount, 1000);
     VTEncodeInfoFlags flags;
     CMTime duration = CMTimeMake(1, (int32_t)_configuration.videoFrameRate);
-    
+
     NSDictionary *properties = nil;
-    if(frameCount % (int32_t)_configuration.videoMaxKeyframeInterval == 0){
+    if (frameCount % (int32_t)_configuration.videoMaxKeyframeInterval == 0) {
         properties = @{(__bridge NSString *)kVTEncodeFrameOptionKey_ForceKeyFrame: @YES};
     }
     NSNumber *timeNumber = @(timeStamp);
-    
+
     VTCompressionSessionEncodeFrame(compressionSession, pixelBuffer, presentationTimeStamp, duration, (__bridge CFDictionaryRef)properties, (__bridge_retained void *)timeNumber, &flags);
 }
 
-- (void)stopEncoder{
+- (void)stopEncoder {
     VTCompressionSessionCompleteFrames(compressionSession, kCMTimeIndefinite);
 }
 
-- (void)setDelegate:(id<LFVideoEncodingDelegate>)delegate{
+- (void)setDelegate:(id<LFVideoEncodingDelegate>)delegate {
     _h264Delegate = delegate;
 }
 
 #pragma mark -- NSNotification
-- (void)willEnterBackground:(NSNotification*)notification{
+- (void)willEnterBackground:(NSNotification *)notification {
     _isBackGround = YES;
 }
 
-- (void)willEnterForeground:(NSNotification*)notification{
+- (void)willEnterForeground:(NSNotification *)notification {
     [self initCompressionSession];
     _isBackGround = NO;
 }
 
 #pragma mark -- VideoCallBack
-static void VideoCompressonOutputCallback(void *VTref, void *VTFrameRef, OSStatus status, VTEncodeInfoFlags infoFlags, CMSampleBufferRef sampleBuffer)
-{
-    if(!sampleBuffer) return;
+static void VideoCompressonOutputCallback(void *VTref, void *VTFrameRef, OSStatus status, VTEncodeInfoFlags infoFlags, CMSampleBufferRef sampleBuffer){
+    if (!sampleBuffer) return;
     CFArrayRef array = CMSampleBufferGetSampleAttachmentsArray(sampleBuffer, true);
-    if(!array) return;
+    if (!array) return;
     CFDictionaryRef dic = (CFDictionaryRef)CFArrayGetValueAtIndex(array, 0);
-    if(!dic) return;
-    
+    if (!dic) return;
+
     BOOL keyframe = !CFDictionaryContainsKey(dic, kCMSampleAttachmentKey_NotSync);
-    uint64_t timeStamp = [((__bridge_transfer NSNumber*)VTFrameRef) longLongValue];
-    
+    uint64_t timeStamp = [((__bridge_transfer NSNumber *)VTFrameRef) longLongValue];
+
     LFHardwareVideoEncoder *videoEncoder = (__bridge LFHardwareVideoEncoder *)VTref;
-    if(status != noErr){
+    if (status != noErr) {
         return;
     }
-    
-    if (keyframe && !videoEncoder->sps)
-    {
+
+    if (keyframe && !videoEncoder->sps) {
         CMFormatDescriptionRef format = CMSampleBufferGetFormatDescription(sampleBuffer);
-        
+
         size_t sparameterSetSize, sparameterSetCount;
         const uint8_t *sparameterSet;
-        OSStatus statusCode = CMVideoFormatDescriptionGetH264ParameterSetAtIndex(format, 0, &sparameterSet, &sparameterSetSize, &sparameterSetCount, 0 );
-        if (statusCode == noErr)
-        {
+        OSStatus statusCode = CMVideoFormatDescriptionGetH264ParameterSetAtIndex(format, 0, &sparameterSet, &sparameterSetSize, &sparameterSetCount, 0);
+        if (statusCode == noErr) {
             size_t pparameterSetSize, pparameterSetCount;
             const uint8_t *pparameterSet;
-            OSStatus statusCode = CMVideoFormatDescriptionGetH264ParameterSetAtIndex(format, 1, &pparameterSet, &pparameterSetSize, &pparameterSetCount, 0 );
-            if (statusCode == noErr)
-            {
+            OSStatus statusCode = CMVideoFormatDescriptionGetH264ParameterSetAtIndex(format, 1, &pparameterSet, &pparameterSetSize, &pparameterSetCount, 0);
+            if (statusCode == noErr) {
                 videoEncoder->sps = [NSData dataWithBytes:sparameterSet length:sparameterSetSize];
                 videoEncoder->pps = [NSData dataWithBytes:pparameterSet length:pparameterSetSize];
-                
-                if(videoEncoder->enabledWriteVideoFile){
+
+                if (videoEncoder->enabledWriteVideoFile) {
                     NSMutableData *data = [[NSMutableData alloc] init];
-                    uint8_t header[] = {0x00,0x00,0x00,0x01};
+                    uint8_t header[] = {0x00, 0x00, 0x00, 0x01};
                     [data appendBytes:header length:4];
                     [data appendData:videoEncoder->sps];
                     [data appendBytes:header length:4];
                     [data appendData:videoEncoder->pps];
-                    fwrite(data.bytes, 1,data.length,videoEncoder->fp);
+                    fwrite(data.bytes, 1, data.length, videoEncoder->fp);
                 }
-                
+
             }
         }
     }
-    
-    
+
+
     CMBlockBufferRef dataBuffer = CMSampleBufferGetDataBuffer(sampleBuffer);
     size_t length, totalLength;
     char *dataPointer;
@@ -193,7 +188,7 @@ static void VideoCompressonOutputCallback(void *VTref, void *VTFrameRef, OSStatu
             // Read the NAL unit length
             uint32_t NALUnitLength = 0;
             memcpy(&NALUnitLength, dataPointer + bufferOffset, AVCCHeaderLength);
-            
+
             NALUnitLength = CFSwapInt32BigToHost(NALUnitLength);
 
             LFVideoFrame *videoFrame = [LFVideoFrame new];
@@ -202,55 +197,52 @@ static void VideoCompressonOutputCallback(void *VTref, void *VTFrameRef, OSStatu
             videoFrame.isKeyFrame = keyframe;
             videoFrame.sps = videoEncoder->sps;
             videoFrame.pps = videoEncoder->pps;
-            
-            if(videoEncoder.h264Delegate && [videoEncoder.h264Delegate respondsToSelector:@selector(videoEncoder:videoFrame:)]){
+
+            if (videoEncoder.h264Delegate && [videoEncoder.h264Delegate respondsToSelector:@selector(videoEncoder:videoFrame:)]) {
                 [videoEncoder.h264Delegate videoEncoder:videoEncoder videoFrame:videoFrame];
             }
-            
-            if(videoEncoder->enabledWriteVideoFile){
+
+            if (videoEncoder->enabledWriteVideoFile) {
                 NSMutableData *data = [[NSMutableData alloc] init];
-                if(keyframe){
-                    uint8_t header[] = {0x00,0x00,0x00,0x01};
+                if (keyframe) {
+                    uint8_t header[] = {0x00, 0x00, 0x00, 0x01};
                     [data appendBytes:header length:4];
-                }else{
-                    uint8_t header[] = {0x00,0x00,0x01};
+                } else {
+                    uint8_t header[] = {0x00, 0x00, 0x01};
                     [data appendBytes:header length:3];
                 }
                 [data appendData:videoFrame.data];
-                
-                fwrite(data.bytes, 1,data.length,videoEncoder->fp);
+
+                fwrite(data.bytes, 1, data.length, videoEncoder->fp);
             }
-            
+
 
             bufferOffset += AVCCHeaderLength + NALUnitLength;
-            
+
         }
-        
+
     }
 }
 
-- (void)initForFilePath
-{
+- (void)initForFilePath {
     char *path = [self GetFilePathByfileName:"IOSCamDemo.h264"];
-    NSLog(@"%s",path);
-    self->fp = fopen(path,"wb");
+    NSLog(@"%s", path);
+    self->fp = fopen(path, "wb");
 }
 
-
-- (char*)GetFilePathByfileName:(char*)filename
-{
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask,YES);
+- (char *)GetFilePathByfileName:(char *)filename {
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
     NSString *documentsDirectory = [paths objectAtIndex:0];
-    NSString *strName = [NSString stringWithFormat:@"%s",filename];
-    
+    NSString *strName = [NSString stringWithFormat:@"%s", filename];
+
     NSString *writablePath = [documentsDirectory stringByAppendingPathComponent:strName];
-    
+
     NSUInteger len = [writablePath length];
-    
-    char *filepath = (char*)malloc(sizeof(char) * (len + 1));
-    
+
+    char *filepath = (char *)malloc(sizeof(char) * (len + 1));
+
     [writablePath getCString:filepath maxLength:len + 1 encoding:[NSString defaultCStringEncoding]];
-    
+
     return filepath;
 }
 

LFLiveKit/coder/LFVideoEncoding.h

@@ -14,7 +14,7 @@
 /// 编码器编码后回调
 @protocol LFVideoEncodingDelegate <NSObject>
 @required
-- (void)videoEncoder:(nullable id<LFVideoEncoding>)encoder videoFrame:(nullable LFVideoFrame*)frame;
+- (void)videoEncoder:(nullable id<LFVideoEncoding>)encoder videoFrame:(nullable LFVideoFrame *)frame;
 @end
 
 /// 编码器抽象的接口
@@ -24,7 +24,7 @@
 - (void)stopEncoder;
 @optional
 @property (nonatomic, assign) NSInteger videoBitRate;
-- (nullable instancetype)initWithVideoStreamConfiguration:(nullable LFLiveVideoConfiguration*)configuration;
+- (nullable instancetype)initWithVideoStreamConfiguration:(nullable LFLiveVideoConfiguration *)configuration;
 - (void)setDelegate:(nullable id<LFVideoEncodingDelegate>)delegate;
 
 @end

LFLiveKit/configuration/LFLiveAudioConfiguration.h

@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 
 /// 音频码率
-typedef NS_ENUM(NSUInteger, LFLiveAudioBitRate) {
+typedef NS_ENUM (NSUInteger, LFLiveAudioBitRate) {
     /// 32Kbps 音频码率
     LFLiveAudioBitRate_32Kbps = 32000,
     /// 64Kbps 音频码率
@@ -23,7 +23,7 @@ typedef NS_ENUM(NSUInteger, LFLiveAudioBitRate) {
 };
 
 /// 采样率 (默认44.1Hz iphoneg6以上48Hz)
-typedef NS_ENUM(NSUInteger, LFLiveAudioSampleRate){
+typedef NS_ENUM (NSUInteger, LFLiveAudioSampleRate){
     /// 44.1Hz 采样率
     LFLiveAudioSampleRate_44100Hz = 44100,
     /// 48Hz 采样率
@@ -33,7 +33,7 @@ typedef NS_ENUM(NSUInteger, LFLiveAudioSampleRate){
 };
 
 ///  Audio Live quality（音频质量）
-typedef NS_ENUM(NSUInteger, LFLiveAudioQuality){
+typedef NS_ENUM (NSUInteger, LFLiveAudioQuality){
     /// 高音频质量 audio sample rate: 44MHz(默认44.1Hz iphoneg6以上48Hz), audio bitrate: 32Kbps
     LFLiveAudioQuality_Low = 0,
     /// 高音频质量 audio sample rate: 44MHz(默认44.1Hz iphoneg6以上48Hz), audio bitrate: 64Kbps
@@ -46,7 +46,7 @@ typedef NS_ENUM(NSUInteger, LFLiveAudioQuality){
     LFLiveAudioQuality_Default = LFLiveAudioQuality_Medium
 };
 
-@interface LFLiveAudioConfiguration : NSObject<NSCoding,NSCopying>
+@interface LFLiveAudioConfiguration : NSObject<NSCoding, NSCopying>
 
 /// 默认音频配置
 + (instancetype)defaultConfiguration;
@@ -64,6 +64,6 @@ typedef NS_ENUM(NSUInteger, LFLiveAudioQuality){
 // 码率
 @property (nonatomic, assign) LFLiveAudioBitRate audioBitrate;
 /// flv编码音频头 44100 为0x12 0x10
-@property (nonatomic ,assign,readonly) char *asc;
+@property (nonatomic, assign, readonly) char *asc;
 
 @end

LFLiveKit/configuration/LFLiveAudioConfiguration.m

@@ -12,119 +12,117 @@
 @implementation LFLiveAudioConfiguration
 
 #pragma mark -- LifyCycle
-+ (instancetype)defaultConfiguration{
++ (instancetype)defaultConfiguration {
     LFLiveAudioConfiguration *audioConfig = [LFLiveAudioConfiguration defaultConfigurationForQuality:LFLiveAudioQuality_Default];
     return audioConfig;
 }
 
-+ (instancetype)defaultConfigurationForQuality:(LFLiveAudioQuality)audioQuality{
++ (instancetype)defaultConfigurationForQuality:(LFLiveAudioQuality)audioQuality {
     LFLiveAudioConfiguration *audioConfig = [LFLiveAudioConfiguration new];
     audioConfig.numberOfChannels = 2;
     switch (audioQuality) {
-        case LFLiveAudioQuality_Default:{
-            audioConfig.audioBitrate = LFLiveAudioBitRate_64Kbps;
-        }
-            break;
-        case LFLiveAudioQuality_Low:{
-            audioConfig.audioBitrate = LFLiveAudioBitRate_32Kbps;
-        }
-        case LFLiveAudioQuality_High:{
-            audioConfig.audioBitrate = LFLiveAudioBitRate_96Kbps;
-        }
-        case LFLiveAudioQuality_VeryHigh:{
-            audioConfig.audioBitrate = LFLiveAudioBitRate_128Kbps;
-        }
-            break;
-        default:
-            break;
+    case LFLiveAudioQuality_Default: {
+        audioConfig.audioBitrate = LFLiveAudioBitRate_64Kbps;
+    }
+    break;
+    case LFLiveAudioQuality_Low: {
+        audioConfig.audioBitrate = LFLiveAudioBitRate_32Kbps;
+    }
+    case LFLiveAudioQuality_High: {
+        audioConfig.audioBitrate = LFLiveAudioBitRate_96Kbps;
+    }
+    case LFLiveAudioQuality_VeryHigh: {
+        audioConfig.audioBitrate = LFLiveAudioBitRate_128Kbps;
+    }
+    break;
+    default:
+        break;
     }
     audioConfig.audioSampleRate = [self.class isNewThaniPhone6] ? LFLiveAudioSampleRate_48000Hz : LFLiveAudioSampleRate_44100Hz;
-    
+
     return audioConfig;
 }
 
-- (instancetype)init{
-    if(self = [super init]){
+- (instancetype)init {
+    if (self = [super init]) {
         _asc = malloc(2);
     }
     return self;
 }
 
-- (void)dealloc{
-    if(_asc) free(_asc);
+- (void)dealloc {
+    if (_asc) free(_asc);
 }
 
 #pragma mark Setter
-- (void)setAudioSampleRate:(LFLiveAudioSampleRate)audioSampleRate{
+- (void)setAudioSampleRate:(LFLiveAudioSampleRate)audioSampleRate {
     _audioSampleRate = audioSampleRate;
     NSInteger sampleRateIndex = [self sampleRateIndex:audioSampleRate];
     self.asc[0] = 0x10 | ((sampleRateIndex>>1) & 0x3);
     self.asc[1] = ((sampleRateIndex & 0x1)<<7) | ((self.numberOfChannels & 0xF) << 3);
 }
 
-- (void)setNumberOfChannels:(NSUInteger)numberOfChannels{
+- (void)setNumberOfChannels:(NSUInteger)numberOfChannels {
     _numberOfChannels = numberOfChannels;
     NSInteger sampleRateIndex = [self sampleRateIndex:self.audioSampleRate];
     self.asc[0] = 0x10 | ((sampleRateIndex>>1) & 0x3);
     self.asc[1] = ((sampleRateIndex & 0x1)<<7) | ((numberOfChannels & 0xF) << 3);
 }
 
-
 #pragma mark -- CustomMethod
-- (NSInteger)sampleRateIndex:(NSInteger)frequencyInHz{
+- (NSInteger)sampleRateIndex:(NSInteger)frequencyInHz {
     NSInteger sampleRateIndex = 0;
-    switch(frequencyInHz) {
-        case 96000:
-            sampleRateIndex = 0;
-            break;
-        case 88200:
-            sampleRateIndex = 1;
-            break;
-        case 64000:
-            sampleRateIndex = 2;
-            break;
-        case 48000:
-            sampleRateIndex = 3;
-            break;
-        case 44100:
-            sampleRateIndex = 4;
-            break;
-        case 32000:
-            sampleRateIndex = 5;
-            break;
-        case 24000:
-            sampleRateIndex = 6;
-            break;
-        case 22050:
-            sampleRateIndex = 7;
-            break;
-        case 16000:
-            sampleRateIndex = 8;
-            break;
-        case 12000:
-            sampleRateIndex = 9;
-            break;
-        case 11025:
-            sampleRateIndex = 10;
-            break;
-        case 8000:
-            sampleRateIndex = 11;
-            break;
-        case 7350:
-            sampleRateIndex = 12;
-            break;
-        default:
-            sampleRateIndex = 15;
+    switch (frequencyInHz) {
+    case 96000:
+        sampleRateIndex = 0;
+        break;
+    case 88200:
+        sampleRateIndex = 1;
+        break;
+    case 64000:
+        sampleRateIndex = 2;
+        break;
+    case 48000:
+        sampleRateIndex = 3;
+        break;
+    case 44100:
+        sampleRateIndex = 4;
+        break;
+    case 32000:
+        sampleRateIndex = 5;
+        break;
+    case 24000:
+        sampleRateIndex = 6;
+        break;
+    case 22050:
+        sampleRateIndex = 7;
+        break;
+    case 16000:
+        sampleRateIndex = 8;
+        break;
+    case 12000:
+        sampleRateIndex = 9;
+        break;
+    case 11025:
+        sampleRateIndex = 10;
+        break;
+    case 8000:
+        sampleRateIndex = 11;
+        break;
+    case 7350:
+        sampleRateIndex = 12;
+        break;
+    default:
+        sampleRateIndex = 15;
     }
     return sampleRateIndex;
 }
 
-
 #pragma mark -- DeviceCategory
-+(NSString*)deviceName{
++ (NSString *)deviceName {
     struct utsname systemInfo;
     uname(&systemInfo);
-    
+
     return [NSString stringWithCString:systemInfo.machine
                               encoding:NSUTF8StringEncoding];
 }
@@ -139,14 +137,14 @@
 //@"iPhone8,1" on iPhone 6S
 //@"iPhone8,2" on iPhone 6S Plus
 
-+(BOOL) isNewThaniPhone6{
++ (BOOL)isNewThaniPhone6 {
     NSString *device = [self deviceName];
     NSLog(@"device %@", device);
     if (device == nil) {
         return NO;
     }
     NSArray *array = [device componentsSeparatedByString:@","];
-    if (array.count <2) {
+    if (array.count < 2) {
         return NO;
     }
     NSString *model = [array objectAtIndex:0];
@@ -159,7 +157,7 @@
             return YES;
         }
     }
-    
+
     if ([model hasPrefix:@"iPad"]) {
         NSString *str1 = [model substringFromIndex:[@"iPad" length]];
         NSUInteger num = [str1 integerValue];
@@ -167,7 +165,7 @@
             return YES;
         }
     }
-    
+
     return NO;
 }
 
@@ -188,7 +186,7 @@
     return self;
 }
 
-- (BOOL)isEqual:(id)other{
+- (BOOL)isEqual:(id)other {
     if (other == self) {
         return YES;
     } else if (![super isEqual:other]) {
@@ -196,9 +194,9 @@
     } else {
         LFLiveAudioConfiguration *object = other;
         return object.numberOfChannels == self.numberOfChannels &&
-        object.audioBitrate == self.audioBitrate &&
-        strcmp(object.asc, self.asc) == 0 &&
-        object.audioSampleRate == self.audioSampleRate;
+               object.audioBitrate == self.audioBitrate &&
+               strcmp(object.asc, self.asc) == 0 &&
+               object.audioSampleRate == self.audioSampleRate;
     }
 }
 
@@ -208,25 +206,25 @@
                         @(_audioSampleRate),
                         [NSString stringWithUTF8String:self.asc],
                         @(_audioBitrate)];
-    
+
     for (NSObject *value in values) {
         hash ^= value.hash;
     }
     return hash;
 }
 
-- (id)copyWithZone:(nullable NSZone *)zone{
+- (id)copyWithZone:(nullable NSZone *)zone {
     LFLiveAudioConfiguration *other = [self.class defaultConfiguration];
     return other;
 }
 
-- (NSString *)description{
+- (NSString *)description {
     NSMutableString *desc = @"".mutableCopy;
-    [desc appendFormat:@"<LFLiveAudioConfiguration: %p>",self];
-    [desc appendFormat:@" numberOfChannels:%zi",self.numberOfChannels];
-    [desc appendFormat:@" audioSampleRate:%zi",self.audioSampleRate];
-    [desc appendFormat:@" audioBitrate:%zi",self.audioBitrate];
-    [desc appendFormat:@" audioHeader:%@",[NSString stringWithUTF8String:self.asc]];
+    [desc appendFormat:@"<LFLiveAudioConfiguration: %p>", self];
+    [desc appendFormat:@" numberOfChannels:%zi", self.numberOfChannels];
+    [desc appendFormat:@" audioSampleRate:%zi", self.audioSampleRate];
+    [desc appendFormat:@" audioBitrate:%zi", self.audioBitrate];
+    [desc appendFormat:@" audioHeader:%@", [NSString stringWithUTF8String:self.asc]];
     return desc;
 }
 

LFLiveKit/configuration/LFLiveVideoConfiguration.h

@@ -10,7 +10,7 @@
 #import <UIKit/UIKit.h>
 
 /// 视频分辨率(都是16：9 当此设备不支持当前分辨率，自动降低一级)
-typedef NS_ENUM(NSUInteger, LFLiveVideoSessionPreset){
+typedef NS_ENUM (NSUInteger, LFLiveVideoSessionPreset){
     /// 低分辨率
     LFCaptureSessionPreset360x640 = 0,
     /// 中分辨率
@@ -20,7 +20,7 @@ typedef NS_ENUM(NSUInteger, LFLiveVideoSessionPreset){
 };
 
 /// 视频质量
-typedef NS_ENUM(NSUInteger, LFLiveVideoQuality){
+typedef NS_ENUM (NSUInteger, LFLiveVideoQuality){
     /// 分辨率： 360 *640 帧数：15 码率：500Kps
     LFLiveVideoQuality_Low1 = 0,
     /// 分辨率： 360 *640 帧数：24 码率：800Kps
@@ -43,15 +43,15 @@ typedef NS_ENUM(NSUInteger, LFLiveVideoQuality){
     LFLiveVideoQuality_Default = LFLiveVideoQuality_Low2
 };
 
-@interface LFLiveVideoConfiguration : NSObject<NSCoding,NSCopying>
+@interface LFLiveVideoConfiguration : NSObject<NSCoding, NSCopying>
 
 /// 默认视频配置
 + (instancetype)defaultConfiguration;
 /// 视频配置(质量)
 + (instancetype)defaultConfigurationForQuality:(LFLiveVideoQuality)videoQuality;
 
-/// 视频配置(质量 & 方向)
-+ (instancetype)defaultConfigurationForQuality:(LFLiveVideoQuality)videoQuality orientation:(UIInterfaceOrientation)orientation;
+/// 视频配置(质量 & 是否是横屏)
++ (instancetype)defaultConfigurationForQuality:(LFLiveVideoQuality)videoQuality landscape:(BOOL)landscape;
 
 #pragma mark - Attribute
 ///=============================================================================
@@ -61,7 +61,7 @@ typedef NS_ENUM(NSUInteger, LFLiveVideoQuality){
 @property (nonatomic, assign) CGSize videoSize;
 
 /// 视频输出方向
-@property (nonatomic, assign) UIInterfaceOrientation orientation;
+@property (nonatomic, assign) BOOL landscape;
 
 /// 视频的帧率，即 fps
 @property (nonatomic, assign) NSUInteger videoFrameRate;
@@ -88,9 +88,9 @@ typedef NS_ENUM(NSUInteger, LFLiveVideoQuality){
 @property (nonatomic, assign) LFLiveVideoSessionPreset sessionPreset;
 
 ///< ≈sde3分辨率
-@property (nonatomic, assign,readonly) NSString *avSessionPreset;
+@property (nonatomic, assign, readonly) NSString *avSessionPreset;
 
 ///< 是否裁剪
-@property (nonatomic, assign,readonly) BOOL isClipVideo;
+@property (nonatomic, assign, readonly) BOOL isClipVideo;
 
 @end

LFLiveKit/configuration/LFLiveVideoConfiguration.m

@@ -12,209 +12,208 @@
 @implementation LFLiveVideoConfiguration
 
 #pragma mark -- LifeCycle
-+ (instancetype)defaultConfiguration{
++ (instancetype)defaultConfiguration {
     LFLiveVideoConfiguration *configuration = [LFLiveVideoConfiguration defaultConfigurationForQuality:LFLiveVideoQuality_Default];
     return configuration;
 }
 
-+ (instancetype)defaultConfigurationForQuality:(LFLiveVideoQuality)videoQuality{
-    LFLiveVideoConfiguration *configuration = [LFLiveVideoConfiguration defaultConfigurationForQuality:videoQuality orientation:UIInterfaceOrientationPortrait];
++ (instancetype)defaultConfigurationForQuality:(LFLiveVideoQuality)videoQuality {
+    LFLiveVideoConfiguration *configuration = [LFLiveVideoConfiguration defaultConfigurationForQuality:videoQuality landscape:NO];
     return configuration;
 }
 
-+ (instancetype)defaultConfigurationForQuality:(LFLiveVideoQuality)videoQuality orientation:(UIInterfaceOrientation)orientation{
++ (instancetype)defaultConfigurationForQuality:(LFLiveVideoQuality)videoQuality landscape:(BOOL)landscape {
     LFLiveVideoConfiguration *configuration = [LFLiveVideoConfiguration new];
     switch (videoQuality) {
-            case LFLiveVideoQuality_Low1:
-        {
-            configuration.sessionPreset = LFCaptureSessionPreset360x640;
-            configuration.videoFrameRate = 15;
-            configuration.videoMaxFrameRate = 15;
-            configuration.videoMinFrameRate = 10;
-            configuration.videoBitRate = 500 * 1000;
-            configuration.videoMaxBitRate = 600 * 1000;
-            configuration.videoMinBitRate = 400 * 1000;
-            configuration.videoSize = CGSizeMake(360, 640);
-        }
-            break;
-            case LFLiveVideoQuality_Low2:
-        {
-            configuration.sessionPreset = LFCaptureSessionPreset360x640;
-            configuration.videoFrameRate = 24;
-            configuration.videoMaxFrameRate = 24;
-            configuration.videoMinFrameRate = 12;
-            configuration.videoBitRate = 600 * 1000;
-            configuration.videoMaxBitRate = 720 * 1000;
-            configuration.videoMinBitRate = 500 * 1000;
-            configuration.videoSize = CGSizeMake(360, 640);
-        }
-            break;
-            case LFLiveVideoQuality_Low3:
-        {
-            configuration.sessionPreset = LFCaptureSessionPreset360x640;
-            configuration.videoFrameRate = 30;
-            configuration.videoMaxFrameRate = 30;
-            configuration.videoMinFrameRate = 15;
-            configuration.videoBitRate = 800 * 1000;
-            configuration.videoMaxBitRate = 960 * 1000;
-            configuration.videoMinBitRate = 600 * 1000;
-            configuration.videoSize = CGSizeMake(360, 640);
-        }
-            break;
-            case LFLiveVideoQuality_Medium1:
-        {
-            configuration.sessionPreset = LFCaptureSessionPreset540x960;
-            configuration.videoFrameRate = 15;
-            configuration.videoMaxFrameRate = 15;
-            configuration.videoMinFrameRate = 10;
-            configuration.videoBitRate = 800 * 1000;
-            configuration.videoMaxBitRate = 960 * 1000;
-            configuration.videoMinBitRate = 500 * 1000;
-            configuration.videoSize = CGSizeMake(540, 960);
-        }
-            break;
-            case LFLiveVideoQuality_Medium2:
-        {
-            configuration.sessionPreset = LFCaptureSessionPreset540x960;
-            configuration.videoFrameRate = 24;
-            configuration.videoMaxFrameRate = 24;
-            configuration.videoMinFrameRate = 12;
-            configuration.videoBitRate = 800 * 1000;
-            configuration.videoMaxBitRate = 960 * 1000;
-            configuration.videoMinBitRate = 500 * 1000;
-            configuration.videoSize = CGSizeMake(540, 960);
-        }
-            break;
-            case LFLiveVideoQuality_Medium3:
-        {
-            configuration.sessionPreset = LFCaptureSessionPreset540x960;
-            configuration.videoFrameRate = 30;
-            configuration.videoMaxFrameRate = 30;
-            configuration.videoMinFrameRate = 15;
-            configuration.videoBitRate = 1000 * 1000;
-            configuration.videoMaxBitRate = 1200 * 1000;
-            configuration.videoMinBitRate = 500 * 1000;
-            configuration.videoSize = CGSizeMake(540, 960);
-        }
-            break;
-            case LFLiveVideoQuality_High1:
-        {
-            configuration.sessionPreset = LFCaptureSessionPreset720x1280;
-            configuration.videoFrameRate = 15;
-            configuration.videoMaxFrameRate = 15;
-            configuration.videoMinFrameRate = 10;
-            configuration.videoBitRate = 1000 * 1000;
-            configuration.videoMaxBitRate = 1200 * 1000;
-            configuration.videoMinBitRate = 500 * 1000;
-            configuration.videoSize = CGSizeMake(720, 1280);
-        }
-            break;
-            case LFLiveVideoQuality_High2:
-        {
-            configuration.sessionPreset = LFCaptureSessionPreset720x1280;
-            configuration.videoFrameRate = 24;
-            configuration.videoMaxFrameRate = 24;
-            configuration.videoMinFrameRate = 12;
-            configuration.videoBitRate = 1200 * 1000;
-            configuration.videoMaxBitRate = 1440 * 1000;
-            configuration.videoMinBitRate = 800 * 1000;
-            configuration.videoSize = CGSizeMake(720, 1280);
-        }
-            break;
-            case LFLiveVideoQuality_High3:
-        {
-            configuration.sessionPreset = LFCaptureSessionPreset720x1280;
-            configuration.videoFrameRate = 30;
-            configuration.videoMaxFrameRate = 30;
-            configuration.videoMinFrameRate = 15;
-            configuration.videoBitRate = 1200 * 1000;
-            configuration.videoMaxBitRate = 1440 * 1000;
-            configuration.videoMinBitRate = 500 * 1000;
-            configuration.videoSize = CGSizeMake(720, 1280);
-        }
-            break;
-        default:
-            break;
+    case LFLiveVideoQuality_Low1:
+    {
+        configuration.sessionPreset = LFCaptureSessionPreset360x640;
+        configuration.videoFrameRate = 15;
+        configuration.videoMaxFrameRate = 15;
+        configuration.videoMinFrameRate = 10;
+        configuration.videoBitRate = 500 * 1000;
+        configuration.videoMaxBitRate = 600 * 1000;
+        configuration.videoMinBitRate = 400 * 1000;
+        configuration.videoSize = CGSizeMake(360, 640);
+    }
+    break;
+    case LFLiveVideoQuality_Low2:
+    {
+        configuration.sessionPreset = LFCaptureSessionPreset360x640;
+        configuration.videoFrameRate = 24;
+        configuration.videoMaxFrameRate = 24;
+        configuration.videoMinFrameRate = 12;
+        configuration.videoBitRate = 600 * 1000;
+        configuration.videoMaxBitRate = 720 * 1000;
+        configuration.videoMinBitRate = 500 * 1000;
+        configuration.videoSize = CGSizeMake(360, 640);
+    }
+    break;
+    case LFLiveVideoQuality_Low3:
+    {
+        configuration.sessionPreset = LFCaptureSessionPreset360x640;
+        configuration.videoFrameRate = 30;
+        configuration.videoMaxFrameRate = 30;
+        configuration.videoMinFrameRate = 15;
+        configuration.videoBitRate = 800 * 1000;
+        configuration.videoMaxBitRate = 960 * 1000;
+        configuration.videoMinBitRate = 600 * 1000;
+        configuration.videoSize = CGSizeMake(360, 640);
+    }
+    break;
+    case LFLiveVideoQuality_Medium1:
+    {
+        configuration.sessionPreset = LFCaptureSessionPreset540x960;
+        configuration.videoFrameRate = 15;
+        configuration.videoMaxFrameRate = 15;
+        configuration.videoMinFrameRate = 10;
+        configuration.videoBitRate = 800 * 1000;
+        configuration.videoMaxBitRate = 960 * 1000;
+        configuration.videoMinBitRate = 500 * 1000;
+        configuration.videoSize = CGSizeMake(540, 960);
+    }
+    break;
+    case LFLiveVideoQuality_Medium2:
+    {
+        configuration.sessionPreset = LFCaptureSessionPreset540x960;
+        configuration.videoFrameRate = 24;
+        configuration.videoMaxFrameRate = 24;
+        configuration.videoMinFrameRate = 12;
+        configuration.videoBitRate = 800 * 1000;
+        configuration.videoMaxBitRate = 960 * 1000;
+        configuration.videoMinBitRate = 500 * 1000;
+        configuration.videoSize = CGSizeMake(540, 960);
+    }
+    break;
+    case LFLiveVideoQuality_Medium3:
+    {
+        configuration.sessionPreset = LFCaptureSessionPreset540x960;
+        configuration.videoFrameRate = 30;
+        configuration.videoMaxFrameRate = 30;
+        configuration.videoMinFrameRate = 15;
+        configuration.videoBitRate = 1000 * 1000;
+        configuration.videoMaxBitRate = 1200 * 1000;
+        configuration.videoMinBitRate = 500 * 1000;
+        configuration.videoSize = CGSizeMake(540, 960);
+    }
+    break;
+    case LFLiveVideoQuality_High1:
+    {
+        configuration.sessionPreset = LFCaptureSessionPreset720x1280;
+        configuration.videoFrameRate = 15;
+        configuration.videoMaxFrameRate = 15;
+        configuration.videoMinFrameRate = 10;
+        configuration.videoBitRate = 1000 * 1000;
+        configuration.videoMaxBitRate = 1200 * 1000;
+        configuration.videoMinBitRate = 500 * 1000;
+        configuration.videoSize = CGSizeMake(720, 1280);
+    }
+    break;
+    case LFLiveVideoQuality_High2:
+    {
+        configuration.sessionPreset = LFCaptureSessionPreset720x1280;
+        configuration.videoFrameRate = 24;
+        configuration.videoMaxFrameRate = 24;
+        configuration.videoMinFrameRate = 12;
+        configuration.videoBitRate = 1200 * 1000;
+        configuration.videoMaxBitRate = 1440 * 1000;
+        configuration.videoMinBitRate = 800 * 1000;
+        configuration.videoSize = CGSizeMake(720, 1280);
+    }
+    break;
+    case LFLiveVideoQuality_High3:
+    {
+        configuration.sessionPreset = LFCaptureSessionPreset720x1280;
+        configuration.videoFrameRate = 30;
+        configuration.videoMaxFrameRate = 30;
+        configuration.videoMinFrameRate = 15;
+        configuration.videoBitRate = 1200 * 1000;
+        configuration.videoMaxBitRate = 1440 * 1000;
+        configuration.videoMinBitRate = 500 * 1000;
+        configuration.videoSize = CGSizeMake(720, 1280);
+    }
+    break;
+    default:
+        break;
     }
     configuration.sessionPreset = [configuration supportSessionPreset:configuration.sessionPreset];
     configuration.videoMaxKeyframeInterval = configuration.videoFrameRate*2;
-    configuration.orientation = orientation;
+    configuration.landscape = landscape;
     CGSize size = configuration.videoSize;
-    if(orientation == UIInterfaceOrientationPortrait || orientation == UIInterfaceOrientationPortraitUpsideDown){
-        configuration.videoSize = CGSizeMake(size.width, size.height);
-    }else{
+    if (landscape) {
         configuration.videoSize = CGSizeMake(size.height, size.width);
+    } else {
+        configuration.videoSize = CGSizeMake(size.width, size.height);
     }
     return configuration;
 }
 
 #pragma mark -- Setter Getter
-- (NSString*)avSessionPreset{
+- (NSString *)avSessionPreset {
     NSString *avSessionPreset = nil;
     switch (self.sessionPreset) {
-            case LFCaptureSessionPreset360x640:
-        {
-            avSessionPreset = AVCaptureSessionPreset640x480;
-        }
-            break;
-            case LFCaptureSessionPreset540x960:
-        {
-            avSessionPreset = AVCaptureSessionPresetiFrame960x540;
-        }
-            break;
-            case LFCaptureSessionPreset720x1280:
-        {
-            avSessionPreset = AVCaptureSessionPreset1280x720;
-        }
-            break;
-        default:{
-            avSessionPreset = AVCaptureSessionPreset640x480;
-        }
-            break;
+    case LFCaptureSessionPreset360x640:
+    {
+        avSessionPreset = AVCaptureSessionPreset640x480;
+    }
+    break;
+    case LFCaptureSessionPreset540x960:
+    {
+        avSessionPreset = AVCaptureSessionPresetiFrame960x540;
+    }
+    break;
+    case LFCaptureSessionPreset720x1280:
+    {
+        avSessionPreset = AVCaptureSessionPreset1280x720;
+    }
+    break;
+    default: {
+        avSessionPreset = AVCaptureSessionPreset640x480;
+    }
+    break;
     }
     return avSessionPreset;
 }
 
-- (void)setVideoMaxBitRate:(NSUInteger)videoMaxBitRate{
-    if(videoMaxBitRate <= _videoBitRate) return;
+- (void)setVideoMaxBitRate:(NSUInteger)videoMaxBitRate {
+    if (videoMaxBitRate <= _videoBitRate) return;
     _videoMaxBitRate = videoMaxBitRate;
 }
 
-- (void)setVideoMinBitRate:(NSUInteger)videoMinBitRate{
-    if(videoMinBitRate >= _videoBitRate) return;
+- (void)setVideoMinBitRate:(NSUInteger)videoMinBitRate {
+    if (videoMinBitRate >= _videoBitRate) return;
     _videoMinBitRate = videoMinBitRate;
 }
 
-- (void)setVideoMaxFrameRate:(NSUInteger)videoMaxFrameRate{
-    if(videoMaxFrameRate <= _videoFrameRate) return;
+- (void)setVideoMaxFrameRate:(NSUInteger)videoMaxFrameRate {
+    if (videoMaxFrameRate <= _videoFrameRate) return;
     _videoMaxFrameRate = videoMaxFrameRate;
 }
 
-- (void)setVideoMinFrameRate:(NSUInteger)videoMinFrameRate{
-    if(videoMinFrameRate >= _videoFrameRate) return;
+- (void)setVideoMinFrameRate:(NSUInteger)videoMinFrameRate {
+    if (videoMinFrameRate >= _videoFrameRate) return;
     _videoMinFrameRate = videoMinFrameRate;
 }
 
-
 #pragma mark -- Custom Method
-- (LFLiveVideoSessionPreset)supportSessionPreset:(LFLiveVideoSessionPreset)sessionPreset{
+- (LFLiveVideoSessionPreset)supportSessionPreset:(LFLiveVideoSessionPreset)sessionPreset {
     NSString *avSessionPreset = [self avSessionPreset];
     AVCaptureSession *session = [[AVCaptureSession alloc] init];
-    
-    if(![session canSetSessionPreset:avSessionPreset]){
-        if(sessionPreset == LFCaptureSessionPreset720x1280){
+
+    if (![session canSetSessionPreset:avSessionPreset]) {
+        if (sessionPreset == LFCaptureSessionPreset720x1280) {
             sessionPreset = LFCaptureSessionPreset540x960;
-            if(![session canSetSessionPreset:avSessionPreset]){
+            if (![session canSetSessionPreset:avSessionPreset]) {
                 sessionPreset = LFCaptureSessionPreset360x640;
             }
-        }else if(sessionPreset == LFCaptureSessionPreset540x960){
+        } else if (sessionPreset == LFCaptureSessionPreset540x960) {
             sessionPreset = LFCaptureSessionPreset360x640;
         }
     }
     return sessionPreset;
 }
 
-- (BOOL)isClipVideo{
+- (BOOL)isClipVideo {
     return self.sessionPreset == LFCaptureSessionPreset360x640 ? YES : NO;
 }
 
@@ -225,7 +224,7 @@
     [aCoder encodeObject:@(self.videoMaxKeyframeInterval) forKey:@"videoMaxKeyframeInterval"];
     [aCoder encodeObject:@(self.videoBitRate) forKey:@"videoBitRate"];
     [aCoder encodeObject:@(self.sessionPreset) forKey:@"sessionPreset"];
-    [aCoder encodeObject:@(self.orientation) forKey:@"orientation"];
+    [aCoder encodeObject:@(self.landscape) forKey:@"landscape"];
 }
 
 - (id)initWithCoder:(NSCoder *)aDecoder {
@@ -235,7 +234,7 @@
     _videoMaxKeyframeInterval = [[aDecoder decodeObjectForKey:@"videoMaxKeyframeInterval"] unsignedIntegerValue];
     _videoBitRate = [[aDecoder decodeObjectForKey:@"videoBitRate"] unsignedIntegerValue];
     _sessionPreset = [[aDecoder decodeObjectForKey:@"sessionPreset"] unsignedIntegerValue];
-    _orientation = [[aDecoder decodeObjectForKey:@"orientation"] unsignedIntegerValue];
+    _landscape = [[aDecoder decodeObjectForKey:@"landscape"] unsignedIntegerValue];
     return self;
 }
 
@@ -252,57 +251,56 @@
                         @(self.isClipVideo),
                         self.avSessionPreset,
                         @(self.sessionPreset),
-                        @(self.orientation),];
-    
+                        @(self.landscape), ];
+
     for (NSObject *value in values) {
         hash ^= value.hash;
     }
     return hash;
 }
 
-- (BOOL)isEqual:(id)other
-{
+- (BOOL)isEqual:(id)other {
     if (other == self) {
         return YES;
     } else if (![super isEqual:other]) {
         return NO;
     } else {
         LFLiveVideoConfiguration *object = other;
-        return CGSizeEqualToSize(object.videoSize, self.videoSize)  &&
-        object.videoFrameRate == self.videoFrameRate &&
-        object.videoMaxFrameRate == self.videoMaxFrameRate &&
-        object.videoMinFrameRate == self.videoMinFrameRate &&
-        object.videoMaxKeyframeInterval == self.videoMaxKeyframeInterval &&
-        object.videoBitRate == self.videoBitRate &&
-        object.videoMaxBitRate == self.videoMaxBitRate &&
-        object.videoMinBitRate == self.videoMinBitRate &&
-        object.isClipVideo == self.isClipVideo &&
-        [object.avSessionPreset isEqualToString:self.avSessionPreset] &&
-        object.sessionPreset == self.sessionPreset &&
-        object.orientation == self.orientation;
+        return CGSizeEqualToSize(object.videoSize, self.videoSize) &&
+               object.videoFrameRate == self.videoFrameRate &&
+               object.videoMaxFrameRate == self.videoMaxFrameRate &&
+               object.videoMinFrameRate == self.videoMinFrameRate &&
+               object.videoMaxKeyframeInterval == self.videoMaxKeyframeInterval &&
+               object.videoBitRate == self.videoBitRate &&
+               object.videoMaxBitRate == self.videoMaxBitRate &&
+               object.videoMinBitRate == self.videoMinBitRate &&
+               object.isClipVideo == self.isClipVideo &&
+               [object.avSessionPreset isEqualToString:self.avSessionPreset] &&
+               object.sessionPreset == self.sessionPreset &&
+               object.landscape == self.landscape;
     }
 }
 
-- (id)copyWithZone:(nullable NSZone *)zone{
+- (id)copyWithZone:(nullable NSZone *)zone {
     LFLiveVideoConfiguration *other = [self.class defaultConfiguration];
     return other;
 }
 
-- (NSString *)description{
+- (NSString *)description {
     NSMutableString *desc = @"".mutableCopy;
-    [desc appendFormat:@"<LFLiveVideoConfiguration: %p>",self];
-    [desc appendFormat:@" videoSize:%@",NSStringFromCGSize(self.videoSize)];
-    [desc appendFormat:@" videoFrameRate:%zi",self.videoFrameRate];
-    [desc appendFormat:@" videoMaxFrameRate:%zi",self.videoMaxFrameRate];
-    [desc appendFormat:@" videoMinFrameRate:%zi",self.videoMinFrameRate];
-    [desc appendFormat:@" videoMaxKeyframeInterval:%zi",self.videoMaxKeyframeInterval];
-    [desc appendFormat:@" videoBitRate:%zi",self.videoBitRate];
-    [desc appendFormat:@" videoMaxBitRate:%zi",self.videoMaxBitRate];
-    [desc appendFormat:@" videoMinBitRate:%zi",self.videoMinBitRate];
-    [desc appendFormat:@" isClipVideo:%zi",self.isClipVideo];
-    [desc appendFormat:@" avSessionPreset:%@",self.avSessionPreset];
-    [desc appendFormat:@" sessionPreset:%zi",self.sessionPreset];
-    [desc appendFormat:@" orientation:%zi",self.orientation];
+    [desc appendFormat:@"<LFLiveVideoConfiguration: %p>", self];
+    [desc appendFormat:@" videoSize:%@", NSStringFromCGSize(self.videoSize)];
+    [desc appendFormat:@" videoFrameRate:%zi", self.videoFrameRate];
+    [desc appendFormat:@" videoMaxFrameRate:%zi", self.videoMaxFrameRate];
+    [desc appendFormat:@" videoMinFrameRate:%zi", self.videoMinFrameRate];
+    [desc appendFormat:@" videoMaxKeyframeInterval:%zi", self.videoMaxKeyframeInterval];
+    [desc appendFormat:@" videoBitRate:%zi", self.videoBitRate];
+    [desc appendFormat:@" videoMaxBitRate:%zi", self.videoMaxBitRate];
+    [desc appendFormat:@" videoMinBitRate:%zi", self.videoMinBitRate];
+    [desc appendFormat:@" isClipVideo:%zi", self.isClipVideo];
+    [desc appendFormat:@" avSessionPreset:%@", self.avSessionPreset];
+    [desc appendFormat:@" sessionPreset:%zi", self.sessionPreset];
+    [desc appendFormat:@" landscape:%zi", self.landscape];
     return desc;
 }
 

LFLiveKit/filter/LFGPUImageBeautyFilter.m

@@ -2,237 +2,233 @@
 
 #if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
 NSString *const kLFGPUImageBeautyFragmentShaderString = SHADER_STRING
-(
- varying highp vec2 textureCoordinate;
- 
- uniform sampler2D inputImageTexture;
- 
- uniform highp vec2 singleStepOffset;
- uniform highp vec4 params;
- uniform highp float brightness;
- 
- const highp vec3 W = vec3(0.299,0.587,0.114);
- const highp mat3 saturateMatrix = mat3(
-                                  1.1102,-0.0598,-0.061,
-                                  -0.0774,1.0826,-0.1186,
-                                  -0.0228,-0.0228,1.1772);
- highp vec2 blurCoordinates[24];
- 
- highp float hardLight(highp float color) {
-    if(color <= 0.5)
+                                                        (
+    varying highp vec2 textureCoordinate;
+
+    uniform sampler2D inputImageTexture;
+
+    uniform highp vec2 singleStepOffset;
+    uniform highp vec4 params;
+    uniform highp float brightness;
+
+    const highp vec3 W = vec3(0.299, 0.587, 0.114);
+    const highp mat3 saturateMatrix = mat3(
+        1.1102, -0.0598, -0.061,
+        -0.0774, 1.0826, -0.1186,
+        -0.0228, -0.0228, 1.1772);
+    highp vec2 blurCoordinates[24];
+
+    highp float hardLight(highp float color) {
+    if (color <= 0.5)
         color = color * color * 2.0;
     else
         color = 1.0 - ((1.0 - color)*(1.0 - color) * 2.0);
     return color;
 }
- 
- void main()
- {
-     highp vec3 centralColor = texture2D(inputImageTexture, textureCoordinate).rgb;
-     blurCoordinates[0] = textureCoordinate.xy + singleStepOffset * vec2(0.0, -10.0);
-     blurCoordinates[1] = textureCoordinate.xy + singleStepOffset * vec2(0.0, 10.0);
-     blurCoordinates[2] = textureCoordinate.xy + singleStepOffset * vec2(-10.0, 0.0);
-     blurCoordinates[3] = textureCoordinate.xy + singleStepOffset * vec2(10.0, 0.0);
-     blurCoordinates[4] = textureCoordinate.xy + singleStepOffset * vec2(5.0, -8.0);
-     blurCoordinates[5] = textureCoordinate.xy + singleStepOffset * vec2(5.0, 8.0);
-     blurCoordinates[6] = textureCoordinate.xy + singleStepOffset * vec2(-5.0, 8.0);
-     blurCoordinates[7] = textureCoordinate.xy + singleStepOffset * vec2(-5.0, -8.0);
-     blurCoordinates[8] = textureCoordinate.xy + singleStepOffset * vec2(8.0, -5.0);
-     blurCoordinates[9] = textureCoordinate.xy + singleStepOffset * vec2(8.0, 5.0);
-     blurCoordinates[10] = textureCoordinate.xy + singleStepOffset * vec2(-8.0, 5.0);
-     blurCoordinates[11] = textureCoordinate.xy + singleStepOffset * vec2(-8.0, -5.0);
-     blurCoordinates[12] = textureCoordinate.xy + singleStepOffset * vec2(0.0, -6.0);
-     blurCoordinates[13] = textureCoordinate.xy + singleStepOffset * vec2(0.0, 6.0);
-     blurCoordinates[14] = textureCoordinate.xy + singleStepOffset * vec2(6.0, 0.0);
-     blurCoordinates[15] = textureCoordinate.xy + singleStepOffset * vec2(-6.0, 0.0);
-     blurCoordinates[16] = textureCoordinate.xy + singleStepOffset * vec2(-4.0, -4.0);
-     blurCoordinates[17] = textureCoordinate.xy + singleStepOffset * vec2(-4.0, 4.0);
-     blurCoordinates[18] = textureCoordinate.xy + singleStepOffset * vec2(4.0, -4.0);
-     blurCoordinates[19] = textureCoordinate.xy + singleStepOffset * vec2(4.0, 4.0);
-     blurCoordinates[20] = textureCoordinate.xy + singleStepOffset * vec2(-2.0, -2.0);
-     blurCoordinates[21] = textureCoordinate.xy + singleStepOffset * vec2(-2.0, 2.0);
-     blurCoordinates[22] = textureCoordinate.xy + singleStepOffset * vec2(2.0, -2.0);
-     blurCoordinates[23] = textureCoordinate.xy + singleStepOffset * vec2(2.0, 2.0);
-     
-     highp float sampleColor = centralColor.g * 22.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[0]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[1]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[2]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[3]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[4]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[5]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[6]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[7]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[8]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[9]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[10]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[11]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[12]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[13]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[14]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[15]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[16]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[17]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[18]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[19]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[20]).g * 3.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[21]).g * 3.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[22]).g * 3.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[23]).g * 3.0;
-     
-     sampleColor = sampleColor / 62.0;
-     
-     highp float highPass = centralColor.g - sampleColor + 0.5;
-     
-     for(int i = 0; i < 5;i++)
-     {
-         highPass = hardLight(highPass);
-     }
-     highp float lumance = dot(centralColor, W);
-     
-     highp float alpha = pow(lumance, params.r);
-     
-     highp vec3 smoothColor = centralColor + (centralColor-vec3(highPass))*alpha*0.1;
-     
-     smoothColor.r = clamp(pow(smoothColor.r, params.g),0.0,1.0);
-     smoothColor.g = clamp(pow(smoothColor.g, params.g),0.0,1.0);
-     smoothColor.b = clamp(pow(smoothColor.b, params.g),0.0,1.0);
-     
-     highp vec3 lvse = vec3(1.0)-(vec3(1.0)-smoothColor)*(vec3(1.0)-centralColor);
-     highp vec3 bianliang = max(smoothColor, centralColor);
-     highp vec3 rouguang = 2.0*centralColor*smoothColor + centralColor*centralColor - 2.0*centralColor*centralColor*smoothColor;
-     
-     gl_FragColor = vec4(mix(centralColor, lvse, alpha), 1.0);
-     gl_FragColor.rgb = mix(gl_FragColor.rgb, bianliang, alpha);
-     gl_FragColor.rgb = mix(gl_FragColor.rgb, rouguang, params.b);
-     
-     highp vec3 satcolor = gl_FragColor.rgb * saturateMatrix;
-     gl_FragColor.rgb = mix(gl_FragColor.rgb, satcolor, params.a);
-     gl_FragColor.rgb = vec3(gl_FragColor.rgb + vec3(brightness));
- }
-);                                                                    
+
+    void main(){
+    highp vec3 centralColor = texture2D(inputImageTexture, textureCoordinate).rgb;
+    blurCoordinates[0] = textureCoordinate.xy + singleStepOffset * vec2(0.0, -10.0);
+    blurCoordinates[1] = textureCoordinate.xy + singleStepOffset * vec2(0.0, 10.0);
+    blurCoordinates[2] = textureCoordinate.xy + singleStepOffset * vec2(-10.0, 0.0);
+    blurCoordinates[3] = textureCoordinate.xy + singleStepOffset * vec2(10.0, 0.0);
+    blurCoordinates[4] = textureCoordinate.xy + singleStepOffset * vec2(5.0, -8.0);
+    blurCoordinates[5] = textureCoordinate.xy + singleStepOffset * vec2(5.0, 8.0);
+    blurCoordinates[6] = textureCoordinate.xy + singleStepOffset * vec2(-5.0, 8.0);
+    blurCoordinates[7] = textureCoordinate.xy + singleStepOffset * vec2(-5.0, -8.0);
+    blurCoordinates[8] = textureCoordinate.xy + singleStepOffset * vec2(8.0, -5.0);
+    blurCoordinates[9] = textureCoordinate.xy + singleStepOffset * vec2(8.0, 5.0);
+    blurCoordinates[10] = textureCoordinate.xy + singleStepOffset * vec2(-8.0, 5.0);
+    blurCoordinates[11] = textureCoordinate.xy + singleStepOffset * vec2(-8.0, -5.0);
+    blurCoordinates[12] = textureCoordinate.xy + singleStepOffset * vec2(0.0, -6.0);
+    blurCoordinates[13] = textureCoordinate.xy + singleStepOffset * vec2(0.0, 6.0);
+    blurCoordinates[14] = textureCoordinate.xy + singleStepOffset * vec2(6.0, 0.0);
+    blurCoordinates[15] = textureCoordinate.xy + singleStepOffset * vec2(-6.0, 0.0);
+    blurCoordinates[16] = textureCoordinate.xy + singleStepOffset * vec2(-4.0, -4.0);
+    blurCoordinates[17] = textureCoordinate.xy + singleStepOffset * vec2(-4.0, 4.0);
+    blurCoordinates[18] = textureCoordinate.xy + singleStepOffset * vec2(4.0, -4.0);
+    blurCoordinates[19] = textureCoordinate.xy + singleStepOffset * vec2(4.0, 4.0);
+    blurCoordinates[20] = textureCoordinate.xy + singleStepOffset * vec2(-2.0, -2.0);
+    blurCoordinates[21] = textureCoordinate.xy + singleStepOffset * vec2(-2.0, 2.0);
+    blurCoordinates[22] = textureCoordinate.xy + singleStepOffset * vec2(2.0, -2.0);
+    blurCoordinates[23] = textureCoordinate.xy + singleStepOffset * vec2(2.0, 2.0);
+
+    highp float sampleColor = centralColor.g * 22.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[0]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[1]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[2]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[3]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[4]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[5]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[6]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[7]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[8]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[9]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[10]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[11]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[12]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[13]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[14]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[15]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[16]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[17]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[18]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[19]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[20]).g * 3.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[21]).g * 3.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[22]).g * 3.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[23]).g * 3.0;
+
+    sampleColor = sampleColor / 62.0;
+
+    highp float highPass = centralColor.g - sampleColor + 0.5;
+
+    for (int i = 0; i < 5; i++) {
+        highPass = hardLight(highPass);
+    }
+    highp float lumance = dot(centralColor, W);
+
+    highp float alpha = pow(lumance, params.r);
+
+    highp vec3 smoothColor = centralColor + (centralColor-vec3(highPass))*alpha*0.1;
+
+    smoothColor.r = clamp(pow(smoothColor.r, params.g), 0.0, 1.0);
+    smoothColor.g = clamp(pow(smoothColor.g, params.g), 0.0, 1.0);
+    smoothColor.b = clamp(pow(smoothColor.b, params.g), 0.0, 1.0);
+
+    highp vec3 lvse = vec3(1.0)-(vec3(1.0)-smoothColor)*(vec3(1.0)-centralColor);
+    highp vec3 bianliang = max(smoothColor, centralColor);
+    highp vec3 rouguang = 2.0*centralColor*smoothColor + centralColor*centralColor - 2.0*centralColor*centralColor*smoothColor;
+
+    gl_FragColor = vec4(mix(centralColor, lvse, alpha), 1.0);
+    gl_FragColor.rgb = mix(gl_FragColor.rgb, bianliang, alpha);
+    gl_FragColor.rgb = mix(gl_FragColor.rgb, rouguang, params.b);
+
+    highp vec3 satcolor = gl_FragColor.rgb * saturateMatrix;
+    gl_FragColor.rgb = mix(gl_FragColor.rgb, satcolor, params.a);
+    gl_FragColor.rgb = vec3(gl_FragColor.rgb + vec3(brightness));
+}
+
+                                                        );
 #else
 NSString *const kLFGPUImageBeautyFragmentShaderString = SHADER_STRING
-(
- varying vec2 textureCoordinate;
- 
- uniform sampler2D inputImageTexture;
- 
- uniform mediump vec2 singleStepOffset;
- uniform mediump vec4 params;
- uniform mediump float brightness;
- const mediump mat3 saturateMatrix = mat3(
-                                  1.1102,-0.0598,-0.061,
-                                  -0.0774,1.0826,-0.1186,
-                                  -0.0228,-0.0228,1.1772);
- const mediump vec3 W = vec3(0.299,0.587,0.114);
- mediump vec2 blurCoordinates[24];
- 
- mediump float hardLight(mediump float color)
-{
-    if(color <= 0.5)
+                                                        (
+    varying vec2 textureCoordinate;
+
+    uniform sampler2D inputImageTexture;
+
+    uniform mediump vec2 singleStepOffset;
+    uniform mediump vec4 params;
+    uniform mediump float brightness;
+    const mediump mat3 saturateMatrix = mat3(
+        1.1102, -0.0598, -0.061,
+        -0.0774, 1.0826, -0.1186,
+        -0.0228, -0.0228, 1.1772);
+    const mediump vec3 W = vec3(0.299, 0.587, 0.114);
+    mediump vec2 blurCoordinates[24];
+
+    mediump float hardLight(mediump float color){
+    if (color <= 0.5)
         color = color * color * 2.0;
     else
         color = 1.0 - ((1.0 - color)*(1.0 - color) * 2.0);
     return color;
 }
- 
- void main()
- {
-     mediump vec3 centralColor = texture2D(inputImageTexture, textureCoordinate).rgb;
-     blurCoordinates[0] = textureCoordinate.xy + singleStepOffset * vec2(0.0, -10.0);
-     blurCoordinates[1] = textureCoordinate.xy + singleStepOffset * vec2(0.0, 10.0);
-     blurCoordinates[2] = textureCoordinate.xy + singleStepOffset * vec2(-10.0, 0.0);
-     blurCoordinates[3] = textureCoordinate.xy + singleStepOffset * vec2(10.0, 0.0);
-     blurCoordinates[4] = textureCoordinate.xy + singleStepOffset * vec2(5.0, -8.0);
-     blurCoordinates[5] = textureCoordinate.xy + singleStepOffset * vec2(5.0, 8.0);
-     blurCoordinates[6] = textureCoordinate.xy + singleStepOffset * vec2(-5.0, 8.0);
-     blurCoordinates[7] = textureCoordinate.xy + singleStepOffset * vec2(-5.0, -8.0);
-     blurCoordinates[8] = textureCoordinate.xy + singleStepOffset * vec2(8.0, -5.0);
-     blurCoordinates[9] = textureCoordinate.xy + singleStepOffset * vec2(8.0, 5.0);
-     blurCoordinates[10] = textureCoordinate.xy + singleStepOffset * vec2(-8.0, 5.0);
-     blurCoordinates[11] = textureCoordinate.xy + singleStepOffset * vec2(-8.0, -5.0);
-     blurCoordinates[12] = textureCoordinate.xy + singleStepOffset * vec2(0.0, -6.0);
-     blurCoordinates[13] = textureCoordinate.xy + singleStepOffset * vec2(0.0, 6.0);
-     blurCoordinates[14] = textureCoordinate.xy + singleStepOffset * vec2(6.0, 0.0);
-     blurCoordinates[15] = textureCoordinate.xy + singleStepOffset * vec2(-6.0, 0.0);
-     blurCoordinates[16] = textureCoordinate.xy + singleStepOffset * vec2(-4.0, -4.0);
-     blurCoordinates[17] = textureCoordinate.xy + singleStepOffset * vec2(-4.0, 4.0);
-     blurCoordinates[18] = textureCoordinate.xy + singleStepOffset * vec2(4.0, -4.0);
-     blurCoordinates[19] = textureCoordinate.xy + singleStepOffset * vec2(4.0, 4.0);
-     blurCoordinates[20] = textureCoordinate.xy + singleStepOffset * vec2(-2.0, -2.0);
-     blurCoordinates[21] = textureCoordinate.xy + singleStepOffset * vec2(-2.0, 2.0);
-     blurCoordinates[22] = textureCoordinate.xy + singleStepOffset * vec2(2.0, -2.0);
-     blurCoordinates[23] = textureCoordinate.xy + singleStepOffset * vec2(2.0, 2.0);
-     
-     mediump float sampleColor = centralColor.g * 22.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[0]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[1]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[2]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[3]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[4]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[5]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[6]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[7]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[8]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[9]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[10]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[11]).g;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[12]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[13]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[14]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[15]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[16]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[17]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[18]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[19]).g * 2.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[20]).g * 3.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[21]).g * 3.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[22]).g * 3.0;
-     sampleColor += texture2D(inputImageTexture, blurCoordinates[23]).g * 3.0;
-     
-     sampleColor = sampleColor / 62.0;
-     
-     mediump float highPass = centralColor.g - sampleColor + 0.5;
-     
-     for(int i = 0; i < 5;i++)
-     {
-         highPass = hardLight(highPass);
-     }
-     mediump float luminance = dot(centralColor, W);
-     
-     mediump float alpha = pow(luminance, params);
-     
-     mediump vec3 smoothColor = centralColor + (centralColor-vec3(highPass))*alpha*0.1;
-     
-     smoothColor.r = clamp(pow(smoothColor.r, params.g),0.0,1.0);
-     smoothColor.g = clamp(pow(smoothColor.g, params.g),0.0,1.0);
-     smoothColor.b = clamp(pow(smoothColor.b, params.g),0.0,1.0);
-     
-     mediump vec3 lvse = vec3(1.0)-(vec3(1.0)-smoothColor)*(vec3(1.0)-centralColor);
-     mediump vec3 bianliang = max(smoothColor, centralColor);
-     mediump vec3 rouguang = 2.0*centralColor*smoothColor + centralColor*centralColor - 2.0*centralColor*centralColor*smoothColor;
-     
-     gl_FragColor = vec4(mix(centralColor, lvse, alpha), 1.0);
-     gl_FragColor.rgb = mix(gl_FragColor.rgb, bianliang, alpha);
-     gl_FragColor.rgb = mix(gl_FragColor.rgb, rouguang, params.b);
-     
-     mediump vec3 satcolor = gl_FragColor.rgb * saturateMatrix;
-     gl_FragColor.rgb = mix(gl_FragColor.rgb, satcolor, params.a);
-     gl_FragColor.rgb = vec3(gl_FragColor.rgb + vec3(brightness));
- }
-);
+
+    void main(){
+    mediump vec3 centralColor = texture2D(inputImageTexture, textureCoordinate).rgb;
+    blurCoordinates[0] = textureCoordinate.xy + singleStepOffset * vec2(0.0, -10.0);
+    blurCoordinates[1] = textureCoordinate.xy + singleStepOffset * vec2(0.0, 10.0);
+    blurCoordinates[2] = textureCoordinate.xy + singleStepOffset * vec2(-10.0, 0.0);
+    blurCoordinates[3] = textureCoordinate.xy + singleStepOffset * vec2(10.0, 0.0);
+    blurCoordinates[4] = textureCoordinate.xy + singleStepOffset * vec2(5.0, -8.0);
+    blurCoordinates[5] = textureCoordinate.xy + singleStepOffset * vec2(5.0, 8.0);
+    blurCoordinates[6] = textureCoordinate.xy + singleStepOffset * vec2(-5.0, 8.0);
+    blurCoordinates[7] = textureCoordinate.xy + singleStepOffset * vec2(-5.0, -8.0);
+    blurCoordinates[8] = textureCoordinate.xy + singleStepOffset * vec2(8.0, -5.0);
+    blurCoordinates[9] = textureCoordinate.xy + singleStepOffset * vec2(8.0, 5.0);
+    blurCoordinates[10] = textureCoordinate.xy + singleStepOffset * vec2(-8.0, 5.0);
+    blurCoordinates[11] = textureCoordinate.xy + singleStepOffset * vec2(-8.0, -5.0);
+    blurCoordinates[12] = textureCoordinate.xy + singleStepOffset * vec2(0.0, -6.0);
+    blurCoordinates[13] = textureCoordinate.xy + singleStepOffset * vec2(0.0, 6.0);
+    blurCoordinates[14] = textureCoordinate.xy + singleStepOffset * vec2(6.0, 0.0);
+    blurCoordinates[15] = textureCoordinate.xy + singleStepOffset * vec2(-6.0, 0.0);
+    blurCoordinates[16] = textureCoordinate.xy + singleStepOffset * vec2(-4.0, -4.0);
+    blurCoordinates[17] = textureCoordinate.xy + singleStepOffset * vec2(-4.0, 4.0);
+    blurCoordinates[18] = textureCoordinate.xy + singleStepOffset * vec2(4.0, -4.0);
+    blurCoordinates[19] = textureCoordinate.xy + singleStepOffset * vec2(4.0, 4.0);
+    blurCoordinates[20] = textureCoordinate.xy + singleStepOffset * vec2(-2.0, -2.0);
+    blurCoordinates[21] = textureCoordinate.xy + singleStepOffset * vec2(-2.0, 2.0);
+    blurCoordinates[22] = textureCoordinate.xy + singleStepOffset * vec2(2.0, -2.0);
+    blurCoordinates[23] = textureCoordinate.xy + singleStepOffset * vec2(2.0, 2.0);
+
+    mediump float sampleColor = centralColor.g * 22.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[0]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[1]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[2]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[3]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[4]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[5]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[6]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[7]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[8]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[9]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[10]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[11]).g;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[12]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[13]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[14]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[15]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[16]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[17]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[18]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[19]).g * 2.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[20]).g * 3.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[21]).g * 3.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[22]).g * 3.0;
+    sampleColor += texture2D(inputImageTexture, blurCoordinates[23]).g * 3.0;
+
+    sampleColor = sampleColor / 62.0;
+
+    mediump float highPass = centralColor.g - sampleColor + 0.5;
+
+    for (int i = 0; i < 5; i++) {
+        highPass = hardLight(highPass);
+    }
+    mediump float luminance = dot(centralColor, W);
+
+    mediump float alpha = pow(luminance, params);
+
+    mediump vec3 smoothColor = centralColor + (centralColor-vec3(highPass))*alpha*0.1;
+
+    smoothColor.r = clamp(pow(smoothColor.r, params.g), 0.0, 1.0);
+    smoothColor.g = clamp(pow(smoothColor.g, params.g), 0.0, 1.0);
+    smoothColor.b = clamp(pow(smoothColor.b, params.g), 0.0, 1.0);
+
+    mediump vec3 lvse = vec3(1.0)-(vec3(1.0)-smoothColor)*(vec3(1.0)-centralColor);
+    mediump vec3 bianliang = max(smoothColor, centralColor);
+    mediump vec3 rouguang = 2.0*centralColor*smoothColor + centralColor*centralColor - 2.0*centralColor*centralColor*smoothColor;
+
+    gl_FragColor = vec4(mix(centralColor, lvse, alpha), 1.0);
+    gl_FragColor.rgb = mix(gl_FragColor.rgb, bianliang, alpha);
+    gl_FragColor.rgb = mix(gl_FragColor.rgb, rouguang, params.b);
+
+    mediump vec3 satcolor = gl_FragColor.rgb * saturateMatrix;
+    gl_FragColor.rgb = mix(gl_FragColor.rgb, satcolor, params.a);
+    gl_FragColor.rgb = vec3(gl_FragColor.rgb + vec3(brightness));
+}
+
+                                                        );
 #endif
 
 @implementation LFGPUImageBeautyFilter
 
 - (id)init;
 {
-    if (!(self = [super initWithFragmentShaderFromString:kLFGPUImageBeautyFragmentShaderString]))
-    {
-		return nil;
+    if (!(self = [super initWithFragmentShaderFromString:kLFGPUImageBeautyFragmentShaderString])) {
+        return nil;
     }
-    
+
     _toneLevel = 0.5;
     _beautyLevel = 0.5;
     _brightLevel = 0.5;
@@ -241,27 +237,24 @@ NSString *const kLFGPUImageBeautyFragmentShaderString = SHADER_STRING
     return self;
 }
 
-- (void)setInputSize:(CGSize)newSize atIndex:(NSInteger)textureIndex
-{
+- (void)setInputSize:(CGSize)newSize atIndex:(NSInteger)textureIndex {
     CGSize oldInputSize = inputTextureSize;
     [super setInputSize:newSize atIndex:textureIndex];
     inputTextureSize = newSize;
-    
+
     CGPoint offset = CGPointMake(2.0f / inputTextureSize.width, 2.0 / inputTextureSize.height);
     [self setPoint:offset forUniformName:@"singleStepOffset"];
 }
 
-- (void)setBeautyLevel:(CGFloat)beautyLevel
-{
+- (void)setBeautyLevel:(CGFloat)beautyLevel {
     _beautyLevel = beautyLevel;
     [self setParams:_beautyLevel tone:_toneLevel];
 }
 
-- (void)setBrightLevel:(CGFloat)brightLevel
-{
+- (void)setBrightLevel:(CGFloat)brightLevel {
     _brightLevel = brightLevel;
     [self setFloat:0.6 * (-0.5 + brightLevel) forUniformName:@"brightness"];
-    }
+}
 
 - (void)setParams:(CGFloat)beauty tone:(CGFloat)tone {
     GPUVector4 fBeautyParam;

LFLiveKit/filter/LFGPUImageEmptyFilter.m

@@ -2,43 +2,42 @@
 
 #if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
 NSString *const kLFGPUImageEmptyFragmentShaderString = SHADER_STRING
-(
- varying highp vec2 textureCoordinate;
- 
- uniform sampler2D inputImageTexture;
- 
- void main()
- {
+                                                       (
+    varying highp vec2 textureCoordinate;
+
+    uniform sampler2D inputImageTexture;
+
+    void main(){
     lowp vec4 textureColor = texture2D(inputImageTexture, textureCoordinate);
-    
+
     gl_FragColor = vec4((textureColor.rgb), textureColor.w);
- }
-);                                                                    
+}
+
+                                                       );
 #else
 NSString *const kGPUImageInvertFragmentShaderString = SHADER_STRING
-(
- varying vec2 textureCoordinate;
- 
- uniform sampler2D inputImageTexture;
- 
- void main()
- {
-     vec4 textureColor = texture2D(inputImageTexture, textureCoordinate);
-     
-     gl_FragColor = vec4((textureColor.rgb), textureColor.w);
- }
- );
+                                                      (
+    varying vec2 textureCoordinate;
+
+    uniform sampler2D inputImageTexture;
+
+    void main(){
+    vec4 textureColor = texture2D(inputImageTexture, textureCoordinate);
+
+    gl_FragColor = vec4((textureColor.rgb), textureColor.w);
+}
+
+                                                      );
 #endif
 
 @implementation LFGPUImageEmptyFilter
 
 - (id)init;
 {
-    if (!(self = [super initWithFragmentShaderFromString:kLFGPUImageEmptyFragmentShaderString]))
-    {
-		return nil;
+    if (!(self = [super initWithFragmentShaderFromString:kLFGPUImageEmptyFragmentShaderString])) {
+        return nil;
     }
-    
+
     return self;
 }
 

LFLiveKit/objects/LFLiveDebug.h

@@ -16,11 +16,15 @@
 @property (nonatomic, assign) CGSize videoSize;                         ///< 上传的分辨率
 @property (nonatomic, assign) BOOL isRtmp;                              ///< 上传方式（TCP or RTMP）
 
+@property (nonatomic, assign) CGFloat elapsedMilli;                     ///< 距离上次统计的时间 单位ms
 @property (nonatomic, assign) CGFloat timeStamp;                        ///< 当前的时间戳，从而计算1s内数据
 @property (nonatomic, assign) CGFloat dataFlow;                         ///< 总流量
 @property (nonatomic, assign) CGFloat bandwidth;                        ///< 1s内总带宽
 @property (nonatomic, assign) CGFloat currentBandwidth;                 ///< 上次的带宽
 
+@property (nonatomic, assign) NSInteger dropFrame;                      ///< 丢掉的帧数
+@property (nonatomic, assign) NSInteger totalFrame;                     ///< 总帧数
+
 @property (nonatomic, assign) NSInteger capturedAudioCount;             ///< 1s内音频捕获个数
 @property (nonatomic, assign) NSInteger capturedVideoCount;             ///< 1s内视频捕获个数
 @property (nonatomic, assign) NSInteger currentCapturedAudioCount;      ///< 上次的音频捕获个数

LFLiveKit/objects/LFLiveStreamInfo.h

@@ -11,7 +11,7 @@
 #import "LFLiveVideoConfiguration.h"
 
 /// 流状态
-typedef NS_ENUM(NSUInteger, LFLiveState){
+typedef NS_ENUM (NSUInteger, LFLiveState){
     /// 准备
     LFLiveReady = 0,
     /// 连接中
@@ -24,12 +24,12 @@ typedef NS_ENUM(NSUInteger, LFLiveState){
     LFLiveError = 4
 };
 
-typedef NS_ENUM(NSUInteger,LFLiveSocketErrorCode) {
-    LFLiveSocketError_PreView               = 201,///< 预览失败
-    LFLiveSocketError_GetStreamInfo         = 202,///< 获取流媒体信息失败
-    LFLiveSocketError_ConnectSocket         = 203,///< 连接socket失败
-    LFLiveSocketError_Verification          = 204,///< 验证服务器失败
-    LFLiveSocketError_ReConnectTimeOut      = 205///< 重新连接服务器超时
+typedef NS_ENUM (NSUInteger, LFLiveSocketErrorCode) {
+    LFLiveSocketError_PreView = 201,              ///< 预览失败
+    LFLiveSocketError_GetStreamInfo = 202,        ///< 获取流媒体信息失败
+    LFLiveSocketError_ConnectSocket = 203,        ///< 连接socket失败
+    LFLiveSocketError_Verification = 204,         ///< 验证服务器失败
+    LFLiveSocketError_ReConnectTimeOut = 205      ///< 重新连接服务器超时
 };
 
 @interface LFLiveStreamInfo : NSObject

LFLiveKit/packet/LFFlvPackage.h

@@ -1,20 +0,0 @@
-//
-//  LFFlvPackage.h
-//  LFLiveKit
-//
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
-//
-
-#import "LFStreamPackage.h"
-
-@interface LFFlvPackage : NSObject<LFStreamPackage>
-
-#pragma mark - Initializer
-///=============================================================================
-/// @name Initializer
-///=============================================================================
-- (nullable instancetype)init UNAVAILABLE_ATTRIBUTE;
-+ (nullable instancetype)new UNAVAILABLE_ATTRIBUTE;
-
-@end

LFLiveKit/packet/LFFlvPackage.m

@@ -1,345 +0,0 @@
-//
-//  LFFlvPackage.m
-//  LFLiveKit
-//
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
-//
-
-#import "LFFlvPackage.h"
-#include "flv/flv.h"
-#include "flv/info.h"
-
-#define kTagLength (4)
-#define kAVCPacketHeaderSize  (5)
-static const byte kAudioDataHeader = 0xAF;
-#define swap_uint32_ htonl
-
-@interface LFFlvPackage (){
-    dispatch_semaphore_t _lock;
-    NSData *_sps;
-    NSData *_pps;
-    NSData *_spec;
-    CGSize _videoSize;
-    FILE *fp;
-    BOOL enabledWriteVideoFile;
-    BOOL enabledWriteFlvHeaderVideoFile;
-}
-
-@end
-
-@implementation LFFlvPackage
-
-- (instancetype)initWithVideoSize:(CGSize)videoSize{
-    if(CGSizeEqualToSize(videoSize, CGSizeZero)) @throw [NSException exceptionWithName:@"LFFlvPackage init error" reason:@"video size is zero" userInfo:nil];
-    if(self = [super init]){
-        _videoSize = videoSize;
-        _lock = dispatch_semaphore_create(1);
-#ifdef DEBUG
-        enabledWriteVideoFile = NO;
-        [self initForFilePath];
-#endif
-    }
-    return self;
-}
-
-- (void)dealloc{
-    
-}
-
-#pragma mark -- LFStreamPackage Delegate
-- (NSData*)aaCPacket:(LFAudioFrame*)audioFrame{
-    NSMutableData *result = [[NSMutableData alloc] init];
-    
-    dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER);
-    
-    if(!_spec){
-        _spec = audioFrame.audioInfo;
-    }
-    
-    if(!_sps || !_pps){
-        dispatch_semaphore_signal(_lock);
-        return nil;
-    }
-    
-    // write audio data
-    uint32 kAACPacketSize = 2;
-    
-    NSInteger buffer_size = kAACPacketSize + audioFrame.data.length + FLV_TAG_SIZE;
-    NSInteger packet_size = buffer_size + kTagLength;
-    
-    [result appendData:[[self class] flvTagHeader:FLV_TAG_TYPE_AUDIO size:(int32_t)audioFrame.data.length + kAACPacketSize timeStamp:(uint32)audioFrame.timestamp]];
-    
-    byte format[2] = { kAudioDataHeader, 0x01};
-    [result appendBytes:format length:sizeof(format)];
-    [result appendData:audioFrame.data];
-    
-    uint32 pre_size = swap_uint32_(packet_size-4);
-    [result appendBytes:&pre_size length:sizeof(uint32)];
-    
-    audioFrame.header = [[self class] flvHeads:_videoSize.width videoHeight:_videoSize.height sps:_sps pps:_pps audioHeader:_spec];
-    if(enabledWriteVideoFile){
-        if(!enabledWriteFlvHeaderVideoFile){
-            enabledWriteFlvHeaderVideoFile = YES;
-            fwrite(audioFrame.header.bytes, 1,audioFrame.header.length,self->fp);
-        }
-    }
-    
-    if(enabledWriteVideoFile) {
-        fwrite(result.bytes, 1, result.length,self->fp);
-    }
-    
-    dispatch_semaphore_signal(_lock);
-    return result;
-}
-
-- (NSData*)h264Packet:(LFVideoFrame*)videoFrame{
-    NSMutableData *result = [[NSMutableData alloc] init];
-    
-    dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER);
-    
-    if(!_sps || !_pps){
-        _sps = videoFrame.sps;
-        _pps = videoFrame.pps;
-    }
-    
-    if(!_spec){
-        dispatch_semaphore_signal(_lock);
-        return nil;
-    }
-    
-    videoFrame.header = [[self class] flvHeads:_videoSize.width videoHeight:_videoSize.height sps:_sps pps:_pps audioHeader:_spec];
-    if(enabledWriteVideoFile){
-        if(!enabledWriteFlvHeaderVideoFile){
-            enabledWriteFlvHeaderVideoFile = YES;
-            fwrite(videoFrame.header.bytes, 1,videoFrame.header.length,self->fp);
-        }
-    }
-    
-    // write video data
-    //   Size + buffer size(4 bytes)
-    uint32 kAVCPacketSize = kAVCPacketHeaderSize + 4;
-    
-    size_t buffer_size = kAVCPacketSize + videoFrame.data.length + FLV_TAG_SIZE;
-    size_t packet_size = buffer_size + kTagLength;
-    
-    [result appendData:[[self class] flvTagHeader:FLV_TAG_TYPE_VIDEO size:(int32_t)videoFrame.data.length + kAVCPacketSize  timeStamp:(uint32)videoFrame.timestamp]];
-    [result appendData:[[self class] h264PacketHeader:videoFrame.isKeyFrame nalu:true]];
-    
-    // write length
-    size_t size = videoFrame.data.length;
-    byte length[4] = { 0x00, 0x00, 0x00, 0x00 };
-    length[0]  = (size >> 24) & 0xff;
-    length[1]  = (size >> 16) & 0xff;
-    length[2]  = (size >>  8) & 0xff;
-    length[3]  = (size >>  0) & 0xff;
-    [result appendBytes:length length:sizeof(length)];
-    
-    // write tag data
-    [result appendData:videoFrame.data];
-    
-    uint32 pre_size = swap_uint32_(packet_size-4);
-    [result appendBytes:&pre_size length:sizeof(uint32)];
-    
-    if(enabledWriteVideoFile) {
-        fwrite(result.bytes, 1, result.length,self->fp);
-    }
-    
-    dispatch_semaphore_signal(_lock);
-    return  result;
-}
-
-#pragma mark -- FLV
-int stream_buffer_write_offset = 0;
-static size_t stream_buffer_write(const void * in_buffer, size_t size, void * user_data) {
-    memcpy(user_data+stream_buffer_write_offset, in_buffer, size);
-    stream_buffer_write_offset += size;
-    return size;
-}
-
-+ (NSData*)flvHeader{
-    NSMutableData *result = [[NSMutableData alloc] init];
-    // 写入 flv header信息 /*<464c5601 05000000 09000000 00>*/
-    flv_header header = { };
-    uint32_be offset = swap_uint32_(FLV_HEADER_SIZE);
-    byte extend[kTagLength] = { 0x00, 0x00, 0x00, 0x00 };
-    
-    [result appendBytes:FLV_SIGNATURE length:sizeof(header.signature)];
-    uint8 version[] = {FLV_VERSION};
-    [result appendBytes:&version length:1];
-    uint8 flag[] = {FLV_FLAG_VIDEO | FLV_FLAG_AUDIO};
-    [result appendBytes:&flag length:1];
-    [result appendBytes:&offset length:sizeof(uint32_be)];
-    [result appendBytes:extend length:kTagLength];
-    
-    return result;
-}
-
-+ (NSData*)flvTagHeader:(uint8)type size:(uint32)size timeStamp:(uint32)timeStamp{
-    flv_tag tag;
-    tag.type          =  type;
-    tag.body_length   =  uint32_to_uint24_be(size);
-    flv_tag_set_timestamp(&tag, timeStamp);
-    tag.stream_id     =  uint32_to_uint24_be(0);
-    
-    return [NSData dataWithBytes:&tag length:FLV_TAG_SIZE];
-}
-
-+ (NSData*)h264PacketHeader:(BOOL)keyFrame nalu:(BOOL)nalu{
-    byte header[kAVCPacketHeaderSize] = { 0x00, 0x00, 0x00, 0x00, 0x00 };
-    header[0]  = (keyFrame ? 0x10 : 0x20) | 0x07;
-    header[1]  = nalu ? 0x01 : 0x00;    // 1: AVC NALU  0: AVC sequence header
-    // 后三个字节为Composition time,在AVC中无用
-    return [NSData dataWithBytes:header length:sizeof(header)];
-}
-
-+ (NSData*)metaData:(NSInteger)width height:(NSInteger)height{
-    NSMutableData *result = [[NSMutableData alloc] init];
-    
-    flv_metadata meta;
-    meta.on_metadata_name = amf_str("onMetaData");
-    meta.on_metadata = amf_associative_array_new();
-    amf_associative_array_add(meta.on_metadata, "width",
-                              amf_number_new(width));
-    amf_associative_array_add(meta.on_metadata, "height",
-                              amf_number_new(height));
-    amf_associative_array_add(meta.on_metadata, "videocodecid",
-                              amf_number_new((number64)FLV_VIDEO_TAG_CODEC_AVC));
-    //usage = base::IntToString(params_.audio_sample_rate);
-    //amf_associative_array_add(meta.on_metadata, "audiosamplerate",
-    //	amf_str(usage.c_str()));
-    //usage = base::IntToString(params_.audio_sample_size);
-    //amf_associative_array_add(meta.on_metadata, "audiosamplesize",
-    //	amf_str(usage.c_str()));
-    amf_associative_array_add(meta.on_metadata, "stereo", amf_boolean_new(1)); // 对AAC格式: 总为 1
-    amf_associative_array_add(meta.on_metadata, "audiocodecid",
-                              amf_number_new((number64)FLV_AUDIO_TAG_SOUND_FORMAT_AAC));
-    // create the onMetaData tag
-    uint32 on_metadata_name_size = (uint32)amf_data_size(meta.on_metadata_name);
-    uint32 on_metadata_size = (uint32)amf_data_size(meta.on_metadata);
-    uint32 meta_size = on_metadata_name_size + on_metadata_size;
-
-    size_t buffer_size = meta_size + FLV_TAG_SIZE;
-    size_t packet_size = true ? buffer_size + kTagLength : buffer_size;
-    [result appendData:[[self class] flvTagHeader:FLV_TAG_TYPE_META size:meta_size timeStamp:0]];
-    
-    byte metaName[1024] = {0};
-    byte metaData[1024] = {0};
-    
-    stream_buffer_write_offset = 0;
-    size_t metanamelen = amf_data_write(meta.on_metadata_name, stream_buffer_write, metaName);
-    
-    stream_buffer_write_offset = 0;
-    size_t metalen = amf_data_write(meta.on_metadata, stream_buffer_write, metaData);
-    
-    amf_data_free(meta.on_metadata_name);
-    amf_data_free(meta.on_metadata);
-    
-    [result appendBytes:metaName length:metanamelen];
-    [result appendBytes:metaData length:metalen];
-    uint32 pre_size = swap_uint32_(packet_size-4);//为解决第一个pretagsize多了4个而减去4
-    [result appendBytes:&pre_size length:sizeof(uint32)];
-    
-    return result;
-}
-
-+ (NSData*)flvTagWithVideoHeader:(NSData*)sps pps:(NSData*)pps{
-    NSMutableData *result = [[NSMutableData alloc] init];
-    // 封装AVC sequence header
-    const size_t kExtendSize = 11;
-    size_t buffer_size = sps.length + pps.length + kExtendSize;
-    
-    // AVCPacket header size
-    size_t body_size = kAVCPacketHeaderSize + buffer_size;
-    size_t packet_size = body_size + FLV_TAG_SIZE;
-    // AVCDecoderConfigurationRecord
-    [result appendData:[[self class] flvTagHeader:FLV_TAG_TYPE_VIDEO size:(UInt32)body_size timeStamp:0]];
-    [result appendData:[[self class] h264PacketHeader:YES nalu:NO]];
-    
-    uint8 configuration1[] = {0x01};
-    [result appendBytes:&configuration1 length:1];
-    [result appendBytes:&sps.bytes[1] length:1];
-    [result appendBytes:&sps.bytes[2] length:1];
-    [result appendBytes:&sps.bytes[3] length:1];
-    uint8 configuration2[] = {0xff};
-    [result appendBytes:&configuration2 length:1];
-    
-    // sps
-    uint8 sps1[] = {0xe1};
-    [result appendBytes:&sps1 length:1];
-    uint8 sps2[] = {(sps.length >> 8) & 0xff};
-    [result appendBytes:&sps2 length:1];
-    uint8 sps3[] = {sps.length & 0xff};
-    [result appendBytes:&sps3 length:1];
-    [result appendBytes:sps.bytes length:sps.length];
-    
-    
-    // pps
-    uint8 pps1[] = {0x01};
-    [result appendBytes:&pps1 length:1];
-    uint8 pps2[] = {(pps.length >> 8) & 0xff};
-    [result appendBytes:&pps2 length:1];
-    uint8 pps3[] = {pps.length & 0xff};
-    [result appendBytes:&pps3 length:1];
-    [result appendBytes:pps.bytes length:pps.length];
-    
-    uint32 pre_size = swap_uint32_(packet_size);
-    [result appendBytes:&pre_size length:sizeof(uint32)];
-
-    return result;
-}
-
-+ (NSData*)flvTagWithAudioHeader:(NSData*)audioInfo timeStamp:(uint32)timeStamp{
-    NSMutableData *result = [[NSMutableData alloc] init];
-    const size_t kAACPacketHeaderSize = 2;
-    
-    size_t body_size = kAACPacketHeaderSize + audioInfo.length;
-    size_t packet_size = body_size + FLV_TAG_SIZE;
-
-    [result appendData:[[self class] flvTagHeader:FLV_TAG_TYPE_AUDIO size:(UInt32)body_size timeStamp:timeStamp]];
-    
-    byte format[kAACPacketHeaderSize] = { kAudioDataHeader, 0x01};
-    format[1] = 0x00;
-    [result appendBytes:format length:sizeof(format)];
-    [result appendBytes:audioInfo.bytes length:audioInfo.length];
-    
-    uint32 pre_size = swap_uint32_(packet_size);
-    [result appendBytes:&pre_size length:sizeof(uint32)];
-    
-    return result;
-}
-
-+ (NSData*)flvHeads:(NSInteger)videoWidth videoHeight:(NSInteger)videoHeight sps:(NSData*)sps pps:(NSData*)pps audioHeader:(NSData*)audioHeader{
-    NSMutableData *result = [[NSMutableData alloc] init];
-    // 写FLV头
-    [result appendData:[[self class] flvHeader]];
-    // 写 Meta 相关信息
-    [result appendData:[[self class] metaData:videoWidth height:videoHeight]];
-    // 写音频编码头信息
-    [result appendData:[[self class] flvTagWithAudioHeader:audioHeader timeStamp:0]];
-    // 写视频编码头信息
-    [result appendData:[[self class] flvTagWithVideoHeader:sps pps:pps]];
-    
-    return result;
-}
-
-
-#pragma mark -- Debug.. store video to local
-- (void)initForFilePath{
-    NSString *path = [self GetFilePathByfileName:"flv_publish_x1.flv"];
-    [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
-    self->fp = fopen([path cStringUsingEncoding:NSUTF8StringEncoding],"wb");
-}
-
-- (NSString*)GetFilePathByfileName:(char*)filename{
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask,YES);
-    NSString *documentsDirectory = [paths objectAtIndex:0];
-    NSString *strName = [NSString stringWithFormat:@"%s",filename];
-    
-    NSString *writablePath = [documentsDirectory stringByAppendingPathComponent:strName];
-    
-    
-    return writablePath;
-}
-
-@end

LFLiveKit/packet/LFStreamPackage.h

@@ -1,21 +0,0 @@
-//
-//  LFStreamPackage.h
-//  LFLiveKit
-//
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import "LFAudioFrame.h"
-#import "LFVideoFrame.h"
-
-/// 编码器抽象的接口
-@protocol LFStreamPackage <NSObject>
-@required
-- (nullable instancetype)initWithVideoSize:(CGSize)videoSize;
-- (nullable NSData*)aaCPacket:(nullable LFAudioFrame*)audioFrame;
-- (nullable NSData*)h264Packet:(nullable LFVideoFrame*)videoFrame;
-@end
-

LFLiveKit/packet/flv/amf.h

@@ -1,231 +0,0 @@
-/*
-    $Id: amf.h 231 2011-06-27 13:46:19Z marc.noirot $
-
-    FLV Metadata updater
-
-    Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
-
-    This file is part of FLVMeta.
-
-    FLVMeta is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    FLVMeta is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with FLVMeta; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-#ifndef __AMF_H__
-#define __AMF_H__
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-
-#include "types.h"
-
-/* AMF data types */
-#define AMF_TYPE_NUMBER             ((byte)0x00)
-#define AMF_TYPE_BOOLEAN	        ((byte)0x01)
-#define AMF_TYPE_STRING	            ((byte)0x02)
-#define AMF_TYPE_OBJECT	            ((byte)0x03)
-#define AMF_TYPE_NULL               ((byte)0x05)
-#define AMF_TYPE_UNDEFINED	        ((byte)0x06)
-/* #define AMF_TYPE_REFERENCE	    ((byte)0x07) */
-#define AMF_TYPE_ASSOCIATIVE_ARRAY	((byte)0x08)
-#define AMF_TYPE_END                ((byte)0x09)
-#define AMF_TYPE_ARRAY	            ((byte)0x0A)
-#define AMF_TYPE_DATE	            ((byte)0x0B)
-/* #define AMF_TYPE_SIMPLEOBJECT	((byte)0x0D) */
-#define AMF_TYPE_XML	            ((byte)0x0F)
-#define AMF_TYPE_CLASS	            ((byte)0x10)
-
-/* AMF error codes */
-#define AMF_ERROR_OK                ((byte)0x00)
-#define AMF_ERROR_EOF               ((byte)0x01)
-#define AMF_ERROR_UNKNOWN_TYPE      ((byte)0x02)
-#define AMF_ERROR_END_TAG           ((byte)0x03)
-#define AMF_ERROR_NULL_POINTER      ((byte)0x04)
-#define AMF_ERROR_MEMORY            ((byte)0x05)
-#define AMF_ERROR_UNSUPPORTED_TYPE  ((byte)0x06)
-
-typedef struct __amf_node * p_amf_node;
-
-/* string type */
-typedef struct __amf_string {
-    uint16 size;
-    byte * mbstr;
-} amf_string;
-
-/* array type */
-typedef struct __amf_list {
-    uint32 size;
-    p_amf_node first_element;
-    p_amf_node last_element;
-} amf_list;
-
-/* date type */
-typedef struct __amf_date {
-    number64 milliseconds;
-    sint16 timezone;
-} amf_date;
-
-/* XML string type */
-typedef struct __amf_xmlstring {
-    uint32 size;
-    byte * mbstr;
-} amf_xmlstring;
-
-/* class type */
-typedef struct __amf_class {
-    amf_string name;
-    amf_list elements;
-} amf_class;
-
-/* structure encapsulating the various AMF objects */
-typedef struct __amf_data {
-    byte type;
-    byte error_code;
-    union {
-        number64 number_data;
-        uint8 boolean_data;
-        amf_string string_data;
-        amf_list list_data;
-        amf_date date_data;
-        amf_xmlstring xmlstring_data;
-        amf_class class_data;
-    };
-} amf_data;
-
-/* node used in lists, relies on amf_data */
-typedef struct __amf_node {
-    amf_data * data;
-    p_amf_node prev;
-    p_amf_node next;
-} amf_node;
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Pluggable backend support */
-typedef size_t (*amf_read_proc)(void * out_buffer, size_t size, void * user_data);
-typedef size_t (*amf_write_proc)(const void * in_buffer, size_t size, void * user_data);
-
-/* read AMF data */
-amf_data * amf_data_read(amf_read_proc read_proc, void * user_data);
-
-/* write AMF data */
-size_t amf_data_write(const amf_data * data, amf_write_proc write_proc, void * user_data);
-
-/* generic functions */
-
-/* allocate an AMF data object */
-amf_data * amf_data_new(byte type);
-/* load AMF data from buffer */
-amf_data * amf_data_buffer_read(byte * buffer, size_t maxbytes);
-/* load AMF data from stream */
-amf_data * amf_data_file_read(FILE * stream);
-/* AMF data size */
-size_t     amf_data_size(const amf_data * data);
-/* write encoded AMF data into a buffer */
-size_t     amf_data_buffer_write(amf_data * data, byte * buffer, size_t maxbytes);
-/* write encoded AMF data into a stream */
-size_t     amf_data_file_write(const amf_data * data, FILE * stream);
-/* get the type of AMF data */
-byte       amf_data_get_type(const amf_data * data);
-/* get the error code of AMF data */
-byte       amf_data_get_error_code(const amf_data * data);
-/* return a new copy of AMF data */
-amf_data * amf_data_clone(const amf_data * data);
-/* release the memory of AMF data */
-void       amf_data_free(amf_data * data);
-/* dump AMF data into a stream as text */
-void       amf_data_dump(FILE * stream, const amf_data * data, int indent_level);
-
-/* return a null AMF object with the specified error code attached to it */
-amf_data * amf_data_error(byte error_code);
-
-/* number functions */
-amf_data * amf_number_new(number64 value);
-amf_data * amf_number_double(double value);
-number64   amf_number_get_value(const amf_data * data);
-void       amf_number_set_value(amf_data * data, number64 value);
-
-/* boolean functions */
-amf_data * amf_boolean_new(uint8 value);
-uint8      amf_boolean_get_value(const amf_data * data);
-void       amf_boolean_set_value(amf_data * data, uint8 value);
-
-/* string functions */
-amf_data * amf_string_new(byte * str, uint16 size);
-amf_data * amf_str(const char * str);
-uint16     amf_string_get_size(const amf_data * data);
-byte *     amf_string_get_bytes(const amf_data * data);
-
-/* object functions */
-amf_data * amf_object_new(void);
-uint32     amf_object_size(const amf_data * data);
-amf_data * amf_object_add(amf_data * data, const char * name, amf_data * element);
-amf_data * amf_object_get(const amf_data * data, const char * name);
-amf_data * amf_object_set(amf_data * data, const char * name, amf_data * element);
-amf_data * amf_object_delete(amf_data * data, const char * name);
-amf_node * amf_object_first(const amf_data * data);
-amf_node * amf_object_last(const amf_data * data);
-amf_node * amf_object_next(amf_node * node);
-amf_node * amf_object_prev(amf_node * node);
-amf_data * amf_object_get_name(amf_node * node);
-amf_data * amf_object_get_data(amf_node * node);
-
-/* null functions */
-#define amf_null_new() amf_data_new(AMF_TYPE_NULL)
-
-/* undefined functions */
-#define amf_undefined_new() amf_data_new(AMF_TYPE_UNDEFINED)
-
-/* associative array functions */
-amf_data * amf_associative_array_new(void);
-#define amf_associative_array_size(d)       amf_object_size(d)
-#define amf_associative_array_add(d, n, e)  amf_object_add(d, n, e)
-#define amf_associative_array_get(d, n)     amf_object_get(d, n)
-#define amf_associative_array_set(d, n, e)  amf_object_set(d, n, e)
-#define amf_associative_array_delete(d, n)  amf_object_delete(d, n)
-#define amf_associative_array_first(d)      amf_object_first(d)
-#define amf_associative_array_last(d)       amf_object_last(d)
-#define amf_associative_array_next(n)       amf_object_next(n)
-#define amf_associative_array_prev(n)       amf_object_prev(n)
-#define amf_associative_array_get_name(n)   amf_object_get_name(n)
-#define amf_associative_array_get_data(n)   amf_object_get_data(n)
-
-/* array functions */
-amf_data * amf_array_new(void);
-uint32     amf_array_size(const amf_data * data);
-amf_data * amf_array_push(amf_data * data, amf_data * element);
-amf_data * amf_array_pop(amf_data * data);
-amf_node * amf_array_first(const amf_data * data);
-amf_node * amf_array_last(const amf_data * data);
-amf_node * amf_array_next(amf_node * node);
-amf_node * amf_array_prev(amf_node * node);
-amf_data * amf_array_get(amf_node * node);
-amf_data * amf_array_get_at(const amf_data * data, uint32 n);
-amf_data * amf_array_delete(amf_data * data, amf_node * node);
-amf_data * amf_array_insert_before(amf_data * data, amf_node * node, amf_data * element);
-amf_data * amf_array_insert_after(amf_data * data, amf_node * node, amf_data * element);
-
-/* date functions */
-amf_data * amf_date_new(number64 milliseconds, sint16 timezone);
-number64   amf_date_get_milliseconds(const amf_data * data);
-sint16     amf_date_get_timezone(const amf_data * data);
-time_t     amf_date_to_time_t(const amf_data * data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __AMF_H__ */

LFLiveKit/packet/flv/avc.c

@@ -1,298 +0,0 @@
-/*
-    $Id: avc.c 231 2011-06-27 13:46:19Z marc.noirot $
-
-    FLV Metadata updater
-
-    Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
-
-    This file is part of FLVMeta.
-
-    FLVMeta is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    FLVMeta is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with FLVMeta; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-#include <stdlib.h>
-
-#include "avc.h"
-
-/**
-    bit buffer handling
-*/
-typedef struct __bit_buffer {
-    byte * start;
-    size_t size;
-    byte * current;
-    uint8 read_bits;
-} bit_buffer;
-
-static void skip_bits(bit_buffer * bb, size_t nbits) {
-    bb->current = bb->current + ((nbits + bb->read_bits) / 8);
-    bb->read_bits = (uint8)((bb->read_bits + nbits) % 8);
-}
-
-static uint8 get_bit(bit_buffer * bb) {
-    uint8 ret;
-    ret = (*(bb->current) >> (7 - bb->read_bits)) & 0x1;
-    if (bb->read_bits == 7) {
-        bb->read_bits = 0;
-        bb->current++;
-    }
-    else {
-        bb->read_bits++;
-    }
-    return ret;
-}
-
-static uint32 get_bits(bit_buffer * bb, size_t nbits) {
-    uint32 i, ret;
-    ret = 0;
-    for (i = 0; i < nbits; i++) {
-        ret = (ret << 1) + get_bit(bb);
-    }
-    return ret;
-}
-
-static uint32 exp_golomb_ue(bit_buffer * bb) {
-    uint8 bit, significant_bits;
-    significant_bits = 0;
-    bit = get_bit(bb);
-    while (bit == 0) {
-        significant_bits++;
-        bit = get_bit(bb);
-    }
-    return (1 << significant_bits) + get_bits(bb, significant_bits) - 1;
-}
-
-static sint32 exp_golomb_se(bit_buffer * bb) {
-    sint32 ret;
-    ret = exp_golomb_ue(bb);
-    if ((ret & 0x1) == 0) {
-        return -(ret >> 1);
-    }
-    else {
-        return (ret + 1) >> 1;
-    }
-}
-
-/* AVC type definitions */
-
-#define AVC_SEQUENCE_HEADER 0
-#define AVC_NALU            1
-#define AVC_END_OF_SEQUENCE 2
-
-typedef struct __AVCDecoderConfigurationRecord {
-    uint8 configurationVersion;
-    uint8 AVCProfileIndication;
-    uint8 profile_compatibility;
-    uint8 AVCLevelIndication;
-    uint8 lengthSizeMinusOne;
-    uint8 numOfSequenceParameterSets;
-} AVCDecoderConfigurationRecord;
-
-int read_avc_decoder_configuration_record(flv_stream * f, AVCDecoderConfigurationRecord * adcr) {
-    if (flv_read_tag_body(f, &adcr->configurationVersion, 1) == 1
-    && flv_read_tag_body(f, &adcr->AVCProfileIndication, 1) == 1
-    && flv_read_tag_body(f, &adcr->profile_compatibility, 1) == 1
-    && flv_read_tag_body(f, &adcr->AVCLevelIndication, 1) == 1
-    && flv_read_tag_body(f, &adcr->lengthSizeMinusOne, 1) == 1
-    && flv_read_tag_body(f, &adcr->numOfSequenceParameterSets, 1) == 1) {
-        return FLV_OK;
-    }
-    else {
-        return FLV_ERROR_EOF;
-    }
-}
-
-
-static void parse_scaling_list(uint32 size, bit_buffer * bb) {
-    uint32 last_scale, next_scale, i;
-    sint32 delta_scale;
-    last_scale = 8;
-    next_scale = 8;
-    for (i = 0; i < size; i++) {
-        if (next_scale != 0) {
-            delta_scale = exp_golomb_se(bb);
-            next_scale = (last_scale + delta_scale + 256) % 256;
-        }
-        if (next_scale != 0) {
-            last_scale = next_scale;
-        }
-    }
-}
-
-/**
-    Parses a SPS NALU to retrieve video width and height
-*/
-static void parse_sps(byte * sps, size_t sps_size, uint32 * width, uint32 * height) {
-    bit_buffer bb;
-    uint32 profile, pic_order_cnt_type, width_in_mbs, height_in_map_units;
-    uint32 i, size, left, right, top, bottom;
-    uint8 frame_mbs_only_flag;
-
-    bb.start = sps;
-    bb.size = sps_size;
-    bb.current = sps;
-    bb.read_bits = 0;
-
-    /* skip first byte, since we already know we're parsing a SPS */
-    skip_bits(&bb, 8);
-    /* get profile */
-    profile = get_bits(&bb, 8);
-    /* skip 4 bits + 4 zeroed bits + 8 bits = 32 bits = 4 bytes */
-    skip_bits(&bb, 16);
-
-    /* read sps id, first exp-golomb encoded value */
-    exp_golomb_ue(&bb);
-
-    if (profile == 100 || profile == 110 || profile == 122 || profile == 144) {
-        /* chroma format idx */
-        if (exp_golomb_ue(&bb) == 3) {
-            skip_bits(&bb, 1);
-        }
-        /* bit depth luma minus8 */
-        exp_golomb_ue(&bb);
-        /* bit depth chroma minus8 */
-        exp_golomb_ue(&bb);
-        /* Qpprime Y Zero Transform Bypass flag */
-        skip_bits(&bb, 1);
-        /* Seq Scaling Matrix Present Flag */
-        if (get_bit(&bb)) {
-            for (i = 0; i < 8; i++) {
-                /* Seq Scaling List Present Flag */
-                if (get_bit(&bb)) {
-                    parse_scaling_list(i < 6 ? 16 : 64, &bb);
-                }
-            }
-        }
-    }
-    /* log2_max_frame_num_minus4 */
-    exp_golomb_ue(&bb);
-    /* pic_order_cnt_type */
-    pic_order_cnt_type = exp_golomb_ue(&bb);
-    if (pic_order_cnt_type == 0) {
-        /* log2_max_pic_order_cnt_lsb_minus4 */
-        exp_golomb_ue(&bb);
-    }
-    else if (pic_order_cnt_type == 1) {
-        /* delta_pic_order_always_zero_flag */
-        skip_bits(&bb, 1);
-        /* offset_for_non_ref_pic */
-        exp_golomb_se(&bb);
-        /* offset_for_top_to_bottom_field */
-        exp_golomb_se(&bb);
-        size = exp_golomb_ue(&bb);
-        for (i = 0; i < size; i++) {
-            /* offset_for_ref_frame */
-            exp_golomb_se(&bb);
-        }
-    }
-    /* num_ref_frames */
-    exp_golomb_ue(&bb);
-    /* gaps_in_frame_num_value_allowed_flag */
-    skip_bits(&bb, 1);
-    /* pic_width_in_mbs */
-    width_in_mbs = exp_golomb_ue(&bb) + 1;
-    /* pic_height_in_map_units */
-    height_in_map_units = exp_golomb_ue(&bb) + 1;
-    /* frame_mbs_only_flag */
-    frame_mbs_only_flag = get_bit(&bb);
-    if (!frame_mbs_only_flag) {
-        /* mb_adaptive_frame_field */
-        skip_bits(&bb, 1);
-    }
-    /* direct_8x8_inference_flag */
-    skip_bits(&bb, 1);
-    /* frame_cropping */
-    left = right = top = bottom = 0;
-    if (get_bit(&bb)) {
-        left = exp_golomb_ue(&bb) * 2;
-        right = exp_golomb_ue(&bb) * 2;
-        top = exp_golomb_ue(&bb) * 2;
-        bottom = exp_golomb_ue(&bb) * 2;
-        if (!frame_mbs_only_flag) {
-            top *= 2;
-            bottom *= 2;
-        }
-    }
-    /* width */
-    *width = width_in_mbs * 16 - (left + right);
-    /* height */
-    *height = height_in_map_units * 16 - (top + bottom);
-    if (!frame_mbs_only_flag) {
-        *height *= 2;
-    }
-}
-
-/**
-    Tries to read the resolution of the current video packet.
-    We assume to be at the first byte of the video data.
-*/
-int read_avc_resolution(flv_stream * f, uint32 body_length, uint32 * width, uint32 * height) {
-    byte avc_packet_type;
-    uint24 composition_time;
-    AVCDecoderConfigurationRecord adcr;
-    uint16 sps_size;
-    byte * sps_buffer;
-
-    /* make sure we have enough bytes to read in the current tag */
-    if (body_length < sizeof(byte) + sizeof(uint24) + sizeof(AVCDecoderConfigurationRecord)) {
-        return FLV_OK;
-    }
-
-    /* determine whether we're reading an AVCDecoderConfigurationRecord */
-    if (flv_read_tag_body(f, &avc_packet_type, 1) < 1) {
-        return FLV_ERROR_EOF;
-    }
-    if (avc_packet_type != AVC_SEQUENCE_HEADER) {
-        return FLV_OK;
-    }
-
-    /* read the composition time */
-    if (flv_read_tag_body(f, &composition_time, sizeof(uint24)) < sizeof(uint24)) {
-        return FLV_ERROR_EOF;
-    }
-
-    /* we need to read an AVCDecoderConfigurationRecord */
-    if (read_avc_decoder_configuration_record(f, &adcr) == FLV_ERROR_EOF) {
-        return FLV_ERROR_EOF;
-    }
-
-    /* number of SequenceParameterSets */
-    if ((adcr.numOfSequenceParameterSets & 0x1F) == 0) {
-        /* no SPS, return */
-        return FLV_OK;
-    }
-
-    /** read the first SequenceParameterSet found */
-    /* SPS size */
-    if (flv_read_tag_body(f, &sps_size, sizeof(uint16)) < sizeof(uint16)) {
-        return FLV_ERROR_EOF;
-    }
-    sps_size = swap_uint16(sps_size);
-    
-    /* read the SPS entirely */
-    sps_buffer = (byte *) malloc((size_t)sps_size);
-    if (sps_buffer == NULL) {
-        return FLV_ERROR_MEMORY;
-    }
-    if (flv_read_tag_body(f, sps_buffer, (size_t)sps_size) < (size_t)sps_size) {
-        free(sps_buffer);
-        return FLV_ERROR_EOF;
-    }
-
-    /* parse SPS to determine video resolution */
-    parse_sps(sps_buffer, (size_t)sps_size, width, height);
-    
-    free(sps_buffer);
-    return FLV_OK;
-}

LFLiveKit/packet/flv/avc.h

@@ -1,42 +0,0 @@
-/*
-    $Id: avc.h 231 2011-06-27 13:46:19Z marc.noirot $
-
-    FLV Metadata updater
-
-    Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
-
-    This file is part of FLVMeta.
-
-    FLVMeta is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    FLVMeta is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with FLVMeta; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-#ifndef __AVC_H__
-#define __AVC_H__
-
-#include <stdio.h>
-
-#include "types.h"
-#include "flv.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-int read_avc_resolution(flv_stream * f, uint32 body_length, uint32 * width, uint32 * height);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __AVC_H__ */

LFLiveKit/packet/flv/flv.c

@@ -1,498 +0,0 @@
-/*
-    $Id: flv.c 231 2011-06-27 13:46:19Z marc.noirot $
-
-    FLV Metadata updater
-
-    Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
-
-    This file is part of FLVMeta.
-
-    FLVMeta is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    FLVMeta is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with FLVMeta; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-#include "flv.h"
-
-#include <string.h>
-
-void flv_tag_set_timestamp(flv_tag * tag, uint32 timestamp) {
-    tag->timestamp = uint32_to_uint24_be(timestamp);
-    tag->timestamp_extended = (uint8)((timestamp & 0xFF000000) >> 24);
-}
-
-/* FLV stream functions */
-flv_stream * flv_open(const char * file) {
-    flv_stream * stream = (flv_stream *) malloc(sizeof(flv_stream));
-    if (stream == NULL) {
-        return NULL;
-    }
-    stream->flvin = fopen(file, "rb");
-    if (stream->flvin == NULL) {
-        free(stream);
-        return NULL;
-    }
-    stream->current_tag_body_length = 0;
-    stream->current_tag_body_overflow = 0;
-    stream->current_tag_offset = 0;
-    stream->state = FLV_STREAM_STATE_START;
-    return stream;
-}
-
-int flv_read_header(flv_stream * stream, flv_header * header) {
-    if (stream == NULL
-    || stream->flvin == NULL
-    || feof(stream->flvin)
-    || stream->state != FLV_STREAM_STATE_START) {
-        return FLV_ERROR_EOF;
-    }
-
-    if (fread(&header->signature, sizeof(header->signature), 1, stream->flvin) == 0
-    || fread(&header->version, sizeof(header->version), 1, stream->flvin) == 0
-    || fread(&header->flags, sizeof(header->flags), 1, stream->flvin) == 0
-    || fread(&header->offset, sizeof(header->offset), 1, stream->flvin) == 0) {
-        return FLV_ERROR_EOF;
-    }
-
-    if (header->signature[0] != 'F'
-    || header->signature[1] != 'L'
-    || header->signature[2] != 'V') {
-        return FLV_ERROR_NO_FLV;
-    }
-    
-    stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
-    return FLV_OK;
-}
-
-int flv_read_prev_tag_size(flv_stream * stream, uint32 * prev_tag_size) {
-    uint32_be val;
-    if (stream == NULL
-    || stream->flvin == NULL
-    || feof(stream->flvin)) {
-        return FLV_ERROR_EOF;
-    }
-
-    /* skip remaining tag body bytes */
-    if (stream->state == FLV_STREAM_STATE_TAG_BODY) {
-        lfs_fseek(stream->flvin, stream->current_tag_offset + FLV_TAG_SIZE + uint24_be_to_uint32(stream->current_tag.body_length), SEEK_SET);
-        stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
-    }
-
-    if (stream->state == FLV_STREAM_STATE_PREV_TAG_SIZE) {
-        if (fread(&val, sizeof(uint32_be), 1, stream->flvin) == 0) {
-            return FLV_ERROR_EOF;
-        }
-        else {
-            stream->state = FLV_STREAM_STATE_TAG;
-            *prev_tag_size = swap_uint32(val);
-            return FLV_OK;
-        }
-    }
-    else {
-        return FLV_ERROR_EOF;
-    }
-}
-
-int flv_read_tag(flv_stream * stream, flv_tag * tag) {
-    if (stream == NULL
-    || stream->flvin == NULL
-    || feof(stream->flvin)) {
-        return FLV_ERROR_EOF;
-    }
-
-    /* skip header */
-    if (stream->state == FLV_STREAM_STATE_START) {
-        lfs_fseek(stream->flvin, FLV_HEADER_SIZE, SEEK_CUR);
-        stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
-    }
-
-    /* skip current tag body */
-    if (stream->state == FLV_STREAM_STATE_TAG_BODY) {
-        lfs_fseek(stream->flvin, stream->current_tag_offset + FLV_TAG_SIZE + uint24_be_to_uint32(stream->current_tag.body_length), SEEK_SET);
-        stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
-    }
- 
-    /* skip previous tag size */
-    if (stream->state == FLV_STREAM_STATE_PREV_TAG_SIZE) {
-        lfs_fseek(stream->flvin, sizeof(uint32_be), SEEK_CUR);
-        stream->state = FLV_STREAM_STATE_TAG;
-    }
-    
-    if (stream->state == FLV_STREAM_STATE_TAG) {
-        stream->current_tag_offset = lfs_ftell(stream->flvin);
-
-        if (fread(&tag->type, sizeof(tag->type), 1, stream->flvin) == 0
-        || fread(&tag->body_length, sizeof(tag->body_length), 1, stream->flvin) == 0
-        || fread(&tag->timestamp, sizeof(tag->timestamp), 1, stream->flvin) == 0
-        || fread(&tag->timestamp_extended, sizeof(tag->timestamp_extended), 1, stream->flvin) == 0
-        || fread(&tag->stream_id, sizeof(tag->stream_id), 1, stream->flvin) == 0) {
-            return FLV_ERROR_EOF;
-        }
-        else {
-            memcpy(&stream->current_tag, tag, sizeof(flv_tag));
-            stream->current_tag_body_length = uint24_be_to_uint32(tag->body_length);
-            stream->current_tag_body_overflow = 0;
-            stream->state = FLV_STREAM_STATE_TAG_BODY;
-            return FLV_OK;
-        }
-    }
-    else {
-        return FLV_ERROR_EOF;
-    }
-}
-
-int flv_read_audio_tag(flv_stream * stream, flv_audio_tag * tag) {
-    if (stream == NULL
-    || stream->flvin == NULL
-    || feof(stream->flvin)
-    || stream->state != FLV_STREAM_STATE_TAG_BODY) {
-        return FLV_ERROR_EOF;
-    }
-
-    if (stream->current_tag_body_length == 0) {
-        return FLV_ERROR_EMPTY_TAG;
-    }
-
-    if (fread(tag, sizeof(flv_audio_tag), 1, stream->flvin) == 0) {
-        return FLV_ERROR_EOF;
-    }
-    
-    if (stream->current_tag_body_length >= sizeof(flv_audio_tag)) {
-        stream->current_tag_body_length -= sizeof(flv_audio_tag);
-    }
-    else {
-        stream->current_tag_body_overflow = sizeof(flv_audio_tag) - stream->current_tag_body_length;
-        stream->current_tag_body_length = 0;
-    }
-
-    if (stream->current_tag_body_length == 0) {
-        stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
-        if (stream->current_tag_body_overflow > 0) {
-            lfs_fseek(stream->flvin, -(file_offset_t)stream->current_tag_body_overflow, SEEK_CUR);
-        }
-    }
-
-    return FLV_OK;
-}
-
-int flv_read_video_tag(flv_stream * stream, flv_video_tag * tag) {
-    if (stream == NULL
-    || stream->flvin == NULL
-    || feof(stream->flvin)
-    || stream->state != FLV_STREAM_STATE_TAG_BODY) {
-        return FLV_ERROR_EOF;
-    }
-
-    if (stream->current_tag_body_length == 0) {
-        return FLV_ERROR_EMPTY_TAG;
-    }
-
-    if (fread(tag, sizeof(flv_video_tag), 1, stream->flvin) == 0) {
-        return FLV_ERROR_EOF;
-    }
-
-    if (stream->current_tag_body_length >= sizeof(flv_video_tag)) {
-        stream->current_tag_body_length -= sizeof(flv_video_tag);
-    }
-    else {
-        stream->current_tag_body_overflow = sizeof(flv_video_tag) - stream->current_tag_body_length;
-        stream->current_tag_body_length = 0;
-    }
-
-    if (stream->current_tag_body_length == 0) {
-        stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
-        if (stream->current_tag_body_overflow > 0) {
-            lfs_fseek(stream->flvin, -(file_offset_t)stream->current_tag_body_overflow, SEEK_CUR);
-        }
-    }
-
-    return FLV_OK;
-}
-
-int flv_read_metadata(flv_stream * stream, amf_data ** name, amf_data ** data) {
-    amf_data * d;
-    byte error_code;
-    size_t data_size;
-
-    if (stream == NULL
-    || stream->flvin == NULL
-    || feof(stream->flvin)
-    || stream->state != FLV_STREAM_STATE_TAG_BODY) {
-        return FLV_ERROR_EOF;
-    }
-
-    if (stream->current_tag_body_length == 0) {
-        return FLV_ERROR_EMPTY_TAG;
-    }
-    
-    /* read metadata name */
-    d = amf_data_file_read(stream->flvin);
-    *name = d;
-    error_code = amf_data_get_error_code(d);
-    if (error_code == AMF_ERROR_EOF) {
-        return FLV_ERROR_EOF;
-    }
-    else if (error_code != AMF_ERROR_OK) {
-        return FLV_ERROR_INVALID_METADATA_NAME;
-    }
-    
-    /* if only name can be read, metadata are invalid */
-    data_size = amf_data_size(d);
-    if (stream->current_tag_body_length > data_size) {
-        stream->current_tag_body_length -= (uint32)data_size;
-    }
-    else {
-        stream->current_tag_body_length = 0;
-        stream->current_tag_body_overflow = (uint32)data_size - stream->current_tag_body_length;
-
-        stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
-        if (stream->current_tag_body_overflow > 0) {
-            lfs_fseek(stream->flvin, -(file_offset_t)stream->current_tag_body_overflow, SEEK_CUR);
-        }
-
-        return FLV_ERROR_INVALID_METADATA;
-    }
-    
-    /* read metadata contents */
-    d = amf_data_file_read(stream->flvin);
-    *data = d;
-    error_code = amf_data_get_error_code(d);
-    if (error_code == AMF_ERROR_EOF) {
-        return FLV_ERROR_EOF;
-    }
-    if (error_code != AMF_ERROR_OK) {
-        return FLV_ERROR_INVALID_METADATA;
-    }
-    
-    data_size = amf_data_size(d);
-    if (stream->current_tag_body_length >= data_size) {
-        stream->current_tag_body_length -= (uint32)data_size;
-    }
-    else {
-        stream->current_tag_body_overflow = (uint32)data_size - stream->current_tag_body_length;
-        stream->current_tag_body_length = 0;
-    }
-
-    if (stream->current_tag_body_length == 0) {
-        stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
-        if (stream->current_tag_body_overflow > 0) {
-            lfs_fseek(stream->flvin, -(file_offset_t)stream->current_tag_body_overflow, SEEK_CUR);
-        }
-    }
-
-    return FLV_OK;
-}
-
-size_t flv_read_tag_body(flv_stream * stream, void * buffer, size_t buffer_size) {
-    size_t bytes_number;
-
-    if (stream == NULL
-    || stream->flvin == NULL
-    || feof(stream->flvin)
-    || stream->state != FLV_STREAM_STATE_TAG_BODY) {
-        return 0;
-    }
-
-    bytes_number = (buffer_size > stream->current_tag_body_length) ? stream->current_tag_body_length : buffer_size;
-    bytes_number = fread(buffer, sizeof(byte), bytes_number, stream->flvin);
-    
-    stream->current_tag_body_length -= (uint32)bytes_number;
-
-    if (stream->current_tag_body_length == 0) {
-        stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
-    }
-
-    return bytes_number;
-}
-
-file_offset_t flv_get_current_tag_offset(flv_stream * stream) {
-    return (stream != NULL) ? stream->current_tag_offset : 0;
-}
-
-file_offset_t flv_get_offset(flv_stream * stream) {
-    return (stream != NULL) ? lfs_ftell(stream->flvin) : 0;
-}
-
-void flv_reset(flv_stream * stream) {
-    /* go back to beginning of file */
-    if (stream != NULL && stream->flvin != NULL) {
-        stream->current_tag_body_length = 0;
-        stream->current_tag_offset = 0;
-        stream->state = FLV_STREAM_STATE_START;
-
-        lfs_fseek(stream->flvin, 0, SEEK_SET);
-    }
-}
-
-void flv_close(flv_stream * stream) {
-    if (stream != NULL) {
-        if (stream->flvin != NULL) {
-            fclose(stream->flvin);
-        }
-        free(stream);
-    }
-}
-
-/* FLV stdio writing helper functions */
-size_t flv_write_header(FILE * out, const flv_header * header) {
-    if (fwrite(&header->signature, sizeof(header->signature), 1, out) == 0)
-        return 0;
-    if (fwrite(&header->version, sizeof(header->version), 1, out) == 0)
-        return 0;
-    if (fwrite(&header->flags, sizeof(header->flags), 1, out) == 0)
-        return 0;
-    if (fwrite(&header->offset, sizeof(header->offset), 1, out) == 0)
-        return 0;
-    return 1;
-}
-
-size_t flv_write_tag(FILE * out, const flv_tag * tag) {
-    if (fwrite(&tag->type, sizeof(tag->type), 1, out) == 0)
-        return 0;
-
-    if (fwrite(&tag->body_length, sizeof(tag->body_length), 1, out) == 0)
-        return 0;
-
-    if (fwrite(&tag->timestamp, sizeof(tag->timestamp), 1, out) == 0)
-        return 0;
-    if (fwrite(&tag->timestamp_extended, sizeof(tag->timestamp_extended), 1, out) == 0)
-        return 0;
-    if (fwrite(&tag->stream_id, sizeof(tag->stream_id), 1, out) == 0)
-        return 0;
-    return 1;
-}
-
-/* FLV event based parser */
-int flv_parse(const char * file, flv_parser * parser) {
-    flv_header header;
-    flv_tag tag;
-    flv_audio_tag at;
-    flv_video_tag vt;
-    amf_data * name, * data;
-    uint32 prev_tag_size;
-    int retval;
-
-    if (parser == NULL) {
-        return FLV_ERROR_EOF;
-    }
-
-    parser->stream = flv_open(file);
-    if (parser->stream == NULL) {
-        return FLV_ERROR_OPEN_READ;
-    }
-
-    retval = flv_read_header(parser->stream, &header);
-    if (retval != FLV_OK) {
-        flv_close(parser->stream);
-        return retval;
-    }
-
-    if (parser->on_header != NULL) {
-        retval = parser->on_header(&header, parser);
-        if (retval != FLV_OK) {
-            flv_close(parser->stream);
-            return retval;
-        }
-    }
-
-    while (flv_read_tag(parser->stream, &tag) == FLV_OK) {
-        if (parser->on_tag != NULL) {
-            retval = parser->on_tag(&tag, parser);
-            if (retval != FLV_OK) {
-                flv_close(parser->stream);
-                return retval;
-            }
-        }
-
-        if (tag.type == FLV_TAG_TYPE_AUDIO) {
-            retval = flv_read_audio_tag(parser->stream, &at);
-            if (retval == FLV_ERROR_EOF) {
-                flv_close(parser->stream);
-                return retval;
-            }
-            if (retval != FLV_ERROR_EMPTY_TAG && parser->on_audio_tag != NULL) {
-                retval = parser->on_audio_tag(&tag, at, parser);
-                if (retval != FLV_OK) {
-                    flv_close(parser->stream);
-                    return retval;
-                }
-            }
-        }
-        else if (tag.type == FLV_TAG_TYPE_VIDEO) {
-            retval = flv_read_video_tag(parser->stream, &vt);
-            if (retval == FLV_ERROR_EOF) {
-                flv_close(parser->stream);
-                return retval;
-            }
-            if (retval != FLV_ERROR_EMPTY_TAG && parser->on_video_tag != NULL) {
-                retval = parser->on_video_tag(&tag, vt, parser);
-                if (retval != FLV_OK) {
-                    flv_close(parser->stream);
-                    return retval;
-                }
-            }
-        }
-        else if (tag.type == FLV_TAG_TYPE_META) {
-            name = data = NULL;
-            retval = flv_read_metadata(parser->stream, &name, &data);
-            if (retval == FLV_ERROR_EOF) {
-                amf_data_free(name);
-                amf_data_free(data);
-                flv_close(parser->stream);
-                return retval;
-            }
-            else if (retval == FLV_OK && parser->on_metadata_tag != NULL) {
-                retval = parser->on_metadata_tag(&tag, name, data, parser);
-                if (retval != FLV_OK) {
-                    amf_data_free(name);
-                    amf_data_free(data);
-                    flv_close(parser->stream);
-                    return retval;
-                }
-            }
-            amf_data_free(name);
-            amf_data_free(data);
-        }
-        else {
-            if (parser->on_unknown_tag != NULL) {
-                retval = parser->on_unknown_tag(&tag, parser);
-                if (retval != FLV_OK) {
-                    flv_close(parser->stream);
-                    return retval;
-                }
-            }
-        }
-        retval = flv_read_prev_tag_size(parser->stream, &prev_tag_size);
-        if (retval != FLV_OK) {
-            flv_close(parser->stream);
-            return retval;
-        }
-        if (parser->on_prev_tag_size != NULL) {
-            retval = parser->on_prev_tag_size(prev_tag_size, parser);
-            if (retval != FLV_OK) {
-                flv_close(parser->stream);
-                return retval;
-            }
-        }
-    }
-    
-    if (parser->on_stream_end != NULL) {
-        retval = parser->on_stream_end(parser);
-        if (retval != FLV_OK) {
-            flv_close(parser->stream);
-            return retval;
-        }
-    }
-
-    flv_close(parser->stream);
-    return FLV_OK;
-}

LFLiveKit/packet/flv/flv.h

@@ -1,202 +0,0 @@
-/*
-    $Id: flv.h 231 2011-06-27 13:46:19Z marc.noirot $
-
-    FLV Metadata updater
-
-    Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
-
-    This file is part of FLVMeta.
-
-    FLVMeta is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    FLVMeta is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with FLVMeta; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-#ifndef __FLV_H__
-#define __FLV_H__
-
-/* Configuration of the sources */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "types.h"
-#include "amf.h"
-
-/* error statuses */
-#define FLV_OK                          0
-#define FLV_ERROR_OPEN_READ             1
-#define FLV_ERROR_NO_FLV                2
-#define FLV_ERROR_EOF                   3
-#define FLV_ERROR_MEMORY                4
-#define FLV_ERROR_EMPTY_TAG             5
-#define FLV_ERROR_INVALID_METADATA_NAME 6
-#define FLV_ERROR_INVALID_METADATA      7
-
-/* flv file format structure and definitions */
-
-/* FLV file header */
-#define FLV_SIGNATURE       "FLV"
-#define FLV_VERSION         ((uint8)0x01)
-
-#define FLV_FLAG_VIDEO      ((uint8)0x01)
-#define FLV_FLAG_AUDIO      ((uint8)0x04)
-
-typedef struct __flv_header {
-    byte            signature[3]; /* always "FLV" */
-    uint8           version; /* should be 1 */
-    uint8_bitmask   flags;
-    uint32_be       offset; /* always 9 */
-} flv_header;
-
-#define FLV_HEADER_SIZE 9
-
-#define flv_header_has_video(header)    ((header).flags & FLV_FLAG_VIDEO)
-#define flv_header_has_audio(header)    ((header).flags & FLV_FLAG_AUDIO)
-#define flv_header_get_offset(header)   (swap_uint32((header).offset))
-
-/* FLV tag */
-#define FLV_TAG_TYPE_AUDIO  ((uint8)0x08)
-#define FLV_TAG_TYPE_VIDEO  ((uint8)0x09)
-#define FLV_TAG_TYPE_META   ((uint8)0x12)
-
-typedef struct __flv_tag {
-    uint8       type;
-    uint24_be   body_length; /* in bytes, total tag size minus 11 */
-    uint24_be   timestamp; /* milli-seconds */
-    uint8       timestamp_extended; /* timestamp extension */
-    uint24_be   stream_id; /* reserved, must be "\0\0\0" */
-    /* body comes next */
-} flv_tag;
-
-#define FLV_TAG_SIZE 11
-
-#define flv_tag_get_body_length(tag)    (uint24_be_to_uint32((tag).body_length))
-#define flv_tag_get_timestamp(tag) \
-    (uint24_be_to_uint32((tag).timestamp) + ((tag).timestamp_extended << 24))
-#define flv_tag_get_stream_id(tag)      (uint24_be_to_uint32((tag).stream_id))
-
-/* audio tag */
-#define FLV_AUDIO_TAG_SOUND_TYPE_MONO    0
-#define FLV_AUDIO_TAG_SOUND_TYPE_STEREO  1
-
-#define FLV_AUDIO_TAG_SOUND_SIZE_8       0
-#define FLV_AUDIO_TAG_SOUND_SIZE_16      1
-
-#define FLV_AUDIO_TAG_SOUND_RATE_5_5     0
-#define FLV_AUDIO_TAG_SOUND_RATE_11      1
-#define FLV_AUDIO_TAG_SOUND_RATE_22      2
-#define FLV_AUDIO_TAG_SOUND_RATE_44      3
-
-#define FLV_AUDIO_TAG_SOUND_FORMAT_LINEAR_PCM          0
-#define FLV_AUDIO_TAG_SOUND_FORMAT_ADPCM               1
-#define FLV_AUDIO_TAG_SOUND_FORMAT_MP3                 2
-#define FLV_AUDIO_TAG_SOUND_FORMAT_LINEAR_PCM_LE       3
-#define FLV_AUDIO_TAG_SOUND_FORMAT_NELLYMOSER_16_MONO  4
-#define FLV_AUDIO_TAG_SOUND_FORMAT_NELLYMOSER_8_MONO   5
-#define FLV_AUDIO_TAG_SOUND_FORMAT_NELLYMOSER          6
-#define FLV_AUDIO_TAG_SOUND_FORMAT_G711_A              7
-#define FLV_AUDIO_TAG_SOUND_FORMAT_G711_MU             8
-#define FLV_AUDIO_TAG_SOUND_FORMAT_RESERVED            9
-#define FLV_AUDIO_TAG_SOUND_FORMAT_AAC                 10
-#define FLV_AUDIO_TAG_SOUND_FORMAT_SPEEX               11
-#define FLV_AUDIO_TAG_SOUND_FORMAT_MP3_8               14
-#define FLV_AUDIO_TAG_SOUND_FORMAT_DEVICE_SPECIFIC     15
-
-typedef byte flv_audio_tag;
-
-#define flv_audio_tag_sound_type(tag)   (((tag) & 0x01) >> 0)
-#define flv_audio_tag_sound_size(tag)   (((tag) & 0x02) >> 1)
-#define flv_audio_tag_sound_rate(tag)   (((tag) & 0x0C) >> 2)
-#define flv_audio_tag_sound_format(tag) (((tag) & 0xF0) >> 4)
-
-/* video tag */
-#define FLV_VIDEO_TAG_CODEC_JPEG            1
-#define FLV_VIDEO_TAG_CODEC_SORENSEN_H263   2
-#define FLV_VIDEO_TAG_CODEC_SCREEN_VIDEO    3
-#define FLV_VIDEO_TAG_CODEC_ON2_VP6         4
-#define FLV_VIDEO_TAG_CODEC_ON2_VP6_ALPHA   5
-#define FLV_VIDEO_TAG_CODEC_SCREEN_VIDEO_V2 6
-#define FLV_VIDEO_TAG_CODEC_AVC             7
-
-#define FLV_VIDEO_TAG_FRAME_TYPE_KEYFRAME               1
-#define FLV_VIDEO_TAG_FRAME_TYPE_INTERFRAME             2
-#define FLV_VIDEO_TAG_FRAME_TYPE_DISPOSABLE_INTERFRAME  3
-#define FLV_VIDEO_TAG_FRAME_TYPE_GENERATED_KEYFRAME     4
-#define FLV_VIDEO_TAG_FRAME_TYPE_COMMAND_FRAME          5
-
-typedef byte flv_video_tag;
-
-#define flv_video_tag_codec_id(tag)     (((tag) & 0x0F) >> 0)
-#define flv_video_tag_frame_type(tag)   (((tag) & 0xF0) >> 4)
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* FLV helper functions */
-void flv_tag_set_timestamp(flv_tag * tag, uint32 timestamp);
-
-/* FLV stream */
-#define FLV_STREAM_STATE_START          0
-#define FLV_STREAM_STATE_TAG            1
-#define FLV_STREAM_STATE_TAG_BODY       2
-#define FLV_STREAM_STATE_PREV_TAG_SIZE  3
-
-typedef struct __flv_stream {
-    FILE * flvin;
-    uint8 state;
-    flv_tag current_tag;
-    file_offset_t current_tag_offset;
-    uint32 current_tag_body_length;
-    uint32 current_tag_body_overflow;
-} flv_stream;
-
-/* FLV stream functions */
-flv_stream * flv_open(const char * file);
-int flv_read_header(flv_stream * stream, flv_header * header);
-int flv_read_prev_tag_size(flv_stream * stream, uint32 * prev_tag_size);
-int flv_read_tag(flv_stream * stream, flv_tag * tag);
-int flv_read_audio_tag(flv_stream * stream, flv_audio_tag * tag);
-int flv_read_video_tag(flv_stream * stream, flv_video_tag * tag);
-int flv_read_metadata(flv_stream * stream, amf_data ** name, amf_data ** data);
-size_t flv_read_tag_body(flv_stream * stream, void * buffer, size_t buffer_size);
-file_offset_t flv_get_current_tag_offset(flv_stream * stream);
-file_offset_t flv_get_offset(flv_stream * stream);
-void flv_reset(flv_stream * stream);
-void flv_close(flv_stream * stream);
-
-/* FLV stdio writing helper functions */
-size_t flv_write_header(FILE * out, const flv_header * header);
-size_t flv_write_tag(FILE * out, const flv_tag * tag);
-
-/* FLV event based parser */
-typedef struct __flv_parser {
-    flv_stream * stream;
-    void * user_data;
-    int (* on_header)(flv_header * header, struct __flv_parser * parser);
-    int (* on_tag)(flv_tag * tag, struct __flv_parser * parser);
-    int (* on_metadata_tag)(flv_tag * tag, amf_data * name, amf_data * data, struct __flv_parser * parser);
-    int (* on_audio_tag)(flv_tag * tag, flv_audio_tag audio_tag, struct __flv_parser * parser);
-    int (* on_video_tag)(flv_tag * tag, flv_video_tag audio_tag, struct __flv_parser * parser);
-    int (* on_unknown_tag)(flv_tag * tag, struct __flv_parser * parser);
-    int (* on_prev_tag_size)(uint32 size, struct __flv_parser * parser);
-    int (* on_stream_end)(struct __flv_parser * parser);
-} flv_parser;
-
-int flv_parse(const char * file, flv_parser * parser);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __FLV_H__ */

LFLiveKit/packet/flv/info.c

@@ -1,626 +0,0 @@
-/*
-    $Id: info.c 231 2011-06-27 13:46:19Z marc.noirot $
-
-    FLV Metadata updater
-
-    Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
-
-    This file is part of FLVMeta.
-
-    FLVMeta is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    FLVMeta is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with FLVMeta; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-#include "info.h"
-#include "avc.h"
-
-#include <string.h>
-
-#pragma warning(disable:4244)
-/*
-    compute Sorensen H.263 video size
-*/
-static int compute_h263_size(flv_stream * flv_in, flv_info * info, uint32 body_length) {
-    byte header[9];
-    uint24_be psc_be;
-    uint32 psc;
-
-    /* make sure we have enough bytes to read in the current tag */
-    if (body_length >= 9) {
-        if (flv_read_tag_body(flv_in, header, 9) < 9) {
-            return FLV_ERROR_EOF;
-        }
-        psc_be.b[0] = header[0];
-        psc_be.b[1] = header[1];
-        psc_be.b[2] = header[2];
-        psc = uint24_be_to_uint32(psc_be) >> 7;
-        if (psc == 1) {
-            uint32 psize = ((header[3] & 0x03) << 1) + ((header[4] >> 7) & 0x01);
-            switch (psize) {
-                case 0:
-                    info->video_width  = ((header[4] & 0x7f) << 1) + ((header[5] >> 7) & 0x01);
-                    info->video_height = ((header[5] & 0x7f) << 1) + ((header[6] >> 7) & 0x01);
-                    break;
-                case 1:
-                    info->video_width  = ((header[4] & 0x7f) << 9) + (header[5] << 1) + ((header[6] >> 7) & 0x01);
-                    info->video_height = ((header[6] & 0x7f) << 9) + (header[7] << 1) + ((header[8] >> 7) & 0x01);
-                    break;
-                case 2:
-                    info->video_width  = 352;
-                    info->video_height = 288;
-                    break;
-                case 3:
-                    info->video_width  = 176;
-                    info->video_height = 144;
-                    break;
-                case 4:
-                    info->video_width  = 128;
-                    info->video_height = 96;
-                    break;
-                case 5:
-                    info->video_width  = 320;
-                    info->video_height = 240;
-                    break;
-                case 6:
-                    info->video_width  = 160;
-                    info->video_height = 120;
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-    return FLV_OK;
-}
-
-/*
-    compute Screen video size
-*/
-static int compute_screen_size(flv_stream * flv_in, flv_info * info, uint32 body_length) {
-    byte header[4];
-
-    /* make sure we have enough bytes to read in the current tag */
-    if (body_length >= 4) {
-        if (flv_read_tag_body(flv_in, header, 4) < 4) {
-            return FLV_ERROR_EOF;
-        }
-        
-        info->video_width  = ((header[0] & 0x0f) << 8) + header[1];
-        info->video_height = ((header[2] & 0x0f) << 8) + header[3];
-    }
-    return FLV_OK;
-}
-
-/*
-    compute On2 VP6 video size
-*/
-static int compute_vp6_size(flv_stream * flv_in, flv_info * info, uint32 body_length) {
-    byte header[7], offset;
-
-    /* make sure we have enough bytes to read in the current tag */
-    if (body_length >= 7) {
-        if (flv_read_tag_body(flv_in, header, 7) < 7) {
-            return FLV_ERROR_EOF;
-        }
-        
-        /* two bytes offset if VP6 0 */
-        offset = (header[1] & 0x01 || !(header[2] & 0x06)) << 1;
-        info->video_width  = (header[4 + offset] << 4) - (header[0] >> 4);
-        info->video_height = (header[3 + offset] << 4) - (header[0] & 0x0f);
-        
-    }
-    return FLV_OK;
-}
-
-/*
-    compute On2 VP6 with Alpha video size
-*/
-static int compute_vp6_alpha_size(flv_stream * flv_in, flv_info * info, uint32 body_length) {
-    byte header[10], offset;
-
-    /* make sure we have enough bytes to read in the current tag */
-    if (body_length >= 10) {
-        if (flv_read_tag_body(flv_in, header, 10) < 10) {
-            return FLV_ERROR_EOF;
-        }
-        
-        /* two bytes offset if VP6 0 */
-        offset = (header[4] & 0x01 || !(header[5] & 0x06)) << 1;
-        info->video_width  = (header[7 + offset] << 4) - (header[0] >> 4);
-        info->video_height = (header[6 + offset] << 4) - (header[0] & 0x0f);
-    }
-    return FLV_OK;
-}
-
-/*
-    compute AVC (H.264) video size (experimental)
-*/
-static int compute_avc_size(flv_stream * flv_in, flv_info * info, uint32 body_length) {
-    return read_avc_resolution(flv_in, body_length, &(info->video_width), &(info->video_height));
-}
-
-/*
-    compute video width and height from the first video frame
-*/
-static int compute_video_size(flv_stream * flv_in, flv_info * info, uint32 body_length) {
-    switch (info->video_codec) {
-        case FLV_VIDEO_TAG_CODEC_SORENSEN_H263:
-            return compute_h263_size(flv_in, info, body_length);
-        case FLV_VIDEO_TAG_CODEC_SCREEN_VIDEO:
-        case FLV_VIDEO_TAG_CODEC_SCREEN_VIDEO_V2:
-            return compute_screen_size(flv_in, info, body_length);
-        case FLV_VIDEO_TAG_CODEC_ON2_VP6:
-            return compute_vp6_size(flv_in, info, body_length);
-        case FLV_VIDEO_TAG_CODEC_ON2_VP6_ALPHA:
-            return compute_vp6_alpha_size(flv_in, info, body_length);
-        case FLV_VIDEO_TAG_CODEC_AVC:
-            return compute_avc_size(flv_in, info, body_length);
-        default:
-            return FLV_OK;
-    }
-}
-
-/*
-    read the flv file thoroughly to get all necessary information.
-
-    we need to check :
-    - timestamp of first audio for audio delay
-    - whether we have audio and video
-    - first frames codecs (audio, video)
-    - total audio and video data sizes
-    - keyframe offsets and timestamps
-    - whether the last video frame is a keyframe
-    - last keyframe timestamp
-    - onMetaData tag total size
-    - total tags size
-    - first tag after onMetaData offset
-    - last timestamp
-    - real video data size, number of frames, duration to compute framerate and video data rate
-    - real audio data size, duration to compute audio data rate
-    - video headers to find width and height. (depends on the encoding)
-*/
-int get_flv_info(flv_stream * flv_in, flv_info * info) {
-    uint32 prev_timestamp_video;
-    uint32 prev_timestamp_audio;
-    uint32 prev_timestamp_meta;
-    uint8 timestamp_extended_video;
-    uint8 timestamp_extended_audio;
-    uint8 timestamp_extended_meta;
-    uint8 have_video_size;
-    uint8 have_first_timestamp;
-    uint32 tag_number;
-    int result;
-    flv_tag ft;
-
-    info->have_video = 0;
-    info->have_audio = 0;
-    info->video_width = 0;
-    info->video_height = 0;
-    info->video_codec = 0;
-    info->video_frames_number = 0;
-    info->audio_codec = 0;
-    info->audio_size = 0;
-    info->audio_rate = 0;
-    info->audio_stereo = 0;
-    info->video_data_size = 0;
-    info->audio_data_size = 0;
-    info->meta_data_size = 0;
-    info->real_video_data_size = 0;
-    info->real_audio_data_size = 0;
-    info->video_first_timestamp = 0;
-    info->audio_first_timestamp = 0;
-    info->first_timestamp = 0;
-    info->can_seek_to_end = 0;
-    info->have_keyframes = 0;
-    info->last_keyframe_timestamp = 0;
-    info->on_metadata_size = 0;
-    info->on_metadata_offset = 0;
-    info->biggest_tag_body_size = 0;
-    info->last_timestamp = 0;
-    info->video_frame_duration = 0;
-    info->audio_frame_duration = 0;
-    info->total_prev_tags_size = 0;
-    info->have_on_last_second = 0;
-    info->original_on_metadata = NULL;
-    info->keyframes = NULL;
-    info->times = NULL;
-    info->filepositions = NULL;
-
-    /*
-        read FLV header
-    */
-
-    if (flv_read_header(flv_in, &(info->header)) != FLV_OK) {
-        return FLV_ERROR_NO_FLV;
-    }
-
-    info->keyframes = amf_object_new();
-    info->times = amf_array_new();
-    info->filepositions = amf_array_new();
-    amf_object_add(info->keyframes, "times", info->times);
-    amf_object_add(info->keyframes, "filepositions", info->filepositions);
-
-    /* first empty previous tag size */
-    info->total_prev_tags_size = sizeof(uint32_be);
-
-    /* first timestamp */
-    have_first_timestamp = 0;
-
-    /* extended timestamp initialization */
-    prev_timestamp_video = 0;
-    prev_timestamp_audio = 0;
-    prev_timestamp_meta = 0;
-    timestamp_extended_video = 0;
-    timestamp_extended_audio = 0;
-    timestamp_extended_meta = 0;
-    tag_number = 0;
-    have_video_size = 0;
-
-    while (flv_read_tag(flv_in, &ft) == FLV_OK) {
-        file_offset_t offset;
-        uint32 body_length;
-        uint32 timestamp;
-
-        offset = flv_get_current_tag_offset(flv_in);
-        body_length = flv_tag_get_body_length(ft);
-        timestamp = flv_tag_get_timestamp(ft);
-
-        /* extended timestamp fixing */
-        if (ft.type == FLV_TAG_TYPE_META) {
-            if (timestamp < prev_timestamp_meta
-            && prev_timestamp_meta - timestamp > 0xF00000) {
-                ++timestamp_extended_meta;
-            }
-            prev_timestamp_meta = timestamp;
-            if (timestamp_extended_meta > 0) {
-                timestamp += timestamp_extended_meta << 24;
-            }
-        }
-        else if (ft.type == FLV_TAG_TYPE_AUDIO) {
-            if (timestamp < prev_timestamp_audio
-            && prev_timestamp_audio - timestamp > 0xF00000) {
-                ++timestamp_extended_audio;
-            }
-            prev_timestamp_audio = timestamp;
-            if (timestamp_extended_audio > 0) {
-                timestamp += timestamp_extended_audio << 24;
-            }
-        }
-        else if (ft.type == FLV_TAG_TYPE_VIDEO) {
-            if (timestamp < prev_timestamp_video
-            && prev_timestamp_video - timestamp > 0xF00000) {
-                ++timestamp_extended_video;
-            }
-            prev_timestamp_video = timestamp;
-            if (timestamp_extended_video > 0) {
-                timestamp += timestamp_extended_video << 24;
-            }
-        }
-
-        /* non-zero starting timestamp handling */
-        if (!have_first_timestamp && ft.type != FLV_TAG_TYPE_META) {
-            info->first_timestamp = timestamp;
-            have_first_timestamp = 1;
-        }
-        if (timestamp > 0) {
-            timestamp -= info->first_timestamp;
-        }
-
-        /* update the info struct only if the tag is valid */
-        if (ft.type == FLV_TAG_TYPE_META
-        || ft.type == FLV_TAG_TYPE_AUDIO
-        || ft.type == FLV_TAG_TYPE_VIDEO) {
-            if (info->biggest_tag_body_size < body_length) {
-                info->biggest_tag_body_size = body_length;
-            }
-            info->last_timestamp = timestamp;
-        }
-
-        if (ft.type == FLV_TAG_TYPE_META) {
-            amf_data *tag_name, *data;
-            int retval;
-            tag_name = data = NULL;
-
-            if (body_length == 0) {
-            } else {
-                retval = flv_read_metadata(flv_in, &tag_name, &data);
-                if (retval == FLV_ERROR_EOF) {
-                    amf_data_free(tag_name);
-                    amf_data_free(data);
-                    return FLV_ERROR_EOF;
-                } else if (retval == FLV_ERROR_INVALID_METADATA_NAME) {
-                } else if (retval == FLV_ERROR_INVALID_METADATA) {
-								}
-            }
-
-            /* check metadata name */
-            if (body_length > 0 && amf_data_get_type(tag_name) == AMF_TYPE_STRING) {
-                char * name = (char *)amf_string_get_bytes(tag_name);
-                size_t len = (size_t)amf_string_get_size(tag_name);
-
-                /* get info only on the first onMetaData we read */
-                if (info->on_metadata_size == 0 && !strncmp(name, "onMetaData", len)) {
-                    info->on_metadata_size = body_length + FLV_TAG_SIZE + sizeof(uint32_be);
-                    info->on_metadata_offset = offset;
-
-                    amf_data_free(data);
-                }
-                else {
-                    if (!strncmp(name, "onLastSecond", len)) {
-                        info->have_on_last_second = 1;
-                    }
-                    info->meta_data_size += (body_length + FLV_TAG_SIZE);
-                    info->total_prev_tags_size += sizeof(uint32_be);
-                    if (data != NULL) {
-                        amf_data_free(data);
-                    }
-                }
-            }
-            /* just ignore metadata that don't have a proper name */
-            else {
-                info->meta_data_size += (body_length + FLV_TAG_SIZE);
-                info->total_prev_tags_size += sizeof(uint32_be);
-                amf_data_free(data);
-            }
-            amf_data_free(tag_name);
-        }
-        else if (ft.type == FLV_TAG_TYPE_VIDEO) {
-            flv_video_tag vt;
-
-            /* do not take video frame into account if body length is zero and we ignore errors */
-            if (body_length == 0) {
-            } else {
-                if (flv_read_video_tag(flv_in, &vt) != FLV_OK) {
-                    return FLV_ERROR_EOF;
-                }
-
-                if (info->have_video != 1) {
-                    info->have_video = 1;
-                    info->video_codec = flv_video_tag_codec_id(vt);
-                    info->video_first_timestamp = timestamp;
-                }
-
-                if (have_video_size != 1
-                && flv_video_tag_frame_type(vt) == FLV_VIDEO_TAG_FRAME_TYPE_KEYFRAME) {
-                    /* read first video frame to get critical info */
-                    result = compute_video_size(flv_in, info, body_length - sizeof(flv_video_tag));
-                    if (result != FLV_OK) {
-                        return result;
-                    }
-
-                    if (info->video_width > 0 && info->video_height > 0) {
-                        have_video_size = 1;
-                    }
-                    /* if we cannot fetch that information from the first tag, we'll try
-                       for each following video key frame */
-                }
-
-                /* add keyframe to list */
-                if (flv_video_tag_frame_type(vt) == FLV_VIDEO_TAG_FRAME_TYPE_KEYFRAME) {
-                    /* do not add keyframe if the previous one has the same timestamp */
-                    if (!info->have_keyframes
-                    || (info->have_keyframes && info->last_keyframe_timestamp != timestamp)) {
-                        info->have_keyframes = 1;
-                        info->last_keyframe_timestamp = timestamp;
-                        amf_array_push(info->times, amf_number_new(timestamp / 1000.0));
-                        amf_array_push(info->filepositions, amf_number_new((number64)offset));
-                    }
-                    /* is last frame a key frame ? if so, we can seek to end */
-                    info->can_seek_to_end = 1;
-                }
-                else {
-                    info->can_seek_to_end = 0;
-                }
-
-                info->real_video_data_size += (body_length - 1);    
-            }
-
-            info->video_frames_number++;
-
-            /*
-                we assume all video frames have the same size as the first one:
-                probably bogus but only used in case there's no audio in the file
-            */
-            if (info->video_frame_duration == 0) {
-                info->video_frame_duration = timestamp - info->video_first_timestamp;
-            }
-
-            info->video_data_size += (body_length + FLV_TAG_SIZE);
-            info->total_prev_tags_size += sizeof(uint32_be);
-        }
-        else if (ft.type == FLV_TAG_TYPE_AUDIO) {
-            flv_audio_tag at;
-
-            /* do not take audio frame into account if body length is zero and we ignore errors */
-            if (body_length == 0) {
-            } else {
-                if (flv_read_audio_tag(flv_in, &at) != FLV_OK) {
-                    return FLV_ERROR_EOF;
-                }
-            
-                if (info->have_audio != 1) {
-                    info->have_audio = 1;
-                    info->audio_codec = flv_audio_tag_sound_format(at);
-                    info->audio_rate = flv_audio_tag_sound_rate(at);
-                    info->audio_size = flv_audio_tag_sound_size(at);
-                    info->audio_stereo = flv_audio_tag_sound_type(at);
-                    info->audio_first_timestamp = timestamp;
-                }
-                /* we assume all audio frames have the same size as the first one */
-                if (info->audio_frame_duration == 0) {
-                    info->audio_frame_duration = timestamp - info->audio_first_timestamp;
-                }
-
-                info->real_audio_data_size += (body_length - 1);
-            }
-            
-            info->audio_data_size += (body_length + FLV_TAG_SIZE);
-            info->total_prev_tags_size += sizeof(uint32_be);
-        }
-        else {
-           return 7;
-        }
-        ++tag_number;
-    }
-
-    return FLV_OK;
-}
-
-/*
-    compute the metadata
-*/
-void compute_metadata(flv_info * info, flv_metadata * meta) {
-    uint32 new_on_metadata_size, on_last_second_size;
-    file_offset_t data_size, total_filesize;
-    number64 duration, video_data_rate, framerate;
-    amf_data * amf_total_filesize;
-    amf_data * amf_total_data_size;
-    amf_node * node_t;
-    amf_node * node_f;
-
-    meta->on_last_second_name = amf_str("onLastSecond");
-    meta->on_last_second = amf_associative_array_new();
-    meta->on_metadata_name = amf_str("onMetaData");
-		meta->on_metadata = amf_associative_array_new();
-
-    amf_associative_array_add(meta->on_metadata, "hasMetadata", amf_boolean_new(1));
-    amf_associative_array_add(meta->on_metadata, "hasVideo", amf_boolean_new(info->have_video));
-    amf_associative_array_add(meta->on_metadata, "hasAudio", amf_boolean_new(info->have_audio));
-    
-    if (info->have_audio) {
-        duration = (info->last_timestamp - info->first_timestamp + info->audio_frame_duration) / 1000.0;
-    }
-    else {
-        duration = (info->last_timestamp - info->first_timestamp + info->video_frame_duration) / 1000.0;
-    }
-    amf_associative_array_add(meta->on_metadata, "duration", amf_number_new(duration));
-
-    amf_associative_array_add(meta->on_metadata, "lasttimestamp", amf_number_new(info->last_timestamp / 1000.0));
-    amf_associative_array_add(meta->on_metadata, "lastkeyframetimestamp", amf_number_new(info->last_keyframe_timestamp / 1000.0));
-    
-    if (info->video_width > 0)
-        amf_associative_array_add(meta->on_metadata, "width", amf_number_new(info->video_width));
-    if (info->video_height > 0)
-        amf_associative_array_add(meta->on_metadata, "height", amf_number_new(info->video_height));
-
-    video_data_rate = ((info->real_video_data_size / 1024.0) * 8.0) / duration;
-    amf_associative_array_add(meta->on_metadata, "videodatarate", amf_number_new(video_data_rate));
-
-    framerate = info->video_frames_number / duration;
-    amf_associative_array_add(meta->on_metadata, "framerate", amf_number_new(framerate));
-
-    if (info->have_audio) {
-        number64 audio_khz, audio_sample_rate;
-        number64 audio_data_rate = ((info->real_audio_data_size / 1024.0) * 8.0) / duration;
-        amf_associative_array_add(meta->on_metadata, "audiodatarate", amf_number_new(audio_data_rate));
-
-        audio_khz = 0.0;
-        switch (info->audio_rate) {
-            case FLV_AUDIO_TAG_SOUND_RATE_5_5: audio_khz = 5500.0; break;
-            case FLV_AUDIO_TAG_SOUND_RATE_11:  audio_khz = 11000.0; break;
-            case FLV_AUDIO_TAG_SOUND_RATE_22:  audio_khz = 22050.0; break;
-            case FLV_AUDIO_TAG_SOUND_RATE_44:  audio_khz = 44100.0; break;
-        }
-        amf_associative_array_add(meta->on_metadata, "audiosamplerate", amf_number_new(audio_khz));
-        audio_sample_rate = 0.0;
-        switch (info->audio_size) {
-            case FLV_AUDIO_TAG_SOUND_SIZE_8:  audio_sample_rate = 8.0; break;
-            case FLV_AUDIO_TAG_SOUND_SIZE_16: audio_sample_rate = 16.0; break;
-        }
-        amf_associative_array_add(meta->on_metadata, "audiosamplesize", amf_number_new(audio_sample_rate));
-        amf_associative_array_add(meta->on_metadata, "stereo", amf_boolean_new(info->audio_stereo == FLV_AUDIO_TAG_SOUND_TYPE_STEREO));
-    }
-
-    /* to be computed later */
-    amf_total_filesize = amf_number_new(0);
-    amf_associative_array_add(meta->on_metadata, "filesize", amf_total_filesize);
-
-    if (info->have_video) {
-        amf_associative_array_add(meta->on_metadata, "videosize", amf_number_new((number64)info->video_data_size));
-    }
-    if (info->have_audio) {
-        amf_associative_array_add(meta->on_metadata, "audiosize", amf_number_new((number64)info->audio_data_size));
-    }
-
-    /* to be computed later */
-    amf_total_data_size = amf_number_new(0);
-    amf_associative_array_add(meta->on_metadata, "datasize", amf_total_data_size);
-
-    amf_associative_array_add(meta->on_metadata, "metadatacreator", amf_str("xingmeng"));
-
-    amf_associative_array_add(meta->on_metadata, "metadatadate", amf_date_new((number64)time(NULL)*1000, 0));
-    if (info->have_audio) {
-        amf_associative_array_add(meta->on_metadata, "audiocodecid", amf_number_new((number64)info->audio_codec));
-    }
-    if (info->have_video) {
-        amf_associative_array_add(meta->on_metadata, "videocodecid", amf_number_new((number64)info->video_codec));
-    }
-    if (info->have_audio && info->have_video) {
-        number64 audio_delay = ((sint32)info->audio_first_timestamp - (sint32)info->video_first_timestamp) / 1000.0;
-        amf_associative_array_add(meta->on_metadata, "audiodelay", amf_number_new((number64)audio_delay));
-    }
-    amf_associative_array_add(meta->on_metadata, "canSeekToEnd", amf_boolean_new(info->can_seek_to_end));
-    
-    /* only add empty cuepoints if we don't preserve existing tags OR if the existing tags don't have cuepoints */
-    if ((amf_associative_array_get(info->original_on_metadata, "cuePoints") == NULL)) {
-        amf_associative_array_add(meta->on_metadata, "hasCuePoints", amf_boolean_new(0));
-        amf_associative_array_add(meta->on_metadata, "cuePoints", amf_array_new());
-    }
-    amf_associative_array_add(meta->on_metadata, "hasKeyframes", amf_boolean_new(info->have_keyframes));
-    amf_associative_array_add(meta->on_metadata, "keyframes", info->keyframes);
-
-    /*
-        When we know the final size, we can recompute te offsets for the filepositions, and the final datasize.
-    */
-    new_on_metadata_size = FLV_TAG_SIZE + sizeof(uint32_be) +
-        (uint32)(amf_data_size(meta->on_metadata_name) + amf_data_size(meta->on_metadata));
-    on_last_second_size = (uint32)(amf_data_size(meta->on_last_second_name) + amf_data_size(meta->on_last_second));
-
-    node_t = amf_array_first(info->times);
-    node_f = amf_array_first(info->filepositions);
-    while (node_t != NULL || node_f != NULL) {
-        amf_data * amf_filepos = amf_array_get(node_f);
-        number64 offset = amf_number_get_value(amf_filepos) + new_on_metadata_size - info->on_metadata_size;
-        number64 timestamp = amf_number_get_value(amf_array_get(node_t));
-
-        /* after the onLastSecond event we need to take in account the tag size */
-        if (!info->have_on_last_second && (info->last_timestamp - timestamp * 1000) <= 1000) {
-            offset += (FLV_TAG_SIZE + on_last_second_size + sizeof(uint32_be));
-        }
-
-        amf_number_set_value(amf_filepos, offset);
-        node_t = amf_array_next(node_t);
-        node_f = amf_array_next(node_f);
-    }
-
-    /* compute data size, ie. size of metadata excluding prev_tag_size */
-    data_size = info->meta_data_size + FLV_TAG_SIZE +
-        (uint32)(amf_data_size(meta->on_metadata_name) + amf_data_size(meta->on_metadata));
-    if (!info->have_on_last_second) {
-        data_size += (uint32)on_last_second_size + FLV_TAG_SIZE;
-    }
-    amf_number_set_value(amf_total_data_size, (number64)data_size);
-  
-    /* compute total file size */
-    total_filesize = FLV_HEADER_SIZE + info->total_prev_tags_size + info->video_data_size +
-        info->audio_data_size + info->meta_data_size + new_on_metadata_size;
-
-    if (!info->have_on_last_second) {
-        /* if we have to add onLastSecond, we must count the header and new prevTagSize we add */
-        total_filesize += (uint32)(FLV_TAG_SIZE + on_last_second_size + sizeof(uint32_be));
-    }
-
-    amf_number_set_value(amf_total_filesize, (number64)total_filesize);
-}
-
-

LFLiveKit/packet/flv/info.h

@@ -1,86 +0,0 @@
-/*
-    $Id: info.h 231 2011-06-27 13:46:19Z marc.noirot $
-
-    FLV Metadata updater
-
-    Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
-
-    This file is part of FLVMeta.
-
-    FLVMeta is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    FLVMeta is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with FLVMeta; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-#ifndef __INFO_H__
-#define __INFO_H__
-#include "flv.h"
-
-typedef struct __flv_info {
-    flv_header header;
-    uint8 have_video;
-    uint8 have_audio;
-    uint32 video_width;
-    uint32 video_height;
-    uint8 video_codec;
-    uint32 video_frames_number;
-    uint8 audio_codec;
-    uint8 audio_size;
-    uint8 audio_rate;
-    uint8 audio_stereo;
-    file_offset_t video_data_size;
-    file_offset_t audio_data_size;
-    file_offset_t meta_data_size;
-    file_offset_t real_video_data_size;
-    file_offset_t real_audio_data_size;
-    uint32 video_first_timestamp;
-    uint32 audio_first_timestamp;
-    uint32 first_timestamp;
-    uint8 can_seek_to_end;
-    uint8 have_keyframes;
-    uint32 last_keyframe_timestamp;
-    uint32 on_metadata_size;
-    file_offset_t on_metadata_offset;
-    uint32 biggest_tag_body_size;
-    uint32 last_timestamp;
-    uint32 video_frame_duration;
-    uint32 audio_frame_duration;
-    file_offset_t total_prev_tags_size;
-    uint8 have_on_last_second;
-    amf_data * original_on_metadata;
-    amf_data * keyframes;
-    amf_data * times;
-    amf_data * filepositions;
-} flv_info;
-
-typedef struct __flv_metadata {
-    amf_data * on_last_second_name;
-    amf_data * on_last_second;
-    amf_data * on_metadata_name;
-    amf_data * on_metadata;
-} flv_metadata;
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-int get_flv_info(flv_stream * flv_in, flv_info * info);
-
-void compute_metadata(flv_info * info, flv_metadata * meta);
-
-void compute_current_metadata(flv_info * info, flv_metadata * meta);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __INFO_H__ */

LFLiveKit/packet/flv/types.c

@@ -1,92 +0,0 @@
-/*
-    $Id: types.c 231 2011-06-27 13:46:19Z marc.noirot $
-
-    FLV Metadata updater
-
-    Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
-
-    This file is part of FLVMeta.
-
-    FLVMeta is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    FLVMeta is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with FLVMeta; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-#include "types.h"
-
-#ifndef WORDS_BIGENDIAN
-
-/* swap 64 bits doubles */
-typedef union __convert_u {
-    uint64 i;
-    number64 f;
-} convert_u;
-
-number64 swap_number64(number64 n) {
-    convert_u c;
-    c.f = n;
-    c.i = (((c.i & 0x00000000000000FFULL) << 56) |
-           ((c.i & 0x000000000000FF00ULL) << 40) |
-           ((c.i & 0x0000000000FF0000ULL) << 24) |
-           ((c.i & 0x00000000FF000000ULL) << 8)  |
-           ((c.i & 0x000000FF00000000ULL) >> 8)  |
-           ((c.i & 0x0000FF0000000000ULL) >> 24) |
-           ((c.i & 0x00FF000000000000ULL) >> 40) |
-           ((c.i & 0xFF00000000000000ULL) >> 56));
-    return c.f;
-}
-#endif /* !defined WORDS_BIGENDIAN */
-
-/* convert native integers into 24 bits big endian integers */
-uint24_be uint32_to_uint24_be(uint32 l) {
-    uint24_be r;
-    r.b[0] = (uint8)((l & 0x00FF0000U) >> 16);
-    r.b[1] = (uint8)((l & 0x0000FF00U) >> 8);
-    r.b[2] = (uint8) (l & 0x000000FFU);
-    return r;
-}
-
-#ifdef WIN32
-
-/*
-    These functions assume fpos_t is a 64-bit signed integer
-*/
-
-file_offset_t lfs_ftell(FILE * stream) {
-    fpos_t p;
-    if (fgetpos(stream, &p) == 0) {
-        return (file_offset_t)p;
-    }
-    else {
-        return -1LL;
-    }
-}
-
-int lfs_fseek(FILE * stream, file_offset_t offset, int whence) {
-    fpos_t p;
-    if (fgetpos(stream, &p) == 0) {
-        switch (whence) {
-            case SEEK_CUR: p += offset; break;
-            case SEEK_SET: p = offset; break;
-            /*case SEEK_END:; not implemented here */
-            default:
-                return -1;
-        }
-        fsetpos(stream, &p);
-        return 0;
-    }
-    else {
-        return -1;
-    }
-}
-
-#endif /* WIN32 */

LFLiveKit/packet/flv/types.h

@@ -1,141 +0,0 @@
-/*
-    $Id: types.h 231 2011-06-27 13:46:19Z marc.noirot $
-
-    FLV Metadata updater
-
-    Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
-
-    This file is part of FLVMeta.
-
-    FLVMeta is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    FLVMeta is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with FLVMeta; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-#ifndef __TYPES_H__
-#define __TYPES_H__
-
-#include <stdint.h>
-
-#include <stdio.h>
-
-typedef uint8_t byte, uint8, uint8_bitmask;
-
-typedef uint16_t uint16, uint16_be, uint16_le;
-
-typedef int16_t sint16, sint16_be, sint16_le;
-
-typedef uint32_t uint32, uint32_be, uint32_le;
-
-typedef int32_t sint32, sint32_be, sint32_le;
-
-typedef struct __uint24 {
-    uint8 b[3];
-} uint24, uint24_be, uint24_le;
-
-typedef uint64_t uint64, uint64_le, uint64_be;
-
-typedef int64_t sint64, sint64_le, sint64_be;
-
-//typedef
-//#if SIZEOF_FLOAT == 8
-//float
-//#elif SIZEOF_DOUBLE == 8
-//double
-//#elif SIZEOF_LONG_DOUBLE == 8
-//long double
-//#else
-//uint64_t
-//#endif
-//number64, number64_le, number64_be;
-
-typedef double number64, number64_le, number64_be;
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#ifdef WORDS_BIGENDIAN
-
-# define swap_uint16(x) (x)
-# define swap_sint16(x) (x)
-# define swap_uint32(x) (x)
-# define swap_number64(x) (x)
-
-#else /* !defined WORDS_BIGENDIAN */
-
-/* swap 16 bits integers */
-# define swap_uint16(x) ((uint16)((((x) & 0x00FFU) << 8) | \
-    (((x) & 0xFF00U) >> 8)))
-# define swap_sint16(x) ((sint16)((((x) & 0x00FF) << 8) | \
-    (((x) & 0xFF00) >> 8)))
-
-/* swap 32 bits integers */
-# define swap_uint32(x) ((uint32)((((x) & 0x000000FFU) << 24) | \
-    (((x) & 0x0000FF00U) << 8)  | \
-    (((x) & 0x00FF0000U) >> 8)  | \
-    (((x) & 0xFF000000U) >> 24)))
-
-/* swap 64 bits doubles */
-number64 swap_number64(number64);
-
-#endif /* WORDS_BIGENDIAN */
-
-/* convert big endian 24 bits integers to native integers */
-# define uint24_be_to_uint32(x) ((uint32)(((x).b[0] << 16) | \
-    ((x).b[1] << 8) | (x).b[2]))
-
-/* convert native integers into 24 bits big endian integers */
-uint24_be uint32_to_uint24_be(uint32);
-
-/* large file support */
-#ifdef HAVE_FSEEKO
-# define lfs_ftell ftello
-# define lfs_fseek fseeko
-
-# define FILE_OFFSET_T_64_BITS 1
-typedef off_t file_offset_t;
-
-#else /* !HAVE_SEEKO */
-
-# ifdef WIN32
-
-# define FILE_OFFSET_T_64_BITS 1
-typedef long long int file_offset_t;
-
-/* Win32 large file support */
-file_offset_t lfs_ftell(FILE * stream);
-int lfs_fseek(FILE * stream, file_offset_t offset, int whence);
-
-# else /* !defined WIN32 */
-
-# define lfs_ftell ftell
-# define lfs_fseek fseek
-
-typedef long file_offset_t;
-
-# endif /* WIN32 */
-
-#endif /* HAVE_FSEEKO */
-
-/* file offset printf specifier */
-#ifdef FILE_OFFSET_T_64_BITS
-# define FILE_OFFSET_PRINTF_FORMAT "ll"
-#else
-# define FILE_OFFSET_PRINTF_FORMAT "l"
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __TYPES_H__ */

LFLiveKit/publish/LFStreamRTMPSocket.h

@@ -1,5 +1,5 @@
 //
-//  LFStreamRtmpSocket.h
+//  LFStreamRTMPSocket.h
 //  LaiFeng
 //
 //  Created by admin on 16/5/18.
@@ -8,7 +8,7 @@
 
 #import "LFStreamSocket.h"
 
-@interface LFStreamRtmpSocket : NSObject<LFStreamSocket>
+@interface LFStreamRTMPSocket : NSObject<LFStreamSocket>
 
 #pragma mark - Initializer
 ///=============================================================================

LFLiveKit/publish/LFStreamRTMPSocket.m

@@ -0,0 +1,554 @@
+//
+//  LFStreamRTMPSocket.m
+//  LFLiveKit
+//
+//  Created by admin on 16/5/18.
+//  Copyright © 2016年 live Interactive. All rights reserved.
+//
+
+#import "LFStreamRTMPSocket.h"
+#import "rtmp.h"
+
+static const NSInteger RetryTimesBreaken = 20;  ///<  重连1分钟  3秒一次 一共20次
+static const NSInteger RetryTimesMargin = 3;
+
+
+#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)
+
+#define SAVC(x)    static const AVal av_ ## x = AVC(#x)
+
+static const AVal av_setDataFrame = AVC("@setDataFrame");
+static const AVal av_SDKVersion = AVC("LFLiveKit 1.8.0");
+SAVC(onMetaData);
+SAVC(duration);
+SAVC(width);
+SAVC(height);
+SAVC(videocodecid);
+SAVC(videodatarate);
+SAVC(framerate);
+SAVC(audiocodecid);
+SAVC(audiodatarate);
+SAVC(audiosamplerate);
+SAVC(audiosamplesize);
+SAVC(audiochannels);
+SAVC(stereo);
+SAVC(encoder);
+SAVC(av_stereo);
+SAVC(fileSize);
+SAVC(avc1);
+SAVC(mp4a);
+
+@interface LFStreamRTMPSocket ()<LFStreamingBufferDelegate>
+{
+    PILI_RTMP *_rtmp;
+}
+@property (nonatomic, weak) id<LFStreamSocketDelegate> delegate;
+@property (nonatomic, strong) LFLiveStreamInfo *stream;
+@property (nonatomic, strong) LFStreamingBuffer *buffer;
+@property (nonatomic, strong) LFLiveDebug *debugInfo;
+@property (nonatomic, strong) dispatch_queue_t rtmpSendQueue;
+//错误信息
+@property (nonatomic, assign) RTMPError error;
+@property (nonatomic, assign) NSInteger retryTimes4netWorkBreaken;
+@property (nonatomic, assign) NSInteger reconnectInterval;
+@property (nonatomic, assign) NSInteger reconnectCount;
+
+@property (atomic, assign) BOOL isSending;
+@property (nonatomic, assign) BOOL isConnected;
+@property (nonatomic, assign) BOOL isConnecting;
+@property (nonatomic, assign) BOOL isReconnecting;
+
+@property (nonatomic, assign) BOOL sendVideoHead;
+@property (nonatomic, assign) BOOL sendAudioHead;
+
+@end
+
+@implementation LFStreamRTMPSocket
+
+#pragma mark -- LFStreamSocket
+- (nullable instancetype)initWithStream:(nullable LFLiveStreamInfo *)stream videoSize:(CGSize)videoSize reconnectInterval:(NSInteger)reconnectInterval reconnectCount:(NSInteger)reconnectCount {
+    if (!stream) @throw [NSException exceptionWithName:@"LFStreamRtmpSocket init error" reason:@"stream is nil" userInfo:nil];
+    if (self = [super init]) {
+        _stream = stream;
+        if (reconnectInterval > 0) _reconnectInterval = reconnectInterval;
+        else _reconnectInterval = RetryTimesMargin;
+
+        if (reconnectCount > 0) _reconnectCount = reconnectCount;
+        else _reconnectCount = RetryTimesBreaken;
+        
+        [self addObserver:self forKeyPath:@"isSending" options:NSKeyValueObservingOptionNew context:nil];//这里改成observer主要考虑一直到发送出错情况下，可以继续发送
+    }
+    return self;
+}
+
+- (void)dealloc{
+    [self removeObserver:self forKeyPath:@"isSending"];
+}
+
+- (void)start {
+    dispatch_async(self.rtmpSendQueue, ^{
+        [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 RTMP264_Connect:(char *)[_stream.url cStringUsingEncoding:NSASCIIStringEncoding]];
+}
+
+- (void)stop {
+    dispatch_async(self.rtmpSendQueue, ^{
+        [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;
+    }
+    [self clean];
+    [NSObject cancelPreviousPerformRequestsWithTarget:self];
+}
+
+- (void)sendFrame:(LFFrame *)frame {
+    if (!frame) return;
+    [self.buffer appendObject:frame];
+    if(!self.isSending){
+        [self sendFrame];
+    }
+}
+
+- (void)setDelegate:(id<LFStreamSocketDelegate>)delegate {
+    _delegate = delegate;
+}
+
+#pragma mark -- CustomMethod
+- (void)sendFrame {
+     dispatch_async(self.rtmpSendQueue, ^{
+        if (!self.isSending && self.buffer.list.count > 0) {
+            self.isSending = YES;
+
+            if (!_isConnected || _isReconnecting || _isConnecting || !_rtmp){
+                self.isSending = NO;
+                return;
+            }
+
+            // 调用发送接口
+            LFFrame *frame = [self.buffer popFirstObject];
+            if ([frame isKindOfClass:[LFVideoFrame class]]) {
+                if (!self.sendVideoHead) {
+                    self.sendVideoHead = YES;
+                    if(!((LFVideoFrame*)frame).sps || !((LFVideoFrame*)frame).pps){
+                        self.isSending = NO;
+                        return;
+                    }
+                    [self sendVideoHeader:(LFVideoFrame *)frame];
+                } else {
+                    [self sendVideo:(LFVideoFrame *)frame];
+                }
+            } else {
+                if (!self.sendAudioHead) {
+                    self.sendAudioHead = YES;
+                    if(!((LFAudioFrame*)frame).audioInfo){
+                        self.isSending = NO;
+                        return;
+                    }
+                    [self sendAudioHeader:(LFAudioFrame *)frame];
+                } else {
+                    [self sendAudio:frame];
+                }
+            }
+
+            //debug更新
+            self.debugInfo.totalFrame++;
+            self.debugInfo.dropFrame += self.buffer.lastDropFrames;
+            self.buffer.lastDropFrames = 0;
+
+            self.debugInfo.dataFlow += frame.data.length;
+            self.debugInfo.elapsedMilli = CACurrentMediaTime() * 1000 - self.debugInfo.timeStamp;
+            if (self.debugInfo.elapsedMilli < 1000) {
+                self.debugInfo.bandwidth += frame.data.length;
+                if ([frame isKindOfClass:[LFAudioFrame class]]) {
+                    self.debugInfo.capturedAudioCount++;
+                } else {
+                    self.debugInfo.capturedVideoCount++;
+                }
+
+                self.debugInfo.unSendCount = self.buffer.list.count;
+            } else {
+                self.debugInfo.currentBandwidth = self.debugInfo.bandwidth;
+                self.debugInfo.currentCapturedAudioCount = self.debugInfo.capturedAudioCount;
+                self.debugInfo.currentCapturedVideoCount = self.debugInfo.capturedVideoCount;
+                if (self.delegate && [self.delegate respondsToSelector:@selector(socketDebug:debugInfo:)]) {
+                    [self.delegate socketDebug:self debugInfo:self.debugInfo];
+                }
+                self.debugInfo.bandwidth = 0;
+                self.debugInfo.capturedAudioCount = 0;
+                self.debugInfo.capturedVideoCount = 0;
+                self.debugInfo.timeStamp = CACurrentMediaTime() * 1000;
+            }
+            
+            //修改发送状态
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                //< 这里只为了不循环调用sendFrame方法 调用栈是保证先出栈再进栈
+                self.isSending = NO;
+            });
+            
+        }
+    });
+}
+
+- (void)clean {
+    _isConnecting = NO;
+    _isReconnecting = NO;
+    _isSending = NO;
+    _isConnected = NO;
+    _sendAudioHead = NO;
+    _sendVideoHead = NO;
+    self.debugInfo = nil;
+    [self.buffer removeAllObject];
+    self.retryTimes4netWorkBreaken = 0;
+}
+
+- (NSInteger)RTMP264_Connect:(char *)push_url {
+    //由于摄像头的timestamp是一直在累加，需要每次得到相对时间戳
+    //分配与初始化
+    if (_isConnecting) return -1;
+
+    _isConnecting = YES;
+    if (self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]) {
+        [self.delegate socketStatus:self status:LFLivePending];
+    }
+
+    if (_rtmp != NULL) {
+        PILI_RTMP_Close(_rtmp, &_error);
+        PILI_RTMP_Free(_rtmp);
+    }
+
+    _rtmp = PILI_RTMP_Alloc();
+    PILI_RTMP_Init(_rtmp);
+
+    //设置URL
+    if (PILI_RTMP_SetupURL(_rtmp, push_url, &_error) == FALSE) {
+        //log(LOG_ERR, "RTMP_SetupURL() failed!");
+        goto Failed;
+    }
+
+    _rtmp->m_errorCallback = RTMPErrorCallback;
+    _rtmp->m_connCallback = ConnectionTimeCallback;
+    _rtmp->m_userData = (__bridge void *)self;
+    _rtmp->m_msgCounter = 1;
+    _rtmp->Link.timeout = RTMP_RECEIVE_TIMEOUT;
+    //设置可写，即发布流，这个函数必须在连接前使用，否则无效
+    PILI_RTMP_EnableWrite(_rtmp);
+
+    //连接服务器
+    if (PILI_RTMP_Connect(_rtmp, NULL, &_error) == FALSE) {
+        goto Failed;
+    }
+
+    //连接流
+    if (PILI_RTMP_ConnectStream(_rtmp, 0, &_error) == FALSE) {
+        goto Failed;
+    }
+
+    if (self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]) {
+        [self.delegate socketStatus:self status:LFLiveStart];
+    }
+
+    [self sendMetaData];
+
+    _isConnected = YES;
+    _isConnecting = NO;
+    _isReconnecting = NO;
+    _isSending = NO;
+    _retryTimes4netWorkBreaken = 0;
+    return 0;
+
+Failed:
+    PILI_RTMP_Close(_rtmp, &_error);
+    PILI_RTMP_Free(_rtmp);
+    _rtmp = NULL;
+    if (self.delegate && [self.delegate respondsToSelector:@selector(socketDidError:errorCode:)]) {
+        [self.delegate socketDidError:self errorCode:LFLiveSocketError_ConnectSocket];
+    }
+    if (self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]) {
+        [self.delegate socketStatus:self status:LFLiveError];
+    }
+    return -1;
+}
+
+#pragma mark -- Rtmp Send
+
+- (void)sendMetaData {
+    PILI_RTMPPacket packet;
+
+    char pbuf[2048], *pend = pbuf + sizeof(pbuf);
+
+    packet.m_nChannel = 0x03;                   // control channel (invoke)
+    packet.m_headerType = RTMP_PACKET_SIZE_LARGE;
+    packet.m_packetType = RTMP_PACKET_TYPE_INFO;
+    packet.m_nTimeStamp = 0;
+    packet.m_nInfoField2 = _rtmp->m_stream_id;
+    packet.m_hasAbsTimestamp = TRUE;
+    packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE;
+
+    char *enc = packet.m_body;
+    enc = AMF_EncodeString(enc, pend, &av_setDataFrame);
+    enc = AMF_EncodeString(enc, pend, &av_onMetaData);
+
+    *enc++ = AMF_OBJECT;
+
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_duration, 0.0);
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_fileSize, 0.0);
+
+    // videosize
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_width, _stream.videoConfiguration.videoSize.width);
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_height, _stream.videoConfiguration.videoSize.height);
+
+    // video
+    enc = AMF_EncodeNamedString(enc, pend, &av_videocodecid, &av_avc1);
+
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_videodatarate, _stream.videoConfiguration.videoBitRate / 1000.f);
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_framerate, _stream.videoConfiguration.videoFrameRate);
+
+    // audio
+    enc = AMF_EncodeNamedString(enc, pend, &av_audiocodecid, &av_mp4a);
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_audiodatarate, _stream.audioConfiguration.audioBitrate);
+
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_audiosamplerate, _stream.audioConfiguration.audioSampleRate);
+    enc = AMF_EncodeNamedNumber(enc, pend, &av_audiosamplesize, 16.0);
+    enc = AMF_EncodeNamedBoolean(enc, pend, &av_stereo, _stream.audioConfiguration.numberOfChannels == 2);
+
+    // sdk version
+    enc = AMF_EncodeNamedString(enc, pend, &av_encoder, &av_SDKVersion);
+
+    *enc++ = 0;
+    *enc++ = 0;
+    *enc++ = AMF_OBJECT_END;
+
+    packet.m_nBodySize = enc - packet.m_body;
+    if (!PILI_RTMP_SendPacket(_rtmp, &packet, FALSE, &_error)) {
+        return;
+    }
+}
+
+- (void)sendVideoHeader:(LFVideoFrame *)videoFrame {
+
+    unsigned char *body = NULL;
+    NSInteger iIndex = 0;
+    NSInteger rtmpLength = 1024;
+    const char *sps = videoFrame.sps.bytes;
+    const char *pps = videoFrame.pps.bytes;
+    NSInteger sps_len = videoFrame.sps.length;
+    NSInteger pps_len = videoFrame.pps.length;
+
+    body = (unsigned char *)malloc(rtmpLength);
+    memset(body, 0, rtmpLength);
+
+    body[iIndex++] = 0x17;
+    body[iIndex++] = 0x00;
+
+    body[iIndex++] = 0x00;
+    body[iIndex++] = 0x00;
+    body[iIndex++] = 0x00;
+
+    body[iIndex++] = 0x01;
+    body[iIndex++] = sps[1];
+    body[iIndex++] = sps[2];
+    body[iIndex++] = sps[3];
+    body[iIndex++] = 0xff;
+
+    /*sps*/
+    body[iIndex++] = 0xe1;
+    body[iIndex++] = (sps_len >> 8) & 0xff;
+    body[iIndex++] = sps_len & 0xff;
+    memcpy(&body[iIndex], sps, sps_len);
+    iIndex += sps_len;
+
+    /*pps*/
+    body[iIndex++] = 0x01;
+    body[iIndex++] = (pps_len >> 8) & 0xff;
+    body[iIndex++] = (pps_len) & 0xff;
+    memcpy(&body[iIndex], pps, pps_len);
+    iIndex += pps_len;
+
+    [self sendPacket:RTMP_PACKET_TYPE_VIDEO data:body size:iIndex nTimestamp:0];
+    free(body);
+}
+
+- (void)sendVideo:(LFVideoFrame *)frame {
+
+    NSInteger i = 0;
+    NSInteger rtmpLength = frame.data.length + 9;
+    unsigned char *body = (unsigned char *)malloc(rtmpLength);
+    memset(body, 0, rtmpLength);
+
+    if (frame.isKeyFrame) {
+        body[i++] = 0x17;        // 1:Iframe  7:AVC
+    } else {
+        body[i++] = 0x27;        // 2:Pframe  7:AVC
+    }
+    body[i++] = 0x01;    // AVC NALU
+    body[i++] = 0x00;
+    body[i++] = 0x00;
+    body[i++] = 0x00;
+    body[i++] = (frame.data.length >> 24) & 0xff;
+    body[i++] = (frame.data.length >> 16) & 0xff;
+    body[i++] = (frame.data.length >>  8) & 0xff;
+    body[i++] = (frame.data.length) & 0xff;
+    memcpy(&body[i], frame.data.bytes, frame.data.length);
+
+    [self sendPacket:RTMP_PACKET_TYPE_VIDEO data:body size:(rtmpLength) nTimestamp:frame.timestamp];
+    free(body);
+}
+
+- (NSInteger)sendPacket:(unsigned int)nPacketType data:(unsigned char *)data size:(NSInteger)size nTimestamp:(uint64_t)nTimestamp {
+    NSInteger rtmpLength = size;
+    PILI_RTMPPacket rtmp_pack;
+    PILI_RTMPPacket_Reset(&rtmp_pack);
+    PILI_RTMPPacket_Alloc(&rtmp_pack, (uint32_t)rtmpLength);
+
+    rtmp_pack.m_nBodySize = (uint32_t)size;
+    memcpy(rtmp_pack.m_body, data, size);
+    rtmp_pack.m_hasAbsTimestamp = 0;
+    rtmp_pack.m_packetType = nPacketType;
+    if (_rtmp) rtmp_pack.m_nInfoField2 = _rtmp->m_stream_id;
+    rtmp_pack.m_nChannel = 0x04;
+    rtmp_pack.m_headerType = RTMP_PACKET_SIZE_LARGE;
+    if (RTMP_PACKET_TYPE_AUDIO == nPacketType && size != 4) {
+        rtmp_pack.m_headerType = RTMP_PACKET_SIZE_MEDIUM;
+    }
+    rtmp_pack.m_nTimeStamp = (uint32_t)nTimestamp;
+
+    NSInteger nRet = [self RtmpPacketSend:&rtmp_pack];
+
+    PILI_RTMPPacket_Free(&rtmp_pack);
+    return nRet;
+}
+
+- (NSInteger)RtmpPacketSend:(PILI_RTMPPacket *)packet {
+    if (_rtmp && PILI_RTMP_IsConnected(_rtmp)) {
+        int success = PILI_RTMP_SendPacket(_rtmp, packet, 0, &_error);
+        return success;
+    }
+    return -1;
+}
+
+- (void)sendAudioHeader:(LFAudioFrame *)audioFrame {
+
+    NSInteger rtmpLength = audioFrame.audioInfo.length + 2;     /*spec data长度,一般是2*/
+    unsigned char *body = (unsigned char *)malloc(rtmpLength);
+    memset(body, 0, rtmpLength);
+
+    /*AF 00 + AAC RAW data*/
+    body[0] = 0xAF;
+    body[1] = 0x00;
+    memcpy(&body[2], audioFrame.audioInfo.bytes, audioFrame.audioInfo.length);          /*spec_buf是AAC sequence header数据*/
+    [self sendPacket:RTMP_PACKET_TYPE_AUDIO data:body size:rtmpLength nTimestamp:0];
+    free(body);
+}
+
+- (void)sendAudio:(LFFrame *)frame {
+
+    NSInteger rtmpLength = frame.data.length + 2;    /*spec data长度,一般是2*/
+    unsigned char *body = (unsigned char *)malloc(rtmpLength);
+    memset(body, 0, rtmpLength);
+
+    /*AF 01 + AAC RAW data*/
+    body[0] = 0xAF;
+    body[1] = 0x01;
+    memcpy(&body[2], frame.data.bytes, frame.data.length);
+    [self sendPacket:RTMP_PACKET_TYPE_AUDIO data:body size:rtmpLength nTimestamp:frame.timestamp];
+    free(body);
+}
+
+// 断线重连
+- (void)reconnect {
+    dispatch_async(self.rtmpSendQueue, ^{
+        _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 < 0) {
+        if (socket.retryTimes4netWorkBreaken++ < socket.reconnectCount && !socket.isReconnecting) {
+            socket.isConnected = NO;
+            socket.isConnecting = NO;
+            socket.isReconnecting = YES;
+            [socket performSelectorOnMainThread:@selector(reconnect) withObject:nil waitUntilDone:socket.reconnectInterval];
+        } else if (socket.retryTimes4netWorkBreaken >= socket.reconnectCount) {
+            if (socket.delegate && [socket.delegate respondsToSelector:@selector(socketStatus:status:)]) {
+                [socket.delegate socketStatus:socket status:LFLiveError];
+            }
+            if (socket.delegate && [socket.delegate respondsToSelector:@selector(socketDidError:errorCode:)]) {
+                [socket.delegate socketDidError:socket errorCode:LFLiveSocketError_ReConnectTimeOut];
+            }
+        }
+    }
+}
+
+void ConnectionTimeCallback(PILI_CONNECTION_TIME *conn_time, void *userData) {
+    //LFStreamRTMPSocket *socket = (__bridge LFStreamRTMPSocket*)userData;
+}
+
+#pragma mark -- LFStreamingBufferDelegate
+- (void)streamingBuffer:(nullable LFStreamingBuffer *)buffer bufferState:(LFLiveBuffferState)state{
+    if(self.delegate && [self.delegate respondsToSelector:@selector(socketBufferStatus:status:)]){
+        [self.delegate socketBufferStatus:self status:state];
+    }
+}
+
+#pragma mark -- Observer
+-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context{
+    if([keyPath isEqualToString:@"isSending"]){
+        if(!self.isSending){
+            [self sendFrame];
+        }
+    }
+}
+
+#pragma mark -- Getter Setter
+
+- (LFStreamingBuffer *)buffer {
+    if (!_buffer) {
+        _buffer = [[LFStreamingBuffer alloc] init];
+        _buffer.delegate = self;
+    }
+    return _buffer;
+}
+
+- (LFLiveDebug *)debugInfo {
+    if (!_debugInfo) {
+        _debugInfo = [[LFLiveDebug alloc] init];
+    }
+    return _debugInfo;
+}
+
+- (dispatch_queue_t)rtmpSendQueue{
+    if(!_rtmpSendQueue){
+        _rtmpSendQueue = dispatch_queue_create("com.youku.LaiFeng.RtmpSendQueue", NULL);
+    }
+    return _rtmpSendQueue;
+}
+
+@end

LFLiveKit/publish/LFStreamSocket.h

@@ -11,27 +11,27 @@
 #import "LFStreamingBuffer.h"
 #import "LFLiveDebug.h"
 
-@protocol LFStreamSocket ;
+@protocol LFStreamSocket;
 @protocol LFStreamSocketDelegate <NSObject>
 
 /** callback buffer current status (回调当前缓冲区情况，可实现相关切换帧率 码率等策略)*/
-- (void)socketBufferStatus:(nullable id<LFStreamSocket>)socket status:(LFLiveBuffferState)status;
+- (void)socketBufferStatus:(nullable id <LFStreamSocket>)socket status:(LFLiveBuffferState)status;
 /** callback socket current status (回调当前网络情况) */
-- (void)socketStatus:(nullable id<LFStreamSocket>)socket status:(LFLiveState)status;
+- (void)socketStatus:(nullable id <LFStreamSocket>)socket status:(LFLiveState)status;
 /** callback socket errorcode */
-- (void)socketDidError:(nullable id<LFStreamSocket>)socket errorCode:(LFLiveSocketErrorCode)errorCode;
+- (void)socketDidError:(nullable id <LFStreamSocket>)socket errorCode:(LFLiveSocketErrorCode)errorCode;
 @optional
 /** callback debugInfo */
-- (void)socketDebug:(nullable id<LFStreamSocket>)socket debugInfo:(nullable LFLiveDebug*)debugInfo;
+- (void)socketDebug:(nullable id <LFStreamSocket>)socket debugInfo:(nullable LFLiveDebug *)debugInfo;
 @end
 
 @protocol LFStreamSocket <NSObject>
-- (void) start;
-- (void) stop;
-- (void) sendFrame:(nullable LFFrame*)frame;
-- (void) setDelegate:(nullable id<LFStreamSocketDelegate>)delegate;
+- (void)start;
+- (void)stop;
+- (void)sendFrame:(nullable LFFrame *)frame;
+- (void)setDelegate:(nullable id <LFStreamSocketDelegate>)delegate;
 @optional
-- (nullable instancetype)initWithStream:(nullable LFLiveStreamInfo*)stream;
-- (nullable instancetype)initWithStream:(nullable LFLiveStreamInfo*)stream videoSize:(CGSize)videoSize;
-- (nullable instancetype)initWithStream:(nullable LFLiveStreamInfo*)stream videoSize:(CGSize)videoSize reconnectInterval:(NSInteger)reconnectInterval reconnectCount:(NSInteger)reconnectCount;
+- (nullable instancetype)initWithStream:(nullable LFLiveStreamInfo *)stream;
+- (nullable instancetype)initWithStream:(nullable LFLiveStreamInfo *)stream videoSize:(CGSize)videoSize;
+- (nullable instancetype)initWithStream:(nullable LFLiveStreamInfo *)stream videoSize:(CGSize)videoSize reconnectInterval:(NSInteger)reconnectInterval reconnectCount:(NSInteger)reconnectCount;
 @end

LFLiveKit/publish/LFStreamingBuffer.h

@@ -11,10 +11,10 @@
 #import "LFVideoFrame.h"
 
 /** current buffer status */
-typedef NS_ENUM(NSUInteger, LFLiveBuffferState) {
+typedef NS_ENUM (NSUInteger, LFLiveBuffferState) {
     LFLiveBuffferUnknown = 0,      //< 未知
-    LFLiveBuffferIncrease = 1,    //< 缓冲区状态好可以增加码率
-    LFLiveBuffferDecline = 2      //< 缓冲区状态差应该降低码率
+    LFLiveBuffferIncrease = 1,    //< 缓冲区状态差应该降低码率
+    LFLiveBuffferDecline = 2      //< 缓冲区状态好应该提升码率
 };
 
 @class LFStreamingBuffer;
@@ -22,25 +22,28 @@ typedef NS_ENUM(NSUInteger, LFLiveBuffferState) {
 @protocol LFStreamingBufferDelegate <NSObject>
 @optional
 /** 当前buffer变动（增加or减少） 根据buffer中的updateInterval时间回调*/
-- (void)streamingBuffer:(nullable LFStreamingBuffer * )buffer bufferState:(LFLiveBuffferState)state;
+- (void)streamingBuffer:(nullable LFStreamingBuffer *)buffer bufferState:(LFLiveBuffferState)state;
 @end
 
 @interface LFStreamingBuffer : NSObject
 
 /** The delegate of the buffer. buffer callback */
-@property (nullable,nonatomic, weak) id <LFStreamingBufferDelegate> delegate;
+@property (nullable, nonatomic, weak) id <LFStreamingBufferDelegate> delegate;
 
 /** current frame buffer */
-@property (nonatomic, strong, readonly) NSMutableArray <LFFrame*>* _Nonnull list;
+@property (nonatomic, strong, readonly) NSMutableArray <LFFrame *> *_Nonnull list;
 
 /** buffer count max size default 1000 */
 @property (nonatomic, assign) NSUInteger maxCount;
 
+/** count of drop frames in last time */
+@property (nonatomic, assign) NSInteger lastDropFrames;
+
 /** add frame to buffer */
-- (void)appendObject:(nullable LFFrame*)frame;
+- (void)appendObject:(nullable LFFrame *)frame;
 
 /** pop the first frome buffer */
-- (nullable LFFrame*)popFirstObject;
+- (nullable LFFrame *)popFirstObject;
 
 /** remove all objects from Buffer */
 - (void)removeAllObject;

LFLiveKit/publish/LFStreamingBuffer.m

@@ -18,8 +18,8 @@ static const NSUInteger defaultSendBufferMaxCount = 600;///< 最大缓冲区为6
     dispatch_semaphore_t _lock;
 }
 
-@property (nonatomic, strong) NSMutableArray <LFFrame*>*sortList;
-@property (nonatomic, strong, readwrite) NSMutableArray <LFFrame*>*list;
+@property (nonatomic, strong) NSMutableArray <LFFrame *> *sortList;
+@property (nonatomic, strong, readwrite) NSMutableArray <LFFrame *> *list;
 @property (nonatomic, strong) NSMutableArray *thresholdList;
 
 /** 处理buffer缓冲区情况 */
@@ -32,31 +32,34 @@ static const NSUInteger defaultSendBufferMaxCount = 600;///< 最大缓冲区为6
 
 @implementation LFStreamingBuffer
 
-- (instancetype)init{
-    if(self = [super init]){
+- (instancetype)init {
+    if (self = [super init]) {
+        
         _lock = dispatch_semaphore_create(1);
         self.updateInterval = defaultUpdateInterval;
         self.callBackInterval = defaultCallBackInterval;
         self.maxCount = defaultSendBufferMaxCount;
+        self.lastDropFrames = 0;
+        self.startTimer = NO;
     }
     return self;
 }
 
-- (void)dealloc{
+- (void)dealloc {
 }
 
 #pragma mark -- Custom
-- (void)appendObject:(LFFrame*)frame{
-    if(!frame) return;
-    if(!_startTimer){
+- (void)appendObject:(LFFrame *)frame {
+    if (!frame) return;
+    if (!_startTimer) {
         _startTimer = YES;
         [self tick];
     }
-    
+
     dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER);
-    if(self.sortList.count < defaultSortBufferMaxCount){
+    if (self.sortList.count < defaultSortBufferMaxCount) {
         [self.sortList addObject:frame];
-    }else{
+    } else {
         ///< 排序
         [self.sortList addObject:frame];
         NSArray *sortedSendQuery = [self.sortList sortedArrayUsingFunction:frameDataCompare context:NULL];
@@ -66,52 +69,54 @@ static const NSUInteger defaultSendBufferMaxCount = 600;///< 最大缓冲区为6
         [self removeExpireFrame];
         /// 添加至缓冲区
         LFFrame *firstFrame = [self.sortList lfPopFirstObject];
-        
-        if(firstFrame) [self.list addObject:firstFrame];
+
+        if (firstFrame) [self.list addObject:firstFrame];
     }
     dispatch_semaphore_signal(_lock);
 }
 
-- (LFFrame*)popFirstObject{
+- (LFFrame *)popFirstObject {
     dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER);
     LFFrame *firstFrame = [self.list lfPopFirstObject];
     dispatch_semaphore_signal(_lock);
     return firstFrame;
 }
 
-- (void)removeAllObject{
+- (void)removeAllObject {
     dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER);
     [self.list removeAllObjects];
     dispatch_semaphore_signal(_lock);
 }
 
-- (void)removeExpireFrame{
-    if(self.list.count < self.maxCount) return;
-    
+- (void)removeExpireFrame {
+    if (self.list.count < self.maxCount) return;
+
     NSArray *pFrames = [self expirePFrames];///< 第一个P到第一个I之间的p帧
-    if(pFrames && pFrames.count > 0){
+    self.lastDropFrames += [pFrames count];
+    if (pFrames && pFrames.count > 0) {
         [self.list removeObjectsInArray:pFrames];
         return;
     }
-    
+
     NSArray *iFrames = [self expireIFrames];///<  删除一个I帧（但一个I帧可能对应多个nal）
-    if(iFrames){
+    self.lastDropFrames += [iFrames count];
+    if (iFrames) {
         [self.list removeObjectsInArray:iFrames];
         return;
     }
-    
+
     [self.list removeAllObjects];
 }
 
-- (NSArray*)expirePFrames{
+- (NSArray *)expirePFrames {
     NSMutableArray *pframes = [[NSMutableArray alloc] init];
-    for(NSInteger index = 0;index < self.list.count;index++){
+    for (NSInteger index = 0; index < self.list.count; index++) {
         LFFrame *frame = [self.list objectAtIndex:index];
-        if([frame isKindOfClass:[LFVideoFrame class]]){
-            LFVideoFrame *videoFrame = (LFVideoFrame*)frame;
-            if(videoFrame.isKeyFrame && pframes.count > 0){
+        if ([frame isKindOfClass:[LFVideoFrame class]]) {
+            LFVideoFrame *videoFrame = (LFVideoFrame *)frame;
+            if (videoFrame.isKeyFrame && pframes.count > 0) {
                 break;
-            }else if(!videoFrame.isKeyFrame){
+            } else if (!videoFrame.isKeyFrame) {
                 [pframes addObject:frame];
             }
         }
@@ -119,13 +124,13 @@ static const NSUInteger defaultSendBufferMaxCount = 600;///< 最大缓冲区为6
     return pframes;
 }
 
-- (NSArray*)expireIFrames{
+- (NSArray *)expireIFrames {
     NSMutableArray *iframes = [[NSMutableArray alloc] init];
     uint64_t timeStamp = 0;
-    for(NSInteger index = 0;index < self.list.count;index++){
+    for (NSInteger index = 0; index < self.list.count; index++) {
         LFFrame *frame = [self.list objectAtIndex:index];
-        if([frame isKindOfClass:[LFVideoFrame class]] && ((LFVideoFrame*)frame).isKeyFrame){
-            if(timeStamp != 0 && timeStamp != frame.timestamp) break;
+        if ([frame isKindOfClass:[LFVideoFrame class]] && ((LFVideoFrame *)frame).isKeyFrame) {
+            if (timeStamp != 0 && timeStamp != frame.timestamp) break;
             [iframes addObject:frame];
             timeStamp = frame.timestamp;
         }
@@ -134,85 +139,84 @@ static const NSUInteger defaultSendBufferMaxCount = 600;///< 最大缓冲区为6
 }
 
 NSInteger frameDataCompare(id obj1, id obj2, void *context){
-    LFFrame* frame1 = (LFFrame*) obj1;
-    LFFrame *frame2 = (LFFrame*) obj2;
-    
+    LFFrame *frame1 = (LFFrame *)obj1;
+    LFFrame *frame2 = (LFFrame *)obj2;
+
     if (frame1.timestamp == frame2.timestamp)
         return NSOrderedSame;
-    else if(frame1.timestamp > frame2.timestamp)
+    else if (frame1.timestamp > frame2.timestamp)
         return NSOrderedDescending;
     return NSOrderedAscending;
 }
 
-- (LFLiveBuffferState)currentBufferState{
+- (LFLiveBuffferState)currentBufferState {
     NSInteger currentCount = 0;
     NSInteger increaseCount = 0;
     NSInteger decreaseCount = 0;
-    
-    for(NSNumber *number in self.thresholdList){
-        if(number.integerValue >= currentCount){
-            increaseCount ++;
-        }else{
-            decreaseCount ++;
+
+    for (NSNumber *number in self.thresholdList) {
+        if (number.integerValue >= currentCount) {
+            increaseCount++;
+        } else {
+            decreaseCount++;
         }
         currentCount = [number integerValue];
     }
-    
-    if(increaseCount >= self.callBackInterval){
+
+    if (increaseCount >= self.callBackInterval) {
         return LFLiveBuffferIncrease;
     }
-    
-    if(decreaseCount >= self.callBackInterval){
+
+    if (decreaseCount >= self.callBackInterval) {
         return LFLiveBuffferDecline;
     }
-    
+
     return LFLiveBuffferUnknown;
 }
 
 #pragma mark -- Setter Getter
-- (NSMutableArray*)list{
-    if(!_list){
+- (NSMutableArray *)list {
+    if (!_list) {
         _list = [[NSMutableArray alloc] init];
     }
     return _list;
 }
 
-- (NSMutableArray*)sortList{
-    if(!_sortList){
+- (NSMutableArray *)sortList {
+    if (!_sortList) {
         _sortList = [[NSMutableArray alloc] init];
     }
     return _sortList;
 }
 
-- (NSMutableArray*)thresholdList{
-    if(!_thresholdList){
+- (NSMutableArray *)thresholdList {
+    if (!_thresholdList) {
         _thresholdList = [[NSMutableArray alloc] init];
     }
     return _thresholdList;
 }
 
-
 #pragma mark -- 采样
-- (void)tick{
+- (void)tick {
     /** 采样 3个阶段   如果网络都是好或者都是差给回调 */
     _currentInterval += self.updateInterval;
-    
+
     dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER);
     [self.thresholdList addObject:@(self.list.count)];
     dispatch_semaphore_signal(_lock);
-    
-    if(self.currentInterval >= self.callBackInterval){
+
+    if (self.currentInterval >= self.callBackInterval) {
         LFLiveBuffferState state = [self currentBufferState];
-        if(state == LFLiveBuffferIncrease){
-            if(self.delegate && [self.delegate respondsToSelector:@selector(streamingBuffer:bufferState:)]){
+        if (state == LFLiveBuffferIncrease) {
+            if (self.delegate && [self.delegate respondsToSelector:@selector(streamingBuffer:bufferState:)]) {
                 [self.delegate streamingBuffer:self bufferState:LFLiveBuffferIncrease];
             }
-        }else if(state == LFLiveBuffferDecline){
-            if(self.delegate && [self.delegate respondsToSelector:@selector(streamingBuffer:bufferState:)]){
+        } else if (state == LFLiveBuffferDecline) {
+            if (self.delegate && [self.delegate respondsToSelector:@selector(streamingBuffer:bufferState:)]) {
                 [self.delegate streamingBuffer:self bufferState:LFLiveBuffferDecline];
             }
         }
-        
+
         self.currentInterval = 0;
         [self.thresholdList removeAllObjects];
     }

LFLiveKit/publish/NSMutableArray+LFAdd.h

@@ -11,10 +11,10 @@
 @interface NSMutableArray (YYAdd)
 
 /**
- Removes and returns the object with the lowest-valued index in the array.
- If the array is empty, it just returns nil.
- 
- @return The first object, or nil.
+   Removes and returns the object with the lowest-valued index in the array.
+   If the array is empty, it just returns nil.
+
+   @return The first object, or nil.
  */
 - (nullable id)lfPopFirstObject;
 

LFLiveKit/upload/LFStreamRtmpSocket.m

@@ -1,496 +0,0 @@
-//
-//  LFStreamRtmpSocket.m
-//  LFLiveKit
-//
-//  Created by admin on 16/5/18.
-//  Copyright © 2016年 live Interactive. All rights reserved.
-//
-
-#import "LFStreamRtmpSocket.h"
-#import "rtmp.h"
-
-static const NSInteger RetryTimesBreaken = 20;///<  重连1分钟  3秒一次 一共20次
-static const NSInteger RetryTimesMargin = 3;
-
-#define DATA_ITEMS_MAX_COUNT 100
-#define RTMP_DATA_RESERVE_SIZE 400
-#define RTMP_HEAD_SIZE (sizeof(RTMPPacket)+RTMP_MAX_HEADER_SIZE)
-
-#define SAVC(x)    static const AVal av_##x = AVC(#x)
-
-static const AVal av_setDataFrame = AVC("@setDataFrame");
-static const AVal av_SDKVersion = AVC("LFLiveKit 1.6");
-SAVC(onMetaData);
-SAVC(duration);
-SAVC(width);
-SAVC(height);
-SAVC(videocodecid);
-SAVC(videodatarate);
-SAVC(framerate);
-SAVC(audiocodecid);
-SAVC(audiodatarate);
-SAVC(audiosamplerate);
-SAVC(audiosamplesize);
-SAVC(audiochannels);
-SAVC(stereo);
-SAVC(encoder);
-SAVC(av_stereo);
-SAVC(fileSize);
-SAVC(avc1);
-SAVC(mp4a);
-
-@interface LFStreamRtmpSocket ()<LFStreamingBufferDelegate>
-{
-    PILI_RTMP* _rtmp;
-}
-@property (nonatomic, weak) id<LFStreamSocketDelegate> delegate;
-@property (nonatomic, strong) LFLiveStreamInfo *stream;
-@property (nonatomic, strong) LFStreamingBuffer *buffer;
-@property (nonatomic, strong) LFLiveDebug *debugInfo;
-//错误信息
-@property (nonatomic, assign) RTMPError error;
-@property (nonatomic, assign) NSInteger retryTimes4netWorkBreaken;
-@property (nonatomic, assign) NSInteger reconnectInterval;
-@property (nonatomic, assign) NSInteger reconnectCount;
-
-@property (nonatomic, assign) BOOL isSending;
-@property (nonatomic, assign) BOOL isConnected;
-@property (nonatomic, assign) BOOL isConnecting;
-@property (nonatomic, assign) BOOL isReconnecting;
-
-@property (nonatomic, assign) BOOL sendVideoHead;
-@property (nonatomic, assign) BOOL sendAudioHead;
-
-
-
-@end
-
-@implementation LFStreamRtmpSocket
-
-#pragma mark -- LFStreamSocket
-- (nullable instancetype)initWithStream:(nullable LFLiveStreamInfo*)stream videoSize:(CGSize)videoSize reconnectInterval:(NSInteger)reconnectInterval reconnectCount:(NSInteger)reconnectCount{
-    if(!stream) @throw [NSException exceptionWithName:@"LFStreamRtmpSocket init error" reason:@"stream is nil" userInfo:nil];
-    if(self = [super init]){
-        _stream = stream;
-        if(reconnectInterval > 0) _reconnectInterval = reconnectInterval;
-        else _reconnectInterval = RetryTimesMargin;
-        
-        if(reconnectCount > 0) _reconnectCount = reconnectCount;
-        else _reconnectCount = RetryTimesBreaken;
-    }
-    return self;
-}
-
-- (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{
-    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{
-    if(!frame) return;
-    [self.buffer appendObject:frame];
-    [self sendFrame];
-}
-
-- (void) setDelegate:(id<LFStreamSocketDelegate>)delegate{
-    _delegate = delegate;
-}
-
-#pragma mark -- CustomMethod
-- (void)sendFrame{
-    if(!self.isSending && self.buffer.list.count > 0){
-        self.isSending = YES;
-        
-        if(!_isConnected ||  _isReconnecting || _isConnecting || !_rtmp) return;
-        
-        // 调用发送接口
-        LFFrame *frame = [self.buffer popFirstObject];
-        if([frame isKindOfClass:[LFVideoFrame class]]){
-            if(!self.sendVideoHead){
-                self.sendVideoHead = YES;
-                [self sendVideoHeader:(LFVideoFrame*)frame];
-            }else{
-                [self sendVideo:(LFVideoFrame*)frame];
-            }
-        }else{
-            if(!self.sendAudioHead){
-                self.sendAudioHead = YES;
-                [self sendAudioHeader:(LFAudioFrame*)frame];
-            }else{
-                [self sendAudio:frame];
-            }
-            
-        }
-        self.debugInfo.dataFlow += frame.data.length;
-        if(CACurrentMediaTime()*1000 - self.debugInfo.timeStamp < 1000) {
-            self.debugInfo.bandwidth += frame.data.length;
-            if([frame isKindOfClass:[LFAudioFrame class]]){
-                self.debugInfo.capturedAudioCount ++;
-            }else{
-                self.debugInfo.capturedVideoCount ++;
-            }
-            self.debugInfo.unSendCount = self.buffer.list.count;
-        }else {
-            self.debugInfo.currentBandwidth = self.debugInfo.bandwidth;
-            self.debugInfo.currentCapturedAudioCount = self.debugInfo.capturedAudioCount;
-            self.debugInfo.currentCapturedVideoCount = self.debugInfo.capturedVideoCount;
-            if(self.delegate && [self.delegate respondsToSelector:@selector(socketDebug:debugInfo:)]){
-                [self.delegate socketDebug:self debugInfo:self.debugInfo];
-            }
-            
-            self.debugInfo.bandwidth = 0;
-            self.debugInfo.capturedAudioCount = 0;
-            self.debugInfo.capturedVideoCount = 0;
-            self.debugInfo.timeStamp = CACurrentMediaTime()*1000;
-        }
-    }
-}
-
-- (void)clean{
-    _isConnecting = NO;
-    _isReconnecting = NO;
-    _isSending = NO;
-    _isConnected = NO;
-    _sendAudioHead = NO;
-    _sendVideoHead = NO;
-    self.debugInfo = nil;
-    [self.buffer removeAllObject];
-    self.retryTimes4netWorkBreaken = 0;
-}
-
--(NSInteger) RTMP264_Connect:(char *)push_url{
-    //由于摄像头的timestamp是一直在累加，需要每次得到相对时间戳
-    //分配与初始化
-    if(_isConnecting) return -1;
-    
-    _isConnecting = YES;
-    if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-        [self.delegate socketStatus:self status:LFLivePending];
-    }
-    
-    if(_rtmp != NULL){
-        PILI_RTMP_Close(_rtmp, &_error);
-        PILI_RTMP_Free(_rtmp);
-    }
-    
-    _rtmp = PILI_RTMP_Alloc();
-    PILI_RTMP_Init(_rtmp);
-    
-    //设置URL
-    if (PILI_RTMP_SetupURL(_rtmp, push_url, &_error) < 0){
-        //log(LOG_ERR, "RTMP_SetupURL() failed!");
-        goto Failed;
-    }
-    
-    _rtmp->m_errorCallback =  RTMPErrorCallback;
-    _rtmp->m_connCallback = ConnectionTimeCallback;
-    _rtmp->m_userData = (__bridge void*)self;
-    _rtmp->m_msgCounter = 1;
-    //设置可写，即发布流，这个函数必须在连接前使用，否则无效
-    PILI_RTMP_EnableWrite(_rtmp);
-    
-    //连接服务器
-    if (PILI_RTMP_Connect(_rtmp, NULL, &_error) < 0){
-        goto Failed;
-    }
-    
-    //连接流
-    if (PILI_RTMP_ConnectStream(_rtmp, 0, &_error) < 0) {
-        goto Failed;
-    }
-    
-    if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-        [self.delegate socketStatus:self status:LFLiveStart];
-    }
-    
-    [self sendMetaData];
-    
-    _isConnected = YES;
-    _isConnecting = NO;
-    _isReconnecting = NO;
-    _isSending = NO;
-    _retryTimes4netWorkBreaken = 0;
-    return 0;
-    
-Failed:
-    PILI_RTMP_Close(_rtmp, &_error);
-    PILI_RTMP_Free(_rtmp);
-    return -1;
-}
-
-#pragma mark -- Rtmp Send
-
-- (void)sendMetaData {
-    PILI_RTMPPacket packet;
-    
-    char pbuf[2048], *pend = pbuf+sizeof(pbuf);
-    
-    packet.m_nChannel = 0x03;     // control channel (invoke)
-    packet.m_headerType = RTMP_PACKET_SIZE_LARGE;
-    packet.m_packetType = RTMP_PACKET_TYPE_INFO;
-    packet.m_nTimeStamp = 0;
-    packet.m_nInfoField2 = _rtmp->m_stream_id;
-    packet.m_hasAbsTimestamp = TRUE;
-    packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE;
-    
-    char *enc = packet.m_body;
-    enc = AMF_EncodeString(enc, pend, &av_setDataFrame);
-    enc = AMF_EncodeString(enc, pend, &av_onMetaData);
-    
-    *enc++ = AMF_OBJECT;
-    
-    enc = AMF_EncodeNamedNumber(enc, pend, &av_duration,        0.0);
-    enc = AMF_EncodeNamedNumber(enc, pend, &av_fileSize,        0.0);
-    
-    // videosize
-    enc = AMF_EncodeNamedNumber(enc, pend, &av_width,           _stream.videoConfiguration.videoSize.width);
-    enc = AMF_EncodeNamedNumber(enc, pend, &av_height,          _stream.videoConfiguration.videoSize.height);
-    
-    // video
-    enc = AMF_EncodeNamedString(enc, pend, &av_videocodecid,    &av_avc1);
-    
-    enc = AMF_EncodeNamedNumber(enc, pend, &av_videodatarate,   _stream.videoConfiguration.videoBitRate / 1000.f);
-    enc = AMF_EncodeNamedNumber(enc, pend, &av_framerate,       _stream.videoConfiguration.videoFrameRate);
-    
-    // audio
-    enc = AMF_EncodeNamedString(enc, pend, &av_audiocodecid,    &av_mp4a);
-    enc = AMF_EncodeNamedNumber(enc, pend, &av_audiodatarate,   _stream.audioConfiguration.audioBitrate);
-    
-    enc = AMF_EncodeNamedNumber(enc, pend, &av_audiosamplerate, _stream.audioConfiguration.audioSampleRate);
-    enc = AMF_EncodeNamedNumber(enc, pend, &av_audiosamplesize, 16.0);
-    enc = AMF_EncodeNamedBoolean(enc, pend, &av_stereo,     _stream.audioConfiguration.numberOfChannels==2);
-    
-    // sdk version
-    enc = AMF_EncodeNamedString(enc, pend, &av_encoder,         &av_SDKVersion);
-    
-    *enc++ = 0;
-    *enc++ = 0;
-    *enc++ = AMF_OBJECT_END;
-    
-    packet.m_nBodySize = enc - packet.m_body;
-    if(!PILI_RTMP_SendPacket(_rtmp, &packet, FALSE, &_error)) {
-        return;
-    }
-}
-
-- (void)sendVideoHeader:(LFVideoFrame*)videoFrame {
-    if(!videoFrame || !videoFrame.sps || !videoFrame.pps) return;
-    
-    unsigned char * body=NULL;
-    NSInteger iIndex = 0;
-    NSInteger rtmpLength = 1024;
-    const char *sps = videoFrame.sps.bytes;
-    const char *pps = videoFrame.pps.bytes;
-    NSInteger sps_len = videoFrame.sps.length;
-    NSInteger pps_len = videoFrame.pps.length;
-    
-    body = (unsigned char*)malloc(rtmpLength);
-    memset(body,0,rtmpLength);
-    
-    body[iIndex++] = 0x17;
-    body[iIndex++] = 0x00;
-    
-    body[iIndex++] = 0x00;
-    body[iIndex++] = 0x00;
-    body[iIndex++] = 0x00;
-    
-    body[iIndex++] = 0x01;
-    body[iIndex++] = sps[1];
-    body[iIndex++] = sps[2];
-    body[iIndex++] = sps[3];
-    body[iIndex++] = 0xff;
-    
-    /*sps*/
-    body[iIndex++]   = 0xe1;
-    body[iIndex++] = (sps_len >> 8) & 0xff;
-    body[iIndex++] = sps_len & 0xff;
-    memcpy(&body[iIndex],sps,sps_len);
-    iIndex +=  sps_len;
-    
-    /*pps*/
-    body[iIndex++]   = 0x01;
-    body[iIndex++] = (pps_len >> 8) & 0xff;
-    body[iIndex++] = (pps_len) & 0xff;
-    memcpy(&body[iIndex], pps, pps_len);
-    iIndex +=  pps_len;
-    
-    [self sendPacket:RTMP_PACKET_TYPE_VIDEO data:body size:iIndex nTimestamp:0];
-    free(body);
-}
-
-
-- (void)sendVideo:(LFVideoFrame*)frame{
-    if(!frame || !frame.data || frame.data.length < 11) return;
-    
-    NSInteger i = 0;
-    NSInteger rtmpLength = frame.data.length+9;
-    unsigned char *body = (unsigned char*)malloc(rtmpLength);
-    memset(body,0,rtmpLength);
-    
-    if(frame.isKeyFrame){
-        body[i++] = 0x17;// 1:Iframe  7:AVC
-    } else{
-        body[i++] = 0x27;// 2:Pframe  7:AVC
-    }
-    body[i++] = 0x01;// AVC NALU
-    body[i++] = 0x00;
-    body[i++] = 0x00;
-    body[i++] = 0x00;
-    body[i++] = (frame.data.length >> 24) & 0xff;
-    body[i++] = (frame.data.length >> 16) & 0xff;
-    body[i++] = (frame.data.length >>  8) & 0xff;
-    body[i++] = (frame.data.length ) & 0xff;
-    memcpy(&body[i],frame.data.bytes,frame.data.length);
-    
-    [self sendPacket:RTMP_PACKET_TYPE_VIDEO data:body size:(rtmpLength) nTimestamp:frame.timestamp];
-    free(body);
-}
-
--(NSInteger) sendPacket:(unsigned int)nPacketType data:(unsigned char *)data size:(NSInteger) size nTimestamp:(uint64_t) nTimestamp{
-    NSInteger rtmpLength = size;
-    PILI_RTMPPacket rtmp_pack;
-    PILI_RTMPPacket_Reset(&rtmp_pack);
-    PILI_RTMPPacket_Alloc(&rtmp_pack,(uint32_t)rtmpLength);
-    
-    rtmp_pack.m_nBodySize = (uint32_t)size;
-    memcpy(rtmp_pack.m_body,data,size);
-    rtmp_pack.m_hasAbsTimestamp = 0;
-    rtmp_pack.m_packetType = nPacketType;
-    if(_rtmp) rtmp_pack.m_nInfoField2 = _rtmp->m_stream_id;
-    rtmp_pack.m_nChannel = 0x04;
-    rtmp_pack.m_headerType = RTMP_PACKET_SIZE_LARGE;
-    if (RTMP_PACKET_TYPE_AUDIO == nPacketType && size !=4){
-        rtmp_pack.m_headerType = RTMP_PACKET_SIZE_MEDIUM;
-    }
-    rtmp_pack.m_nTimeStamp = (uint32_t)nTimestamp;
-    
-    NSInteger nRet = [self RtmpPacketSend:&rtmp_pack];
-    
-    PILI_RTMPPacket_Free(&rtmp_pack);
-    return nRet;
-}
-
-- (NSInteger)RtmpPacketSend:(PILI_RTMPPacket*)packet{
-    if (PILI_RTMP_IsConnected(_rtmp)){
-        int success = PILI_RTMP_SendPacket(_rtmp,packet,0,&_error);
-        if(success){
-            self.isSending = NO;
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [self sendFrame];
-            });
-            
-        }
-        return success;
-    }
-    
-    return -1;
-}
-
-- (void)sendAudioHeader:(LFAudioFrame*)audioFrame{
-    if(!audioFrame || !audioFrame.audioInfo) return;
-    
-    NSInteger rtmpLength = audioFrame.audioInfo.length + 2;/*spec data长度,一般是2*/
-    unsigned char * body = (unsigned char*)malloc(rtmpLength);
-    memset(body,0,rtmpLength);
-    
-    /*AF 00 + AAC RAW data*/
-    body[0] = 0xAF;
-    body[1] = 0x00;
-    memcpy(&body[2],audioFrame.audioInfo.bytes,audioFrame.audioInfo.length); /*spec_buf是AAC sequence header数据*/
-    [self sendPacket:RTMP_PACKET_TYPE_AUDIO data:body size:rtmpLength nTimestamp:0];
-    free(body);
-}
-
-- (void)sendAudio:(LFFrame*)frame {
-    if(!frame) return;
-    
-    NSInteger rtmpLength = frame.data.length + 2;/*spec data长度,一般是2*/
-    unsigned char * body = (unsigned char*)malloc(rtmpLength);
-    memset(body,0,rtmpLength);
-    
-    /*AF 01 + AAC RAW data*/
-    body[0] = 0xAF;
-    body[1] = 0x01;
-    memcpy(&body[2],frame.data.bytes,frame.data.length);
-    [self sendPacket:RTMP_PACKET_TYPE_AUDIO data:body size:rtmpLength nTimestamp:frame.timestamp];
-    free(body);
-}
-
-// 断线重连
--(void) reconnect {
-    _isReconnecting = NO;
-    if(_isConnected) return;
-    if(_rtmp){
-        PILI_RTMP_ReconnectStream(_rtmp, 0, &_error);
-    }else{
-        [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(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)), dispatch_get_main_queue(), ^{
-                [socket reconnect];
-            });
-        }else if(socket.retryTimes4netWorkBreaken >= socket.reconnectCount){
-            if(socket.delegate && [socket.delegate respondsToSelector:@selector(socketStatus:status:)]){
-                [socket.delegate socketStatus:socket status:LFLiveError];
-            }
-            if(socket.delegate && [socket.delegate respondsToSelector:@selector(socketDidError:errorCode:)]){
-                [socket.delegate socketDidError:socket errorCode:LFLiveSocketError_ReConnectTimeOut];
-            }
-        }
-    }
-}
-
-void ConnectionTimeCallback(PILI_CONNECTION_TIME* conn_time, void *userData){
-    //LFStreamRtmpSocket *socket = (__bridge LFStreamRtmpSocket*)userData;
-}
-
-#pragma mark -- Getter Setter
-
-- (LFStreamingBuffer*)buffer{
-    if(!_buffer){
-        _buffer = [[LFStreamingBuffer alloc] init];
-        _buffer.delegate = self;
-    }
-    return _buffer;
-}
-
-- (LFLiveDebug*)debugInfo{
-    if(!_debugInfo){
-        _debugInfo = [[LFLiveDebug alloc] init];
-    }
-    return _debugInfo;
-}
-
-@end

LFLiveKit/upload/LFStreamTcpSocket.h

@@ -1,19 +0,0 @@
-//
-//  LFStreamTcpSocket.h
-//  LFLiveKit
-//
-//  Created by admin on 16/5/3.
-//  Copyright © 2016年 倾慕. All rights reserved.
-//
-
-#import "LFStreamSocket.h"
-
-@interface LFStreamTcpSocket : NSObject<LFStreamSocket>
-#pragma mark - Initializer
-///=============================================================================
-/// @name Initializer
-///=============================================================================
-- (nullable instancetype)init UNAVAILABLE_ATTRIBUTE;
-+ (nullable instancetype)new UNAVAILABLE_ATTRIBUTE;
-
-@end

LFLiveKit/upload/LFStreamTcpSocket.m

@@ -1,331 +0,0 @@
-//
-//  LFStreamTcpSocket.m
-//  LFLiveKit
-//
-//  Created by admin on 16/5/3.
-//  Copyright © 2016年 倾慕. All rights reserved.
-//
-
-#import "LFStreamTcpSocket.h"
-#import "GCDAsyncSocket.h"
-#import "LFFlvPackage.h"
-
-static const NSInteger RetryTimesBreaken = 20;///<  重连3分钟  3秒一次 一共60次
-static const NSInteger RetryTimesMargin = 3;
-const NSInteger TCP_RECEIVE_TIMEOUT = -1;
-
-@interface LFStreamTcpSocket () <LFStreamingBufferDelegate,GCDAsyncSocketDelegate>
-
-@property (nonatomic, strong) GCDAsyncSocket * socket;
-@property (nonatomic, strong) dispatch_queue_t socketQueue;
-@property (nonatomic, strong) LFStreamingBuffer *buffer;
-@property (nonatomic, strong) LFLiveStreamInfo *stream;
-@property (nonatomic, weak) id<LFStreamSocketDelegate> delegate;
-@property (nonatomic, strong) id<LFStreamPackage> package;
-@property (nonatomic, strong) LFLiveDebug *debugInfo;
-@property (nonatomic, assign) CGSize videoSize;
-
-@property (nonatomic, assign) BOOL isSending;
-@property (nonatomic, assign) BOOL isConnecting;
-@property (nonatomic, assign) BOOL isReconnecting;
-@property (nonatomic, assign) BOOL isConnected;
-@property (nonatomic, assign) NSInteger retryTimes4netWorkBreaken;
-@property (nonatomic, assign) NSInteger reconnectInterval;
-@property (nonatomic, assign) NSInteger reconnectCount;
-@property (nonatomic, assign) BOOL needSendHeader;
-
-@end
-
-@implementation LFStreamTcpSocket
-
-- (nullable instancetype)initWithStream:(nullable LFLiveStreamInfo*)stream videoSize:(CGSize)videoSize reconnectInterval:(NSInteger)reconnectInterval reconnectCount:(NSInteger)reconnectCount{
-    if(!stream) @throw [NSException exceptionWithName:@"LFStreamTcpSocket init error" reason:@"stream is nil" userInfo:nil];
-    if(CGSizeEqualToSize(videoSize, CGSizeZero)) @throw [NSException exceptionWithName:@"LFStreamTcpSocket init error" reason:@"videoSize is zero" userInfo:nil];
-    if(self = [super init]){
-        _stream = stream;
-        _videoSize = videoSize;
-        if(reconnectInterval > 0) _reconnectInterval = reconnectInterval;
-        else _reconnectInterval = RetryTimesMargin;
-     
-        if(reconnectCount > 0) _reconnectCount = reconnectCount;
-        else _reconnectCount = RetryTimesBreaken;
-    }
-    return self;
-}
-
-#pragma mark -- LFStreamSocket
-- (void) start{
-    if(!_stream) return;
-    if(_isConnecting) return;
-    if(_socket.isConnected) return;
-    [self clean];
-    
-    self.debugInfo.streamId = self.stream.streamId;
-    self.debugInfo.uploadUrl = self.stream.url;
-    self.debugInfo.videoSize = self.videoSize;
-    self.debugInfo.isRtmp = NO;
-    
-    if(![self.socket connectToHost:_stream.host onPort:_stream.port withTimeout:5 error:nil]){
-        if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-            [self.delegate socketStatus:self status:LFLiveError];
-        }
-        if(self.delegate && [self.delegate respondsToSelector:@selector(socketDidError:errorCode:)]){
-            [self.delegate socketDidError:self errorCode:LFLiveSocketError_ConnectSocket];
-        }
-        return;
-    }
-    if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-        [self.delegate socketStatus:self status:LFLivePending];
-    }
-    _isConnecting = YES;
-    
-}
-
-- (void) stop{
-    [self.socket disconnect];
-    [self clean];
-}
-
-- (void)sendFrame:(LFFrame *)frame{
-    __weak typeof(self) _self = self;
-    dispatch_async(self.socketQueue, ^{
-        __strong typeof(_self) self = _self;
-        if(!frame) return;
-        if([frame isKindOfClass:[LFAudioFrame class]]){
-            NSData *packageData = [self.package aaCPacket:(LFAudioFrame*)frame];///< 打包flv
-            if(!packageData) return;
-            frame.data = packageData;
-        }else{
-            NSData *packageData = [self.package h264Packet:(LFVideoFrame*)frame];///< 打包flv
-            if(!packageData) return;
-            frame.data = packageData;
-        }
-        
-        [self.buffer appendObject:frame];
-        [self sendFrame];
-    });
-}
-
-- (void)setDelegate:(id<LFStreamSocketDelegate>)delegate{
-    _delegate = delegate;
-}
-
-#pragma mark -- CustomMethod
-- (void)sendFrame{
-    if(!self.isSending && self.buffer.list.count > 0 && _isConnected){
-        self.isSending = YES;
-        LFFrame *frame = [self.buffer popFirstObject];
-        if(self.needSendHeader){///< flvHeader 插入到队列最前面去
-            NSMutableData * mutableData = [[NSMutableData alloc] init];
-            [mutableData appendData:frame.header];
-            [mutableData appendData:frame.data];
-            frame.data = mutableData;
-            self.needSendHeader = NO;
-        }
-        [self.socket writeData:frame.data withTimeout:TCP_RECEIVE_TIMEOUT tag:1];
-        
-        self.debugInfo.dataFlow += frame.data.length;
-        if(CACurrentMediaTime()*1000 - self.debugInfo.timeStamp < 1000) {
-            self.debugInfo.bandwidth += frame.data.length;
-            if([frame isKindOfClass:[LFAudioFrame class]]){
-                self.debugInfo.capturedAudioCount ++;
-            }else{
-                self.debugInfo.capturedVideoCount ++;
-            }
-            self.debugInfo.unSendCount = self.buffer.list.count;
-        }else {
-            self.debugInfo.currentBandwidth = self.debugInfo.bandwidth;
-            self.debugInfo.currentCapturedAudioCount = self.debugInfo.capturedAudioCount;
-            self.debugInfo.currentCapturedVideoCount = self.debugInfo.capturedVideoCount;
-            if(self.delegate && [self.delegate respondsToSelector:@selector(socketDebug:debugInfo:)]){
-                [self.delegate socketDebug:self debugInfo:self.debugInfo];
-            }
-            
-            self.debugInfo.bandwidth = 0;
-            self.debugInfo.capturedAudioCount = 0;
-            self.debugInfo.capturedVideoCount = 0;
-            self.debugInfo.timeStamp = CACurrentMediaTime()*1000;
-        }
-
-    }
-}
-
-- (void)clean{
-    _isConnected = NO;
-    _isConnecting = NO;
-    _isReconnecting = NO;
-    _isSending = NO;
-    _retryTimes4netWorkBreaken = 0;
-    _needSendHeader = NO;
-    self.debugInfo = nil;
-    [self.buffer removeAllObject];
-}
-
-// 断线重连
--(void) reconnect {
-    _isReconnecting = NO;
-    if(_isConnected) return;
-    if([self.socket isConnected]) return;
-    
-    if(![self.socket connectToHost:_stream.host onPort:_stream.port withTimeout:5 error:nil]){
-        if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-            [self.delegate socketStatus:self status:LFLiveError];
-        }
-        if(self.delegate && [self.delegate respondsToSelector:@selector(socketDidError:errorCode:)]){
-            [self.delegate socketDidError:self errorCode:LFLiveSocketError_ConnectSocket];
-        }
-        return;
-    }
-}
-
-
-#pragma mark -- GCDAsyncSocketDelegate
-- (void)socket:(GCDAsyncSocket *)sock didConnectToHost:(NSString *)host port:(uint16_t)port{
-    NSLog(@"onSocket:%p didConnectToHost:%@ port:%hu", sock, host, port);
-    [sock readDataWithTimeout:-1 tag:0];
-    if(_isConnected) return;
-    [self.socket writeData:self.verificationData withTimeout:-1 tag:0];
-}
-
-- (void)socket:(GCDAsyncSocket *)sock didReadData:(NSData *)data withTag:(long)tag {
-    [sock readDataWithTimeout:-1 tag:0];
-    if(_isConnected) return;
-    if([self verificationDataValid:data]){
-        NSLog(@"服务器验证成功，准备发送数据");
-        _isConnected = YES;
-        _isConnecting = NO;
-        _isReconnecting = NO;
-        _retryTimes4netWorkBreaken = 0;// 计数器清零
-        _needSendHeader = YES;
-        self.isSending = NO;
-        if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-            [self.delegate socketStatus:self status:LFLiveStart];
-        }
-    }else{
-        NSLog(@"服务器验证失败");
-        [self clean];
-        [self.socket disconnect];
-        
-        if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-            [self.delegate socketStatus:self status:LFLiveError];
-        }
-        if(self.delegate && [self.delegate respondsToSelector:@selector(socketDidError:errorCode:)]){
-            [self.delegate socketDidError:self errorCode:LFLiveSocketError_Verification];
-        }
-    }
-}
-
-- (void)socketDidDisconnect:(GCDAsyncSocket *)sock withError:(NSError *)err {
-    NSLog(@"onSocket:%p socketDidDisconnectWithError:%@", sock, err);
-    if(err){
-        if(self.retryTimes4netWorkBreaken++ < _reconnectCount && !self.isReconnecting){
-            _isConnected = NO;
-            _isConnecting = NO;
-            _isReconnecting = YES;
-            
-            [self.socket disconnect];
-            ///< 连接超时
-            if(err.code == 3){
-                if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-                    [self.delegate socketStatus:self status:LFLiveError];
-                }
-                if(self.delegate && [self.delegate respondsToSelector:@selector(socketDidError:errorCode:)]){
-                    [self.delegate socketDidError:self errorCode:LFLiveSocketError_ConnectSocket];
-                }
-                return;
-            }
-            
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(_reconnectInterval * NSEC_PER_SEC)), self.socketQueue, ^{
-                [self reconnect];
-            });
-            
-            if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-                [self.delegate socketStatus:self status:LFLivePending];
-            }
-        }else if(self.retryTimes4netWorkBreaken >= _reconnectCount){
-            if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-                [self.delegate socketStatus:self status:LFLiveError];
-            }
-            if(self.delegate && [self.delegate respondsToSelector:@selector(socketDidError:errorCode:)]){
-                [self.delegate socketDidError:self errorCode:LFLiveSocketError_ReConnectTimeOut];
-            }
-        }
-    }else{
-        [self clean];
-        if(self.delegate && [self.delegate respondsToSelector:@selector(socketStatus:status:)]){
-            [self.delegate socketStatus:self status:LFLiveStop];
-        }
-    }
-}
-
-- (void)socket:(GCDAsyncSocket *)sock didWriteDataWithTag:(long)tag{
-    if(tag > 0){
-        self.isSending = NO;
-        [self sendFrame];
-    }
-}
-
-#pragma mark --BufferDelegate
-- (void)streamingBuffer:(nullable LFStreamingBuffer*)buffer bufferState:(LFLiveBuffferState)state{
-    if(self.isConnected){
-        if(self.delegate && [self.delegate respondsToSelector:@selector(socketBufferStatus:status:)]){
-            [self.delegate socketBufferStatus:self status:state];
-        }
-    }
-}
-
-#pragma mark -- Getter Setter
-- (dispatch_queue_t)socketQueue{
-    if(!_socketQueue){
-        _socketQueue = dispatch_queue_create("com.youku.LaiFeng.live.socketQueue", NULL);
-    }
-    return _socketQueue;
-}
-
-- (GCDAsyncSocket*)socket{
-    if(!_socket){
-        _socket = [[GCDAsyncSocket alloc] initWithDelegate:self delegateQueue:self.socketQueue socketQueue:self.socketQueue];
-    }
-    return _socket;
-}
-
-- (LFStreamingBuffer*)buffer{
-    if(!_buffer){
-        _buffer = [[LFStreamingBuffer alloc] init];
-        _buffer.delegate = self;
-    }
-    return _buffer;
-}
-
-- (id<LFStreamPackage>)package{
-    if(!_package){
-        _package = [[LFFlvPackage alloc] initWithVideoSize:self.videoSize];
-    }
-    return _package;
-}
-
-- (LFLiveDebug*)debugInfo{
-    if(!_debugInfo){
-        _debugInfo = [[LFLiveDebug alloc] init];
-    }
-    return _debugInfo;
-}
-
-#pragma mark -- 服务器验证
-- (NSData*)verificationData{
-    /**  结构体专为NSData **/
-    if(!self.stream) return nil;
-    #warning TODO send verficationData to server
-    return nil;
-}
-
-- (BOOL)verificationDataValid:(NSData*)data{
-    /**  NSData专为结构体 **/
-    if(!self.stream) return NO;
-    if(!data) return NO;
-    #warning TODO server give client data,verification
-    return NO;
-}
-
-
-@end

LFLiveKitDemo/LFLiveKitDemo.xcodeproj/project.pbxproj

@@ -7,194 +7,184 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		57B42059E84CC681C5C99B68 /* libPods-LFLiveKitDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D506B5639A1D45519536773 /* libPods-LFLiveKitDemo.a */; };
-		840762F11D07C7D0000FD0BF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 840762F01D07C7D0000FD0BF /* main.m */; };
-		840762F41D07C7D0000FD0BF /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 840762F31D07C7D0000FD0BF /* AppDelegate.m */; };
-		840762F71D07C7D0000FD0BF /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 840762F61D07C7D0000FD0BF /* ViewController.m */; };
-		840762FA1D07C7D0000FD0BF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 840762F81D07C7D0000FD0BF /* Main.storyboard */; };
-		840762FC1D07C7D0000FD0BF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 840762FB1D07C7D0000FD0BF /* Assets.xcassets */; };
-		840762FF1D07C7D0000FD0BF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 840762FD1D07C7D0000FD0BF /* LaunchScreen.storyboard */; };
-		840763291D07C894000FD0BF /* UIControl+YYAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = 840763241D07C894000FD0BF /* UIControl+YYAdd.m */; };
-		8407632A1D07C894000FD0BF /* UIView+YYAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = 840763261D07C894000FD0BF /* UIView+YYAdd.m */; };
-		8407632B1D07C894000FD0BF /* LFLivePreview.m in Sources */ = {isa = PBXBuildFile; fileRef = 840763281D07C894000FD0BF /* LFLivePreview.m */; };
-		840763351D07C899000FD0BF /* camra_beauty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8407632D1D07C899000FD0BF /* camra_beauty@2x.png */; };
-		840763361D07C899000FD0BF /* camra_beauty@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8407632E1D07C899000FD0BF /* camra_beauty@3x.png */; };
-		840763371D07C899000FD0BF /* camra_beauty_close@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8407632F1D07C899000FD0BF /* camra_beauty_close@2x.png */; };
-		840763381D07C899000FD0BF /* camra_beauty_close@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 840763301D07C899000FD0BF /* camra_beauty_close@3x.png */; };
-		840763391D07C899000FD0BF /* camra_preview@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 840763311D07C899000FD0BF /* camra_preview@2x.png */; };
-		8407633A1D07C899000FD0BF /* camra_preview@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 840763321D07C899000FD0BF /* camra_preview@3x.png */; };
-		8407633B1D07C899000FD0BF /* close_preview@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 840763331D07C899000FD0BF /* close_preview@2x.png */; };
-		8407633C1D07C899000FD0BF /* close_preview@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 840763341D07C899000FD0BF /* close_preview@3x.png */; };
+		81E848D8BD2C446C2DD4876A /* libPods-LFLiveKitDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9F92833FE7856CDDD3CED /* libPods-LFLiveKitDemo.a */; };
+		B2D23E7F1D348F3D00B34CA8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D23E7E1D348F3D00B34CA8 /* main.m */; };
+		B2D23E821D348F3D00B34CA8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D23E811D348F3D00B34CA8 /* AppDelegate.m */; };
+		B2D23E851D348F3D00B34CA8 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D23E841D348F3D00B34CA8 /* ViewController.m */; };
+		B2D23E881D348F3D00B34CA8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B2D23E861D348F3D00B34CA8 /* Main.storyboard */; };
+		B2D23E8D1D348F3D00B34CA8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B2D23E8B1D348F3D00B34CA8 /* LaunchScreen.storyboard */; };
+		B2D23EAA1D348F7100B34CA8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2D23E941D348F7100B34CA8 /* Assets.xcassets */; };
+		B2D23EAB1D348F7100B34CA8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B2D23E961D348F7100B34CA8 /* LaunchScreen.storyboard */; };
+		B2D23EAC1D348F7100B34CA8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B2D23E981D348F7100B34CA8 /* Main.storyboard */; };
+		B2D23EAD1D348F7100B34CA8 /* UIControl+YYAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D23E9C1D348F7100B34CA8 /* UIControl+YYAdd.m */; };
+		B2D23EAE1D348F7100B34CA8 /* UIView+YYAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D23E9E1D348F7100B34CA8 /* UIView+YYAdd.m */; };
+		B2D23EAF1D348F7100B34CA8 /* camra_beauty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2D23EA01D348F7100B34CA8 /* camra_beauty@2x.png */; };
+		B2D23EB01D348F7100B34CA8 /* camra_beauty@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2D23EA11D348F7100B34CA8 /* camra_beauty@3x.png */; };
+		B2D23EB11D348F7100B34CA8 /* camra_beauty_close@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2D23EA21D348F7100B34CA8 /* camra_beauty_close@2x.png */; };
+		B2D23EB21D348F7100B34CA8 /* camra_beauty_close@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2D23EA31D348F7100B34CA8 /* camra_beauty_close@3x.png */; };
+		B2D23EB31D348F7100B34CA8 /* camra_preview@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2D23EA41D348F7100B34CA8 /* camra_preview@2x.png */; };
+		B2D23EB41D348F7100B34CA8 /* camra_preview@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2D23EA51D348F7100B34CA8 /* camra_preview@3x.png */; };
+		B2D23EB51D348F7100B34CA8 /* close_preview@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2D23EA61D348F7100B34CA8 /* close_preview@2x.png */; };
+		B2D23EB61D348F7100B34CA8 /* close_preview@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2D23EA71D348F7100B34CA8 /* close_preview@3x.png */; };
+		B2D23EB71D348F7100B34CA8 /* LFLivePreview.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D23EA91D348F7100B34CA8 /* LFLivePreview.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		195672426061368F86F1F4FA /* Pods-LFLiveKitDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LFLiveKitDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-LFLiveKitDemo/Pods-LFLiveKitDemo.release.xcconfig"; sourceTree = "<group>"; };
-		5D506B5639A1D45519536773 /* libPods-LFLiveKitDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-LFLiveKitDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		7FAA55DD93CD7AB58E7A977A /* Pods-LFLiveKitDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LFLiveKitDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LFLiveKitDemo/Pods-LFLiveKitDemo.debug.xcconfig"; sourceTree = "<group>"; };
-		840762EC1D07C7D0000FD0BF /* LFLiveKitDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LFLiveKitDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		840762F01D07C7D0000FD0BF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		840762F21D07C7D0000FD0BF /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		840762F31D07C7D0000FD0BF /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		840762F51D07C7D0000FD0BF /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		840762F61D07C7D0000FD0BF /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		840762F91D07C7D0000FD0BF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		840762FB1D07C7D0000FD0BF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		840762FE1D07C7D0000FD0BF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		840763001D07C7D0000FD0BF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		840763091D07C7D0000FD0BF /* LFLiveKitDemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LFLiveKitDemoTests.m; sourceTree = "<group>"; };
-		8407630B1D07C7D0000FD0BF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		840763141D07C7D0000FD0BF /* LFLiveKitDemoUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LFLiveKitDemoUITests.m; sourceTree = "<group>"; };
-		840763161D07C7D0000FD0BF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		840763231D07C894000FD0BF /* UIControl+YYAdd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIControl+YYAdd.h"; sourceTree = "<group>"; };
-		840763241D07C894000FD0BF /* UIControl+YYAdd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIControl+YYAdd.m"; sourceTree = "<group>"; };
-		840763251D07C894000FD0BF /* UIView+YYAdd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+YYAdd.h"; sourceTree = "<group>"; };
-		840763261D07C894000FD0BF /* UIView+YYAdd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+YYAdd.m"; sourceTree = "<group>"; };
-		840763271D07C894000FD0BF /* LFLivePreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFLivePreview.h; sourceTree = "<group>"; };
-		840763281D07C894000FD0BF /* LFLivePreview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFLivePreview.m; sourceTree = "<group>"; };
-		8407632D1D07C899000FD0BF /* camra_beauty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty@2x.png"; sourceTree = "<group>"; };
-		8407632E1D07C899000FD0BF /* camra_beauty@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty@3x.png"; sourceTree = "<group>"; };
-		8407632F1D07C899000FD0BF /* camra_beauty_close@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty_close@2x.png"; sourceTree = "<group>"; };
-		840763301D07C899000FD0BF /* camra_beauty_close@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty_close@3x.png"; sourceTree = "<group>"; };
-		840763311D07C899000FD0BF /* camra_preview@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_preview@2x.png"; sourceTree = "<group>"; };
-		840763321D07C899000FD0BF /* camra_preview@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_preview@3x.png"; sourceTree = "<group>"; };
-		840763331D07C899000FD0BF /* close_preview@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "close_preview@2x.png"; sourceTree = "<group>"; };
-		840763341D07C899000FD0BF /* close_preview@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "close_preview@3x.png"; sourceTree = "<group>"; };
+		6FD9F92833FE7856CDDD3CED /* libPods-LFLiveKitDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-LFLiveKitDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		8FAAEBE1A4F099C69588B394 /* Pods-LFLiveKitDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LFLiveKitDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-LFLiveKitDemo/Pods-LFLiveKitDemo.release.xcconfig"; sourceTree = "<group>"; };
+		AFD491825C5DB2AD871189B5 /* Pods-LFLiveKitDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LFLiveKitDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LFLiveKitDemo/Pods-LFLiveKitDemo.debug.xcconfig"; sourceTree = "<group>"; };
+		B2D23E7A1D348F3D00B34CA8 /* LFLiveKitDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LFLiveKitDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		B2D23E7E1D348F3D00B34CA8 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		B2D23E801D348F3D00B34CA8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+		B2D23E811D348F3D00B34CA8 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		B2D23E831D348F3D00B34CA8 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
+		B2D23E841D348F3D00B34CA8 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
+		B2D23E871D348F3D00B34CA8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		B2D23E8C1D348F3D00B34CA8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		B2D23E8E1D348F3D00B34CA8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B2D23E941D348F7100B34CA8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		B2D23E971D348F7100B34CA8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
+		B2D23E991D348F7100B34CA8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Main.storyboard; sourceTree = "<group>"; };
+		B2D23E9B1D348F7100B34CA8 /* UIControl+YYAdd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIControl+YYAdd.h"; sourceTree = "<group>"; };
+		B2D23E9C1D348F7100B34CA8 /* UIControl+YYAdd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIControl+YYAdd.m"; sourceTree = "<group>"; };
+		B2D23E9D1D348F7100B34CA8 /* UIView+YYAdd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+YYAdd.h"; sourceTree = "<group>"; };
+		B2D23E9E1D348F7100B34CA8 /* UIView+YYAdd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+YYAdd.m"; sourceTree = "<group>"; };
+		B2D23EA01D348F7100B34CA8 /* camra_beauty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty@2x.png"; sourceTree = "<group>"; };
+		B2D23EA11D348F7100B34CA8 /* camra_beauty@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty@3x.png"; sourceTree = "<group>"; };
+		B2D23EA21D348F7100B34CA8 /* camra_beauty_close@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty_close@2x.png"; sourceTree = "<group>"; };
+		B2D23EA31D348F7100B34CA8 /* camra_beauty_close@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty_close@3x.png"; sourceTree = "<group>"; };
+		B2D23EA41D348F7100B34CA8 /* camra_preview@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_preview@2x.png"; sourceTree = "<group>"; };
+		B2D23EA51D348F7100B34CA8 /* camra_preview@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_preview@3x.png"; sourceTree = "<group>"; };
+		B2D23EA61D348F7100B34CA8 /* close_preview@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "close_preview@2x.png"; sourceTree = "<group>"; };
+		B2D23EA71D348F7100B34CA8 /* close_preview@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "close_preview@3x.png"; sourceTree = "<group>"; };
+		B2D23EA81D348F7100B34CA8 /* LFLivePreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFLivePreview.h; sourceTree = "<group>"; };
+		B2D23EA91D348F7100B34CA8 /* LFLivePreview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFLivePreview.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		840762E91D07C7D0000FD0BF /* Frameworks */ = {
+		B2D23E771D348F3D00B34CA8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				57B42059E84CC681C5C99B68 /* libPods-LFLiveKitDemo.a in Frameworks */,
+				81E848D8BD2C446C2DD4876A /* libPods-LFLiveKitDemo.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		713DA9EBCA308093C74917F9 /* Frameworks */ = {
+		2A74A5AD65CD9450ED23C3E0 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				5D506B5639A1D45519536773 /* libPods-LFLiveKitDemo.a */,
+				AFD491825C5DB2AD871189B5 /* Pods-LFLiveKitDemo.debug.xcconfig */,
+				8FAAEBE1A4F099C69588B394 /* Pods-LFLiveKitDemo.release.xcconfig */,
 			);
-			name = Frameworks;
+			name = Pods;
 			sourceTree = "<group>";
 		};
-		840762E31D07C7D0000FD0BF = {
+		B2D23E711D348F3D00B34CA8 = {
 			isa = PBXGroup;
 			children = (
-				840762EE1D07C7D0000FD0BF /* LFLiveKitDemo */,
-				840763081D07C7D0000FD0BF /* LFLiveKitDemoTests */,
-				840763131D07C7D0000FD0BF /* LFLiveKitDemoUITests */,
-				840762ED1D07C7D0000FD0BF /* Products */,
-				9BA1F10CECEAF692D0035AED /* Pods */,
-				713DA9EBCA308093C74917F9 /* Frameworks */,
+				B2D23E7C1D348F3D00B34CA8 /* LFLiveKitDemo */,
+				B2D23E7B1D348F3D00B34CA8 /* Products */,
+				2A74A5AD65CD9450ED23C3E0 /* Pods */,
+				E6AF2D0BFA2946745BB5F365 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
-		840762ED1D07C7D0000FD0BF /* Products */ = {
+		B2D23E7B1D348F3D00B34CA8 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				840762EC1D07C7D0000FD0BF /* LFLiveKitDemo.app */,
+				B2D23E7A1D348F3D00B34CA8 /* LFLiveKitDemo.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		840762EE1D07C7D0000FD0BF /* LFLiveKitDemo */ = {
+		B2D23E7C1D348F3D00B34CA8 /* LFLiveKitDemo */ = {
 			isa = PBXGroup;
 			children = (
-				840763221D07C894000FD0BF /* category */,
-				840763271D07C894000FD0BF /* LFLivePreview.h */,
-				840763281D07C894000FD0BF /* LFLivePreview.m */,
-				840762F21D07C7D0000FD0BF /* AppDelegate.h */,
-				840762F31D07C7D0000FD0BF /* AppDelegate.m */,
-				840762F51D07C7D0000FD0BF /* ViewController.h */,
-				840762F61D07C7D0000FD0BF /* ViewController.m */,
-				840762F81D07C7D0000FD0BF /* Main.storyboard */,
-				840762FB1D07C7D0000FD0BF /* Assets.xcassets */,
-				840762FD1D07C7D0000FD0BF /* LaunchScreen.storyboard */,
-				840763001D07C7D0000FD0BF /* Info.plist */,
-				840762EF1D07C7D0000FD0BF /* Supporting Files */,
+				B2D23E941D348F7100B34CA8 /* Assets.xcassets */,
+				B2D23E951D348F7100B34CA8 /* Base.lproj */,
+				B2D23E9A1D348F7100B34CA8 /* category */,
+				B2D23E9F1D348F7100B34CA8 /* images */,
+				B2D23EA81D348F7100B34CA8 /* LFLivePreview.h */,
+				B2D23EA91D348F7100B34CA8 /* LFLivePreview.m */,
+				B2D23E801D348F3D00B34CA8 /* AppDelegate.h */,
+				B2D23E811D348F3D00B34CA8 /* AppDelegate.m */,
+				B2D23E831D348F3D00B34CA8 /* ViewController.h */,
+				B2D23E841D348F3D00B34CA8 /* ViewController.m */,
+				B2D23E861D348F3D00B34CA8 /* Main.storyboard */,
+				B2D23E8B1D348F3D00B34CA8 /* LaunchScreen.storyboard */,
+				B2D23E8E1D348F3D00B34CA8 /* Info.plist */,
+				B2D23E7D1D348F3D00B34CA8 /* Supporting Files */,
 			);
 			path = LFLiveKitDemo;
 			sourceTree = "<group>";
 		};
-		840762EF1D07C7D0000FD0BF /* Supporting Files */ = {
+		B2D23E7D1D348F3D00B34CA8 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				8407632C1D07C899000FD0BF /* images */,
-				840762F01D07C7D0000FD0BF /* main.m */,
+				B2D23E7E1D348F3D00B34CA8 /* main.m */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		840763081D07C7D0000FD0BF /* LFLiveKitDemoTests */ = {
+		B2D23E951D348F7100B34CA8 /* Base.lproj */ = {
 			isa = PBXGroup;
 			children = (
-				840763091D07C7D0000FD0BF /* LFLiveKitDemoTests.m */,
-				8407630B1D07C7D0000FD0BF /* Info.plist */,
+				B2D23E961D348F7100B34CA8 /* LaunchScreen.storyboard */,
+				B2D23E981D348F7100B34CA8 /* Main.storyboard */,
 			);
-			path = LFLiveKitDemoTests;
+			path = Base.lproj;
 			sourceTree = "<group>";
 		};
-		840763131D07C7D0000FD0BF /* LFLiveKitDemoUITests */ = {
+		B2D23E9A1D348F7100B34CA8 /* category */ = {
 			isa = PBXGroup;
 			children = (
-				840763141D07C7D0000FD0BF /* LFLiveKitDemoUITests.m */,
-				840763161D07C7D0000FD0BF /* Info.plist */,
-			);
-			path = LFLiveKitDemoUITests;
-			sourceTree = "<group>";
-		};
-		840763221D07C894000FD0BF /* category */ = {
-			isa = PBXGroup;
-			children = (
-				840763231D07C894000FD0BF /* UIControl+YYAdd.h */,
-				840763241D07C894000FD0BF /* UIControl+YYAdd.m */,
-				840763251D07C894000FD0BF /* UIView+YYAdd.h */,
-				840763261D07C894000FD0BF /* UIView+YYAdd.m */,
+				B2D23E9B1D348F7100B34CA8 /* UIControl+YYAdd.h */,
+				B2D23E9C1D348F7100B34CA8 /* UIControl+YYAdd.m */,
+				B2D23E9D1D348F7100B34CA8 /* UIView+YYAdd.h */,
+				B2D23E9E1D348F7100B34CA8 /* UIView+YYAdd.m */,
 			);
 			path = category;
 			sourceTree = "<group>";
 		};
-		8407632C1D07C899000FD0BF /* images */ = {
+		B2D23E9F1D348F7100B34CA8 /* images */ = {
 			isa = PBXGroup;
 			children = (
-				8407632D1D07C899000FD0BF /* camra_beauty@2x.png */,
-				8407632E1D07C899000FD0BF /* camra_beauty@3x.png */,
-				8407632F1D07C899000FD0BF /* camra_beauty_close@2x.png */,
-				840763301D07C899000FD0BF /* camra_beauty_close@3x.png */,
-				840763311D07C899000FD0BF /* camra_preview@2x.png */,
-				840763321D07C899000FD0BF /* camra_preview@3x.png */,
-				840763331D07C899000FD0BF /* close_preview@2x.png */,
-				840763341D07C899000FD0BF /* close_preview@3x.png */,
+				B2D23EA01D348F7100B34CA8 /* camra_beauty@2x.png */,
+				B2D23EA11D348F7100B34CA8 /* camra_beauty@3x.png */,
+				B2D23EA21D348F7100B34CA8 /* camra_beauty_close@2x.png */,
+				B2D23EA31D348F7100B34CA8 /* camra_beauty_close@3x.png */,
+				B2D23EA41D348F7100B34CA8 /* camra_preview@2x.png */,
+				B2D23EA51D348F7100B34CA8 /* camra_preview@3x.png */,
+				B2D23EA61D348F7100B34CA8 /* close_preview@2x.png */,
+				B2D23EA71D348F7100B34CA8 /* close_preview@3x.png */,
 			);
 			path = images;
 			sourceTree = "<group>";
 		};
-		9BA1F10CECEAF692D0035AED /* Pods */ = {
+		E6AF2D0BFA2946745BB5F365 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				7FAA55DD93CD7AB58E7A977A /* Pods-LFLiveKitDemo.debug.xcconfig */,
-				195672426061368F86F1F4FA /* Pods-LFLiveKitDemo.release.xcconfig */,
+				6FD9F92833FE7856CDDD3CED /* libPods-LFLiveKitDemo.a */,
 			);
-			name = Pods;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		840762EB1D07C7D0000FD0BF /* LFLiveKitDemo */ = {
+		B2D23E791D348F3D00B34CA8 /* LFLiveKitDemo */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 840763191D07C7D0000FD0BF /* Build configuration list for PBXNativeTarget "LFLiveKitDemo" */;
+			buildConfigurationList = B2D23E911D348F3D00B34CA8 /* Build configuration list for PBXNativeTarget "LFLiveKitDemo" */;
 			buildPhases = (
-				7E4C7C5523618A0595228010 /* 📦 Check Pods Manifest.lock */,
-				840762E81D07C7D0000FD0BF /* Sources */,
-				840762E91D07C7D0000FD0BF /* Frameworks */,
-				840762EA1D07C7D0000FD0BF /* Resources */,
-				E4007BB7D4B0E165011BF22F /* 📦 Embed Pods Frameworks */,
-				64FCFF97E6544B1C8F282394 /* 📦 Copy Pods Resources */,
+				64B4341F5B9578C3E50D0608 /* 📦 Check Pods Manifest.lock */,
+				B2D23E761D348F3D00B34CA8 /* Sources */,
+				B2D23E771D348F3D00B34CA8 /* Frameworks */,
+				B2D23E781D348F3D00B34CA8 /* Resources */,
+				90A9D0B9FC19DB224CE96A04 /* 📦 Embed Pods Frameworks */,
+				5CD44155361B18A2D8700198 /* 📦 Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -202,24 +192,24 @@
 			);
 			name = LFLiveKitDemo;
 			productName = LFLiveKitDemo;
-			productReference = 840762EC1D07C7D0000FD0BF /* LFLiveKitDemo.app */;
+			productReference = B2D23E7A1D348F3D00B34CA8 /* LFLiveKitDemo.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
-		840762E41D07C7D0000FD0BF /* Project object */ = {
+		B2D23E721D348F3D00B34CA8 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0730;
-				ORGANIZATIONNAME = admin;
+				ORGANIZATIONNAME = zhanqi.tv;
 				TargetAttributes = {
-					840762EB1D07C7D0000FD0BF = {
+					B2D23E791D348F3D00B34CA8 = {
 						CreatedOnToolsVersion = 7.3;
 					};
 				};
 			};
-			buildConfigurationList = 840762E71D07C7D0000FD0BF /* Build configuration list for PBXProject "LFLiveKitDemo" */;
+			buildConfigurationList = B2D23E751D348F3D00B34CA8 /* Build configuration list for PBXProject "LFLiveKitDemo" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -227,39 +217,41 @@
 				en,
 				Base,
 			);
-			mainGroup = 840762E31D07C7D0000FD0BF;
-			productRefGroup = 840762ED1D07C7D0000FD0BF /* Products */;
+			mainGroup = B2D23E711D348F3D00B34CA8;
+			productRefGroup = B2D23E7B1D348F3D00B34CA8 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				840762EB1D07C7D0000FD0BF /* LFLiveKitDemo */,
+				B2D23E791D348F3D00B34CA8 /* LFLiveKitDemo */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		840762EA1D07C7D0000FD0BF /* Resources */ = {
+		B2D23E781D348F3D00B34CA8 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				840763371D07C899000FD0BF /* camra_beauty_close@2x.png in Resources */,
-				840762FF1D07C7D0000FD0BF /* LaunchScreen.storyboard in Resources */,
-				840763351D07C899000FD0BF /* camra_beauty@2x.png in Resources */,
-				840762FC1D07C7D0000FD0BF /* Assets.xcassets in Resources */,
-				8407633A1D07C899000FD0BF /* camra_preview@3x.png in Resources */,
-				840763381D07C899000FD0BF /* camra_beauty_close@3x.png in Resources */,
-				8407633C1D07C899000FD0BF /* close_preview@3x.png in Resources */,
-				8407633B1D07C899000FD0BF /* close_preview@2x.png in Resources */,
-				840762FA1D07C7D0000FD0BF /* Main.storyboard in Resources */,
-				840763391D07C899000FD0BF /* camra_preview@2x.png in Resources */,
-				840763361D07C899000FD0BF /* camra_beauty@3x.png in Resources */,
+				B2D23E8D1D348F3D00B34CA8 /* LaunchScreen.storyboard in Resources */,
+				B2D23EAA1D348F7100B34CA8 /* Assets.xcassets in Resources */,
+				B2D23EAC1D348F7100B34CA8 /* Main.storyboard in Resources */,
+				B2D23EAB1D348F7100B34CA8 /* LaunchScreen.storyboard in Resources */,
+				B2D23EB21D348F7100B34CA8 /* camra_beauty_close@3x.png in Resources */,
+				B2D23EAF1D348F7100B34CA8 /* camra_beauty@2x.png in Resources */,
+				B2D23EB61D348F7100B34CA8 /* close_preview@3x.png in Resources */,
+				B2D23EB41D348F7100B34CA8 /* camra_preview@3x.png in Resources */,
+				B2D23EB51D348F7100B34CA8 /* close_preview@2x.png in Resources */,
+				B2D23EB11D348F7100B34CA8 /* camra_beauty_close@2x.png in Resources */,
+				B2D23EB01D348F7100B34CA8 /* camra_beauty@3x.png in Resources */,
+				B2D23EB31D348F7100B34CA8 /* camra_preview@2x.png in Resources */,
+				B2D23E881D348F3D00B34CA8 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		64FCFF97E6544B1C8F282394 /* 📦 Copy Pods Resources */ = {
+		5CD44155361B18A2D8700198 /* 📦 Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -274,7 +266,7 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LFLiveKitDemo/Pods-LFLiveKitDemo-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		7E4C7C5523618A0595228010 /* 📦 Check Pods Manifest.lock */ = {
+		64B4341F5B9578C3E50D0608 /* 📦 Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -289,7 +281,7 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		E4007BB7D4B0E165011BF22F /* 📦 Embed Pods Frameworks */ = {
+		90A9D0B9FC19DB224CE96A04 /* 📦 Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -307,42 +299,58 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		840762E81D07C7D0000FD0BF /* Sources */ = {
+		B2D23E761D348F3D00B34CA8 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8407632B1D07C894000FD0BF /* LFLivePreview.m in Sources */,
-				840762F71D07C7D0000FD0BF /* ViewController.m in Sources */,
-				840763291D07C894000FD0BF /* UIControl+YYAdd.m in Sources */,
-				840762F41D07C7D0000FD0BF /* AppDelegate.m in Sources */,
-				8407632A1D07C894000FD0BF /* UIView+YYAdd.m in Sources */,
-				840762F11D07C7D0000FD0BF /* main.m in Sources */,
+				B2D23EB71D348F7100B34CA8 /* LFLivePreview.m in Sources */,
+				B2D23E851D348F3D00B34CA8 /* ViewController.m in Sources */,
+				B2D23EAD1D348F7100B34CA8 /* UIControl+YYAdd.m in Sources */,
+				B2D23E821D348F3D00B34CA8 /* AppDelegate.m in Sources */,
+				B2D23EAE1D348F7100B34CA8 /* UIView+YYAdd.m in Sources */,
+				B2D23E7F1D348F3D00B34CA8 /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		840762F81D07C7D0000FD0BF /* Main.storyboard */ = {
+		B2D23E861D348F3D00B34CA8 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
-				840762F91D07C7D0000FD0BF /* Base */,
+				B2D23E871D348F3D00B34CA8 /* Base */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
 		};
-		840762FD1D07C7D0000FD0BF /* LaunchScreen.storyboard */ = {
+		B2D23E8B1D348F3D00B34CA8 /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
-				840762FE1D07C7D0000FD0BF /* Base */,
+				B2D23E8C1D348F3D00B34CA8 /* Base */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
 		};
+		B2D23E961D348F7100B34CA8 /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				B2D23E971D348F7100B34CA8 /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+		B2D23E981D348F7100B34CA8 /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				B2D23E991D348F7100B34CA8 /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		840763171D07C7D0000FD0BF /* Debug */ = {
+		B2D23E8F1D348F3D00B34CA8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -365,6 +373,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -379,15 +388,17 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "$(inherited)";
 				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
-		840763181D07C7D0000FD0BF /* Release */ = {
+		B2D23E901D348F3D00B34CA8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -410,6 +421,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -418,38 +430,46 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "$(inherited)";
 				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
 		};
-		8407631A1D07C7D0000FD0BF /* Debug */ = {
+		B2D23E921D348F3D00B34CA8 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7FAA55DD93CD7AB58E7A977A /* Pods-LFLiveKitDemo.debug.xcconfig */;
+			baseConfigurationReference = AFD491825C5DB2AD871189B5 /* Pods-LFLiveKitDemo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = LFLiveKitDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.youku.LFLiveKit.LFLiveKitDemo;
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = com.gameabc.LFLiveKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
 		};
-		8407631B1D07C7D0000FD0BF /* Release */ = {
+		B2D23E931D348F3D00B34CA8 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 195672426061368F86F1F4FA /* Pods-LFLiveKitDemo.release.xcconfig */;
+			baseConfigurationReference = 8FAAEBE1A4F099C69588B394 /* Pods-LFLiveKitDemo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = LFLiveKitDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.youku.LFLiveKit.LFLiveKitDemo;
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = com.gameabc.LFLiveKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -457,25 +477,25 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		840762E71D07C7D0000FD0BF /* Build configuration list for PBXProject "LFLiveKitDemo" */ = {
+		B2D23E751D348F3D00B34CA8 /* Build configuration list for PBXProject "LFLiveKitDemo" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				840763171D07C7D0000FD0BF /* Debug */,
-				840763181D07C7D0000FD0BF /* Release */,
+				B2D23E8F1D348F3D00B34CA8 /* Debug */,
+				B2D23E901D348F3D00B34CA8 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		840763191D07C7D0000FD0BF /* Build configuration list for PBXNativeTarget "LFLiveKitDemo" */ = {
+		B2D23E911D348F3D00B34CA8 /* Build configuration list for PBXNativeTarget "LFLiveKitDemo" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				8407631A1D07C7D0000FD0BF /* Debug */,
-				8407631B1D07C7D0000FD0BF /* Release */,
+				B2D23E921D348F3D00B34CA8 /* Debug */,
+				B2D23E931D348F3D00B34CA8 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
-	rootObject = 840762E41D07C7D0000FD0BF /* Project object */;
+	rootObject = B2D23E721D348F3D00B34CA8 /* Project object */;
 }

LFLiveKitDemo/LFLiveKitDemo.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -27,6 +27,11 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>B2D23E791D348F3D00B34CA8</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 	</dict>
 </dict>
 </plist>

LFLiveKitDemo/LFLiveKitDemo.xcodeproj/xcuserdata/feng.xcuserdatad/xcschemes/LFLiveKitDemo.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B2D23E791D348F3D00B34CA8"
+               BuildableName = "LFLiveKitDemo.app"
+               BlueprintName = "LFLiveKitDemo"
+               ReferencedContainer = "container:LFLiveKitDemo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B2D23E791D348F3D00B34CA8"
+            BuildableName = "LFLiveKitDemo.app"
+            BlueprintName = "LFLiveKitDemo"
+            ReferencedContainer = "container:LFLiveKitDemo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B2D23E791D348F3D00B34CA8"
+            BuildableName = "LFLiveKitDemo.app"
+            BlueprintName = "LFLiveKitDemo"
+            ReferencedContainer = "container:LFLiveKitDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B2D23E791D348F3D00B34CA8"
+            BuildableName = "LFLiveKitDemo.app"
+            BlueprintName = "LFLiveKitDemo"
+            ReferencedContainer = "container:LFLiveKitDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

LFLiveKitDemo/LFLiveKitDemo.xcodeproj/xcuserdata/feng.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>LFLiveKitDemo.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>5</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>B2D23E791D348F3D00B34CA8</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

LFLiveKitDemo/LFLiveKitDemo.xcworkspace/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "0"
+   version = "2.0">
+</Bucket>

LFLiveKitDemo/LFLiveKitDemo/AppDelegate.m

@@ -7,6 +7,7 @@
 //
 
 #import "AppDelegate.h"
+#import "ViewController.h"
 
 @interface AppDelegate ()
 
@@ -17,9 +18,17 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
+    
+    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+//    UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:[[ViewController alloc] init]];
+//    nav.navigationBarHidden = YES;
+    self.window.rootViewController = [[ViewController alloc] init];
+    [self.window makeKeyAndVisible];
+    
     return YES;
 }
 
+
 - (void)applicationWillResignActive:(UIApplication *)application {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
     // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.

LFLiveKitDemo/LFLiveKitDemo/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -59,6 +59,11 @@
       "idiom" : "ipad",
       "size" : "76x76",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
     }
   ],
   "info" : {

LFLiveKitDemo/LFLiveKitDemo/Info.plist

@@ -22,10 +22,12 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

LFLiveKitDemo/LFLiveKitDemo/LFLivePreview.h

@@ -10,5 +10,4 @@
 
 @interface LFLivePreview : UIView
 
-
 @end

LFLiveKitDemo/LFLiveKitDemo/LFLivePreview.m

@@ -11,6 +11,25 @@
 #import "UIView+YYAdd.h"
 #import "LFLiveSession.h"
 
+inline static NSString *formatedSpeed(float bytes, float elapsed_milli) {
+    if (elapsed_milli <= 0) {
+        return @"N/A";
+    }
+
+    if (bytes <= 0) {
+        return @"0 KB/s";
+    }
+
+    float bytes_per_sec = ((float)bytes) * 1000.f /  elapsed_milli;
+    if (bytes_per_sec >= 1000 * 1000) {
+        return [NSString stringWithFormat:@"%.2f MB/s", ((float)bytes_per_sec) / 1000 / 1000];
+    } else if (bytes_per_sec >= 1000) {
+        return [NSString stringWithFormat:@"%.1f KB/s", ((float)bytes_per_sec) / 1000];
+    } else {
+        return [NSString stringWithFormat:@"%ld B/s", (long)bytes_per_sec];
+    }
+}
+
 @interface LFLivePreview ()<LFLiveSessionDelegate>
 
 @property (nonatomic, strong) UIButton *beautyButton;
@@ -26,8 +45,8 @@
 
 @implementation LFLivePreview
 
-- (instancetype)initWithFrame:(CGRect)frame{
-    if(self = [super initWithFrame:frame]){
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
         self.backgroundColor = [UIColor clearColor];
         [self requestAccessForVideo];
         [self requestAccessForAudio];
@@ -42,190 +61,195 @@
 }
 
 #pragma mark -- Public Method
-- (void)requestAccessForVideo{
+- (void)requestAccessForVideo {
     __weak typeof(self) _self = self;
     AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
     switch (status) {
-        case AVAuthorizationStatusNotDetermined:{
-            // 许可对话没有出现，发起授权许可
-            [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
+    case AVAuthorizationStatusNotDetermined: {
+        // 许可对话没有出现，发起授权许可
+        [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
                 if (granted) {
                     dispatch_async(dispatch_get_main_queue(), ^{
                         [_self.session setRunning:YES];
                     });
                 }
             }];
-            break;
-        }
-        case AVAuthorizationStatusAuthorized:{
-            // 已经开启授权，可继续
+        break;
+    }
+    case AVAuthorizationStatusAuthorized: {
+        // 已经开启授权，可继续
+        dispatch_async(dispatch_get_main_queue(), ^{
             [_self.session setRunning:YES];
-            break;
-        }
-        case AVAuthorizationStatusDenied:
-        case AVAuthorizationStatusRestricted:
-            // 用户明确地拒绝授权，或者相机设备无法访问
-            
-            break;
-        default:
-            break;
+        });
+        break;
+    }
+    case AVAuthorizationStatusDenied:
+    case AVAuthorizationStatusRestricted:
+        // 用户明确地拒绝授权，或者相机设备无法访问
+
+        break;
+    default:
+        break;
     }
 }
 
-- (void)requestAccessForAudio{
+- (void)requestAccessForAudio {
     AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio];
     switch (status) {
-        case AVAuthorizationStatusNotDetermined:{
-            [AVCaptureDevice requestAccessForMediaType:AVMediaTypeAudio completionHandler:^(BOOL granted) {
+    case AVAuthorizationStatusNotDetermined: {
+        [AVCaptureDevice requestAccessForMediaType:AVMediaTypeAudio completionHandler:^(BOOL granted) {
             }];
-            break;
-        }
-        case AVAuthorizationStatusAuthorized:{
-            break;
-        }
-        case AVAuthorizationStatusDenied:
-        case AVAuthorizationStatusRestricted:
-            break;
-        default:
-            break;
+        break;
+    }
+    case AVAuthorizationStatusAuthorized: {
+        break;
+    }
+    case AVAuthorizationStatusDenied:
+    case AVAuthorizationStatusRestricted:
+        break;
+    default:
+        break;
     }
 }
 
-
 #pragma mark -- LFStreamingSessionDelegate
 /** live status changed will callback */
-- (void)liveSession:(nullable LFLiveSession *)session liveStateDidChange:(LFLiveState)state{
+- (void)liveSession:(nullable LFLiveSession *)session liveStateDidChange:(LFLiveState)state {
     NSLog(@"liveStateDidChange: %ld", state);
     switch (state) {
-        case LFLiveReady:
-            _stateLabel.text = @"未连接";
-            break;
-        case LFLivePending:
-            _stateLabel.text = @"连接中";
-            break;
-        case LFLiveStart:
-            _stateLabel.text = @"已连接";
-            break;
-        case LFLiveError:
-            _stateLabel.text = @"连接错误";
-            break;
-        case LFLiveStop:
-            _stateLabel.text = @"未连接";
-            break;
-        default:
-            break;
+    case LFLiveReady:
+        _stateLabel.text = @"未连接";
+        break;
+    case LFLivePending:
+        _stateLabel.text = @"连接中";
+        break;
+    case LFLiveStart:
+        _stateLabel.text = @"已连接";
+        break;
+    case LFLiveError:
+        _stateLabel.text = @"连接错误";
+        break;
+    case LFLiveStop:
+        _stateLabel.text = @"未连接";
+        break;
+    default:
+        break;
     }
 }
 
 /** live debug info callback */
-- (void)liveSession:(nullable LFLiveSession *)session debugInfo:(nullable LFLiveDebug*)debugInfo{
-    NSLog(@"debugInfo: %lf", debugInfo.dataFlow);
+- (void)liveSession:(nullable LFLiveSession *)session debugInfo:(nullable LFLiveDebug *)debugInfo {
+    NSLog(@"debugInfo uploadSpeed: %@", formatedSpeed(debugInfo.currentBandwidth, debugInfo.elapsedMilli));
 }
 
 /** callback socket errorcode */
-- (void)liveSession:(nullable LFLiveSession*)session errorCode:(LFLiveSocketErrorCode)errorCode{
+- (void)liveSession:(nullable LFLiveSession *)session errorCode:(LFLiveSocketErrorCode)errorCode {
     NSLog(@"errorCode: %ld", errorCode);
 }
 
 #pragma mark -- Getter Setter
-- (LFLiveSession*)session{
-    if(!_session){
+- (LFLiveSession *)session {
+    if (!_session) {
+        /**      发现大家有不会用横屏的请注意啦，横屏需要在ViewController  supportedInterfaceOrientations修改方向  默认竖屏  ****/
+        /**      发现大家有不会用横屏的请注意啦，横屏需要在ViewController  supportedInterfaceOrientations修改方向  默认竖屏  ****/
+        /**      发现大家有不会用横屏的请注意啦，横屏需要在ViewController  supportedInterfaceOrientations修改方向  默认竖屏  ****/
+
+
         /***   默认分辨率368 ＊ 640  音频：44.1 iphone6以上48  双声道  方向竖屏 ***/
-        _session = [[LFLiveSession alloc] initWithAudioConfiguration:[LFLiveAudioConfiguration defaultConfiguration] videoConfiguration:[LFLiveVideoConfiguration defaultConfigurationForQuality:LFLiveVideoQuality_Medium2] liveType:LFLiveRTMP];
-        _session.delegate = self;
-        
+        _session = [[LFLiveSession alloc] initWithAudioConfiguration:[LFLiveAudioConfiguration defaultConfiguration] videoConfiguration:[LFLiveVideoConfiguration defaultConfigurationForQuality:LFLiveVideoQuality_Medium2 landscape:NO]];
+
         /**    自己定制单声道  */
         /*
-        LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
-        audioConfiguration.numberOfChannels = 1;
-        audioConfiguration.audioBitrate = LFLiveAudioBitRate_64Kbps;
-        audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
-        _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:[LFLiveVideoConfiguration defaultConfiguration] liveType:LFLiveRTMP];
-        */
-        
+           LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
+           audioConfiguration.numberOfChannels = 1;
+           audioConfiguration.audioBitrate = LFLiveAudioBitRate_64Kbps;
+           audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
+           _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:[LFLiveVideoConfiguration defaultConfiguration]];
+         */
+
         /**    自己定制高质量音频96K */
         /*
-        LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
-        audioConfiguration.numberOfChannels = 2;
-        audioConfiguration.audioBitrate = LFLiveAudioBitRate_96Kbps;
-        audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
-        _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:[LFLiveVideoConfiguration defaultConfiguration] liveType:LFLiveRTMP];
+           LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
+           audioConfiguration.numberOfChannels = 2;
+           audioConfiguration.audioBitrate = LFLiveAudioBitRate_96Kbps;
+           audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
+           _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:[LFLiveVideoConfiguration defaultConfiguration]];
          */
-    
+
         /**    自己定制高质量音频96K 分辨率设置为540*960 方向竖屏 */
-        
+
         /*
-        LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
-        audioConfiguration.numberOfChannels = 2;
-        audioConfiguration.audioBitrate = LFLiveAudioBitRate_96Kbps;
-        audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
-        
-        LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
-        videoConfiguration.videoSize = CGSizeMake(540, 960);
-        videoConfiguration.videoBitRate = 800*1024;
-        videoConfiguration.videoMaxBitRate = 1000*1024;
-        videoConfiguration.videoMinBitRate = 500*1024;
-        videoConfiguration.videoFrameRate = 24;
-        videoConfiguration.videoMaxKeyframeInterval = 48;
-        videoConfiguration.orientation = UIInterfaceOrientationPortrait;
-        videoConfiguration.sessionPreset = LFCaptureSessionPreset540x960;
-        
-        _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:videoConfiguration liveType:LFLiveRTMP];
-        */
-        
-        
+           LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
+           audioConfiguration.numberOfChannels = 2;
+           audioConfiguration.audioBitrate = LFLiveAudioBitRate_96Kbps;
+           audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
+
+           LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
+           videoConfiguration.videoSize = CGSizeMake(540, 960);
+           videoConfiguration.videoBitRate = 800*1024;
+           videoConfiguration.videoMaxBitRate = 1000*1024;
+           videoConfiguration.videoMinBitRate = 500*1024;
+           videoConfiguration.videoFrameRate = 24;
+           videoConfiguration.videoMaxKeyframeInterval = 48;
+           videoConfiguration.orientation = UIInterfaceOrientationPortrait;
+           videoConfiguration.sessionPreset = LFCaptureSessionPreset540x960;
+
+           _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:videoConfiguration];
+         */
+
+
         /**    自己定制高质量音频128K 分辨率设置为720*1280 方向竖屏 */
-        
+
         /*
-         LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
-         audioConfiguration.numberOfChannels = 2;
-         audioConfiguration.audioBitrate = LFLiveAudioBitRate_128Kbps;
-         audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
-         
-         LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
-         videoConfiguration.videoSize = CGSizeMake(720, 1280);
-         videoConfiguration.videoBitRate = 800*1024;
-         videoConfiguration.videoMaxBitRate = 1000*1024;
-         videoConfiguration.videoMinBitRate = 500*1024;
-         videoConfiguration.videoFrameRate = 15;
-         videoConfiguration.videoMaxKeyframeInterval = 30;
-         videoConfiguration.orientation = UIInterfaceOrientationPortrait;
-         videoConfiguration.sessionPreset = LFCaptureSessionPreset720x1280;
-         
-         _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:videoConfiguration liveType:LFLiveRTMP];
-        */
-        
-        
+           LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
+           audioConfiguration.numberOfChannels = 2;
+           audioConfiguration.audioBitrate = LFLiveAudioBitRate_128Kbps;
+           audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
+
+           LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
+           videoConfiguration.videoSize = CGSizeMake(720, 1280);
+           videoConfiguration.videoBitRate = 800*1024;
+           videoConfiguration.videoMaxBitRate = 1000*1024;
+           videoConfiguration.videoMinBitRate = 500*1024;
+           videoConfiguration.videoFrameRate = 15;
+           videoConfiguration.videoMaxKeyframeInterval = 30;
+           videoConfiguration.orientation = UIInterfaceOrientationPortrait;
+           videoConfiguration.sessionPreset = LFCaptureSessionPreset720x1280;
+
+           _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:videoConfiguration];
+         */
+
+
         /**    自己定制高质量音频128K 分辨率设置为720*1280 方向横屏  */
-        
+
         /*
-         LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
-         audioConfiguration.numberOfChannels = 2;
-         audioConfiguration.audioBitrate = LFLiveAudioBitRate_128Kbps;
-         audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
-         
-         LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
-         videoConfiguration.videoSize = CGSizeMake(1280, 720);
-         videoConfiguration.videoBitRate = 800*1024;
-         videoConfiguration.videoMaxBitRate = 1000*1024;
-         videoConfiguration.videoMinBitRate = 500*1024;
-         videoConfiguration.videoFrameRate = 15;
-         videoConfiguration.videoMaxKeyframeInterval = 30;
-         videoConfiguration.orientation = UIInterfaceOrientationLandscapeLeft;
-         videoConfiguration.sessionPreset = LFCaptureSessionPreset720x1280;
-         
-         _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:videoConfiguration liveType:LFLiveRTMP];
-        */
-        
-        
-        _session.running = YES;
+           LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
+           audioConfiguration.numberOfChannels = 2;
+           audioConfiguration.audioBitrate = LFLiveAudioBitRate_128Kbps;
+           audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
+
+           LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
+           videoConfiguration.videoSize = CGSizeMake(1280, 720);
+           videoConfiguration.videoBitRate = 800*1024;
+           videoConfiguration.videoMaxBitRate = 1000*1024;
+           videoConfiguration.videoMinBitRate = 500*1024;
+           videoConfiguration.videoFrameRate = 15;
+           videoConfiguration.videoMaxKeyframeInterval = 30;
+           videoConfiguration.landscape = YES;
+           videoConfiguration.sessionPreset = LFCaptureSessionPreset720x1280;
+
+           _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:videoConfiguration];
+         */
+
+        _session.delegate = self;
+        _session.showDebugInfo = NO;
         _session.preView = self;
     }
     return _session;
 }
 
-- (UIView*)containerView{
-    if(!_containerView){
+- (UIView *)containerView {
+    if (!_containerView) {
         _containerView = [UIView new];
         _containerView.frame = self.bounds;
         _containerView.backgroundColor = [UIColor clearColor];
@@ -234,8 +258,8 @@
     return _containerView;
 }
 
-- (UILabel*)stateLabel{
-    if(!_stateLabel){
+- (UILabel *)stateLabel {
+    if (!_stateLabel) {
         _stateLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, 20, 80, 40)];
         _stateLabel.text = @"未连接";
         _stateLabel.textColor = [UIColor whiteColor];
@@ -244,8 +268,8 @@
     return _stateLabel;
 }
 
-- (UIButton*)closeButton{
-    if(!_closeButton){
+- (UIButton *)closeButton {
+    if (!_closeButton) {
         _closeButton = [UIButton new];
         _closeButton.size = CGSizeMake(44, 44);
         _closeButton.left = self.width - 10 - _closeButton.width;
@@ -253,14 +277,14 @@
         [_closeButton setImage:[UIImage imageNamed:@"close_preview"] forState:UIControlStateNormal];
         _closeButton.exclusiveTouch = YES;
         [_closeButton addBlockForControlEvents:UIControlEventTouchUpInside block:^(id sender) {
-            
+
         }];
     }
     return _closeButton;
 }
 
-- (UIButton*)cameraButton{
-    if(!_cameraButton){
+- (UIButton *)cameraButton {
+    if (!_cameraButton) {
         _cameraButton = [UIButton new];
         _cameraButton.size = CGSizeMake(44, 44);
         _cameraButton.origin = CGPointMake(_closeButton.left - 10 - _cameraButton.width, 20);
@@ -275,11 +299,11 @@
     return _cameraButton;
 }
 
-- (UIButton*)beautyButton{
-    if(!_beautyButton){
+- (UIButton *)beautyButton {
+    if (!_beautyButton) {
         _beautyButton = [UIButton new];
         _beautyButton.size = CGSizeMake(44, 44);
-        _beautyButton.origin = CGPointMake(_cameraButton.left - 10 - _beautyButton.width,20);
+        _beautyButton.origin = CGPointMake(_cameraButton.left - 10 - _beautyButton.width, 20);
         [_beautyButton setImage:[UIImage imageNamed:@"camra_beauty"] forState:UIControlStateSelected];
         [_beautyButton setImage:[UIImage imageNamed:@"camra_beauty_close"] forState:UIControlStateNormal];
         _beautyButton.exclusiveTouch = YES;
@@ -292,8 +316,8 @@
     return _beautyButton;
 }
 
-- (UIButton*)startLiveButton{
-    if(!_startLiveButton){
+- (UIButton *)startLiveButton {
+    if (!_startLiveButton) {
         _startLiveButton = [UIButton new];
         _startLiveButton.size = CGSizeMake(self.width - 60, 44);
         _startLiveButton.left = 30;
@@ -307,13 +331,12 @@
         __weak typeof(self) _self = self;
         [_startLiveButton addBlockForControlEvents:UIControlEventTouchUpInside block:^(id sender) {
             _self.startLiveButton.selected = !_self.startLiveButton.selected;
-            if(_self.startLiveButton.selected){
+            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://daniulive.com:1935/live/stream2399";
+                stream.url = @"rtmp://live.hkstv.hk.lxdns.com:1935/live/stream123";
                 [_self.session startLive:stream];
-            }else{
+            } else {
                 [_self.startLiveButton setTitle:@"开始直播" forState:UIControlStateNormal];
                 [_self.session stopLive];
             }
@@ -323,3 +346,4 @@
 }
 
 @end
+

LFLiveKitDemo/LFLiveKitDemo/ViewController.m

@@ -26,4 +26,12 @@
     // Dispose of any resources that can be recreated.
 }
 
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return UIInterfaceOrientationMaskPortrait;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation {
+    return YES;
+}
+
 @end

LFLiveKitDemo/Podfile

@@ -1,8 +1,10 @@
 source 'https://github.com/CocoaPods/Specs.git'
 platform :ios,'8.0'
 
-target "LFLiveKitDemo" do
+target 'LFLiveKitDemo' do
 
-pod 'LFLiveKit', '~> 1.5.2'
 
-end
+
+end
+
+pod 'LFLiveKit', path: '../'

LFLiveKitSwiftDemo/.gitignore

@@ -0,0 +1,4 @@
+
+#CocoaPods
+Pods/
+Podfile.lock

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo.xcodeproj/project.pbxproj

@@ -0,0 +1,404 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		B289F1BE1D3DCD3000D9C7A5 /* camra_beauty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B289F1B61D3DCD3000D9C7A5 /* camra_beauty@2x.png */; };
+		B289F1BF1D3DCD3000D9C7A5 /* camra_beauty@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B289F1B71D3DCD3000D9C7A5 /* camra_beauty@3x.png */; };
+		B289F1C01D3DCD3000D9C7A5 /* camra_beauty_close@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B289F1B81D3DCD3000D9C7A5 /* camra_beauty_close@2x.png */; };
+		B289F1C11D3DCD3000D9C7A5 /* camra_beauty_close@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B289F1B91D3DCD3000D9C7A5 /* camra_beauty_close@3x.png */; };
+		B289F1C21D3DCD3000D9C7A5 /* camra_preview@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B289F1BA1D3DCD3000D9C7A5 /* camra_preview@2x.png */; };
+		B289F1C31D3DCD3000D9C7A5 /* camra_preview@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B289F1BB1D3DCD3000D9C7A5 /* camra_preview@3x.png */; };
+		B289F1C41D3DCD3000D9C7A5 /* close_preview@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B289F1BC1D3DCD3000D9C7A5 /* close_preview@2x.png */; };
+		B289F1C51D3DCD3000D9C7A5 /* close_preview@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B289F1BD1D3DCD3000D9C7A5 /* close_preview@3x.png */; };
+		B2C8FAC51D3DB8B3008D44B5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2C8FAC41D3DB8B3008D44B5 /* AppDelegate.swift */; };
+		B2C8FAC71D3DB8B3008D44B5 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2C8FAC61D3DB8B3008D44B5 /* ViewController.swift */; };
+		B2C8FACA1D3DB8B3008D44B5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B2C8FAC81D3DB8B3008D44B5 /* Main.storyboard */; };
+		B2C8FACC1D3DB8B3008D44B5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2C8FACB1D3DB8B3008D44B5 /* Assets.xcassets */; };
+		B2C8FACF1D3DB8B4008D44B5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B2C8FACD1D3DB8B4008D44B5 /* LaunchScreen.storyboard */; };
+		D76381970CDF6883DA800952 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C703895C713844AE5F37BC53 /* libPods.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		B289F1B61D3DCD3000D9C7A5 /* camra_beauty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty@2x.png"; sourceTree = "<group>"; };
+		B289F1B71D3DCD3000D9C7A5 /* camra_beauty@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty@3x.png"; sourceTree = "<group>"; };
+		B289F1B81D3DCD3000D9C7A5 /* camra_beauty_close@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty_close@2x.png"; sourceTree = "<group>"; };
+		B289F1B91D3DCD3000D9C7A5 /* camra_beauty_close@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_beauty_close@3x.png"; sourceTree = "<group>"; };
+		B289F1BA1D3DCD3000D9C7A5 /* camra_preview@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_preview@2x.png"; sourceTree = "<group>"; };
+		B289F1BB1D3DCD3000D9C7A5 /* camra_preview@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camra_preview@3x.png"; sourceTree = "<group>"; };
+		B289F1BC1D3DCD3000D9C7A5 /* close_preview@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "close_preview@2x.png"; sourceTree = "<group>"; };
+		B289F1BD1D3DCD3000D9C7A5 /* close_preview@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "close_preview@3x.png"; sourceTree = "<group>"; };
+		B2C8FAC11D3DB8B3008D44B5 /* LFLiveKitSwiftDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LFLiveKitSwiftDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		B2C8FAC41D3DB8B3008D44B5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		B2C8FAC61D3DB8B3008D44B5 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		B2C8FAC91D3DB8B3008D44B5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		B2C8FACB1D3DB8B3008D44B5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		B2C8FACE1D3DB8B4008D44B5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		B2C8FAD01D3DB8B4008D44B5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B2C8FAD61D3DB9D6008D44B5 /* LFLiveKitSwiftDemo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LFLiveKitSwiftDemo-Bridging-Header.h"; sourceTree = "<group>"; };
+		C5E86117C8AB61338C12909E /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
+		C703895C713844AE5F37BC53 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		FD5AE5787FDCE4BA8C28E2EE /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		B2C8FABE1D3DB8B3008D44B5 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D76381970CDF6883DA800952 /* libPods.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		0044BAB3BCE83EE63FB6F37C /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				FD5AE5787FDCE4BA8C28E2EE /* Pods.debug.xcconfig */,
+				C5E86117C8AB61338C12909E /* Pods.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+		656DB83DA3620FA72C6B7CF7 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				C703895C713844AE5F37BC53 /* libPods.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		B289F1B51D3DCD3000D9C7A5 /* images */ = {
+			isa = PBXGroup;
+			children = (
+				B289F1B61D3DCD3000D9C7A5 /* camra_beauty@2x.png */,
+				B289F1B71D3DCD3000D9C7A5 /* camra_beauty@3x.png */,
+				B289F1B81D3DCD3000D9C7A5 /* camra_beauty_close@2x.png */,
+				B289F1B91D3DCD3000D9C7A5 /* camra_beauty_close@3x.png */,
+				B289F1BA1D3DCD3000D9C7A5 /* camra_preview@2x.png */,
+				B289F1BB1D3DCD3000D9C7A5 /* camra_preview@3x.png */,
+				B289F1BC1D3DCD3000D9C7A5 /* close_preview@2x.png */,
+				B289F1BD1D3DCD3000D9C7A5 /* close_preview@3x.png */,
+			);
+			path = images;
+			sourceTree = "<group>";
+		};
+		B2C8FAB81D3DB8B3008D44B5 = {
+			isa = PBXGroup;
+			children = (
+				B2C8FAC31D3DB8B3008D44B5 /* LFLiveKitSwiftDemo */,
+				B2C8FAC21D3DB8B3008D44B5 /* Products */,
+				0044BAB3BCE83EE63FB6F37C /* Pods */,
+				656DB83DA3620FA72C6B7CF7 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		B2C8FAC21D3DB8B3008D44B5 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				B2C8FAC11D3DB8B3008D44B5 /* LFLiveKitSwiftDemo.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		B2C8FAC31D3DB8B3008D44B5 /* LFLiveKitSwiftDemo */ = {
+			isa = PBXGroup;
+			children = (
+				B289F1B51D3DCD3000D9C7A5 /* images */,
+				B2C8FAC41D3DB8B3008D44B5 /* AppDelegate.swift */,
+				B2C8FAC61D3DB8B3008D44B5 /* ViewController.swift */,
+				B2C8FAC81D3DB8B3008D44B5 /* Main.storyboard */,
+				B2C8FAD61D3DB9D6008D44B5 /* LFLiveKitSwiftDemo-Bridging-Header.h */,
+				B2C8FACB1D3DB8B3008D44B5 /* Assets.xcassets */,
+				B2C8FACD1D3DB8B4008D44B5 /* LaunchScreen.storyboard */,
+				B2C8FAD01D3DB8B4008D44B5 /* Info.plist */,
+			);
+			path = LFLiveKitSwiftDemo;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		B2C8FAC01D3DB8B3008D44B5 /* LFLiveKitSwiftDemo */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B2C8FAD31D3DB8B4008D44B5 /* Build configuration list for PBXNativeTarget "LFLiveKitSwiftDemo" */;
+			buildPhases = (
+				BAC96C6840291F2B616FE902 /* Check Pods Manifest.lock */,
+				B2C8FABD1D3DB8B3008D44B5 /* Sources */,
+				B2C8FABE1D3DB8B3008D44B5 /* Frameworks */,
+				B2C8FABF1D3DB8B3008D44B5 /* Resources */,
+				7490D167BE18C3C7DC2FE381 /* Copy Pods Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = LFLiveKitSwiftDemo;
+			productName = LFLiveKitSwiftDemo;
+			productReference = B2C8FAC11D3DB8B3008D44B5 /* LFLiveKitSwiftDemo.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		B2C8FAB91D3DB8B3008D44B5 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 0730;
+				LastUpgradeCheck = 0730;
+				ORGANIZATIONNAME = zhanqi.tv;
+				TargetAttributes = {
+					B2C8FAC01D3DB8B3008D44B5 = {
+						CreatedOnToolsVersion = 7.3;
+					};
+				};
+			};
+			buildConfigurationList = B2C8FABC1D3DB8B3008D44B5 /* Build configuration list for PBXProject "LFLiveKitSwiftDemo" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = B2C8FAB81D3DB8B3008D44B5;
+			productRefGroup = B2C8FAC21D3DB8B3008D44B5 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				B2C8FAC01D3DB8B3008D44B5 /* LFLiveKitSwiftDemo */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		B2C8FABF1D3DB8B3008D44B5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B289F1C01D3DCD3000D9C7A5 /* camra_beauty_close@2x.png in Resources */,
+				B2C8FACF1D3DB8B4008D44B5 /* LaunchScreen.storyboard in Resources */,
+				B289F1BE1D3DCD3000D9C7A5 /* camra_beauty@2x.png in Resources */,
+				B2C8FACC1D3DB8B3008D44B5 /* Assets.xcassets in Resources */,
+				B289F1C31D3DCD3000D9C7A5 /* camra_preview@3x.png in Resources */,
+				B289F1C11D3DCD3000D9C7A5 /* camra_beauty_close@3x.png in Resources */,
+				B289F1C51D3DCD3000D9C7A5 /* close_preview@3x.png in Resources */,
+				B289F1C41D3DCD3000D9C7A5 /* close_preview@2x.png in Resources */,
+				B2C8FACA1D3DB8B3008D44B5 /* Main.storyboard in Resources */,
+				B289F1C21D3DCD3000D9C7A5 /* camra_preview@2x.png in Resources */,
+				B289F1BF1D3DCD3000D9C7A5 /* camra_beauty@3x.png in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		7490D167BE18C3C7DC2FE381 /* Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		BAC96C6840291F2B616FE902 /* Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		B2C8FABD1D3DB8B3008D44B5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B2C8FAC71D3DB8B3008D44B5 /* ViewController.swift in Sources */,
+				B2C8FAC51D3DB8B3008D44B5 /* AppDelegate.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		B2C8FAC81D3DB8B3008D44B5 /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				B2C8FAC91D3DB8B3008D44B5 /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		B2C8FACD1D3DB8B4008D44B5 /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				B2C8FACE1D3DB8B4008D44B5 /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		B2C8FAD11D3DB8B4008D44B5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		B2C8FAD21D3DB8B4008D44B5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		B2C8FAD41D3DB8B4008D44B5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FD5AE5787FDCE4BA8C28E2EE /* Pods.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
+				INFOPLIST_FILE = LFLiveKitSwiftDemo/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.gameabc.laifeng.LFLiveKitSwiftDemo.LFLiveKitSwiftDemo;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "LFLiveKitSwiftDemo/LFLiveKitSwiftDemo-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		B2C8FAD51D3DB8B4008D44B5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = C5E86117C8AB61338C12909E /* Pods.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
+				INFOPLIST_FILE = LFLiveKitSwiftDemo/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.gameabc.laifeng.LFLiveKitSwiftDemo.LFLiveKitSwiftDemo;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "LFLiveKitSwiftDemo/LFLiveKitSwiftDemo-Bridging-Header.h";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		B2C8FABC1D3DB8B3008D44B5 /* Build configuration list for PBXProject "LFLiveKitSwiftDemo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				B2C8FAD11D3DB8B4008D44B5 /* Debug */,
+				B2C8FAD21D3DB8B4008D44B5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		B2C8FAD31D3DB8B4008D44B5 /* Build configuration list for PBXNativeTarget "LFLiveKitSwiftDemo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				B2C8FAD41D3DB8B4008D44B5 /* Debug */,
+				B2C8FAD51D3DB8B4008D44B5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = B2C8FAB91D3DB8B3008D44B5 /* Project object */;
+}

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:LFLiveKitSwiftDemo.xcodeproj">
+   </FileRef>
+</Workspace>

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo.xcodeproj/xcuserdata/feng.xcuserdatad/xcschemes/LFLiveKitSwiftDemo.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B2C8FAC01D3DB8B3008D44B5"
+               BuildableName = "LFLiveKitSwiftDemo.app"
+               BlueprintName = "LFLiveKitSwiftDemo"
+               ReferencedContainer = "container:LFLiveKitSwiftDemo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B2C8FAC01D3DB8B3008D44B5"
+            BuildableName = "LFLiveKitSwiftDemo.app"
+            BlueprintName = "LFLiveKitSwiftDemo"
+            ReferencedContainer = "container:LFLiveKitSwiftDemo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B2C8FAC01D3DB8B3008D44B5"
+            BuildableName = "LFLiveKitSwiftDemo.app"
+            BlueprintName = "LFLiveKitSwiftDemo"
+            ReferencedContainer = "container:LFLiveKitSwiftDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B2C8FAC01D3DB8B3008D44B5"
+            BuildableName = "LFLiveKitSwiftDemo.app"
+            BlueprintName = "LFLiveKitSwiftDemo"
+            ReferencedContainer = "container:LFLiveKitSwiftDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo.xcodeproj/xcuserdata/feng.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>LFLiveKitSwiftDemo.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>B2C8FAC01D3DB8B3008D44B5</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:LFLiveKitSwiftDemo.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo.xcworkspace/xcuserdata/feng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "0"
+   version = "2.0">
+</Bucket>

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo/AppDelegate.swift

@@ -0,0 +1,46 @@
+//
+//  AppDelegate.swift
+//  LFLiveKitSwiftDemo
+//
+//  Created by feng on 16/7/19.
+//  Copyright © 2016年 zhanqi.tv. All rights reserved.
+//
+
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+
+
+    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    func applicationWillResignActive(application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+    }
+
+    func applicationDidEnterBackground(application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
+
+    func applicationWillEnterForeground(application: UIApplication) {
+        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+    }
+
+    func applicationDidBecomeActive(application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+
+    func applicationWillTerminate(application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
+
+
+}
+

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo/Base.lproj/LaunchScreen.storyboard

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
+                        <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo/Base.lproj/Main.storyboard

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
+                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo/Info.plist

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo/LFLiveKitSwiftDemo-Bridging-Header.h

@@ -0,0 +1,10 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#ifndef LFLiveKitSwiftDemo_Bridging_H
+#define LFLiveKitSwiftDemo_Bridging_H
+
+#import <LFLiveKit.h>
+
+#endif

LFLiveKitSwiftDemo/LFLiveKitSwiftDemo/ViewController.swift

@@ -0,0 +1,222 @@
+//
+//  ViewController.swift
+//  LFLiveKitSwiftDemo
+//
+//  Created by feng on 16/7/19.
+//  Copyright © 2016年 zhanqi.tv. All rights reserved.
+//
+
+import UIKit
+
+class ViewController: UIViewController, LFLiveSessionDelegate {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do any additional setup after loading the view, typically from a nib.
+        self.requestAccessForVideo()
+        self.requestAccessForAudio()
+        self.view.backgroundColor = UIColor.clearColor()
+        self.view.addSubview(containerView)
+        containerView.addSubview(stateLabel)
+        containerView.addSubview(closeButton)
+        containerView.addSubview(beautyButton)
+        containerView.addSubview(cameraButton)
+        containerView.addSubview(startLiveButton)
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+  
+    //MARK: AccessAuth
+    
+    func requestAccessForVideo() -> Void {
+        let status = AVCaptureDevice.authorizationStatusForMediaType(AVMediaTypeVideo)
+        switch status  {
+            // 许可对话没有出现，发起授权许可
+            case AVAuthorizationStatus.NotDetermined:
+                AVCaptureDevice.requestAccessForMediaType(AVMediaTypeVideo, completionHandler: { (granted) in
+                    if (granted) {
+                        dispatch_async(dispatch_get_main_queue(), {
+                            self.session.running = true;
+                        });
+                    }
+                })
+                break;
+            // 已经开启授权，可继续
+            case AVAuthorizationStatus.Authorized:
+                session.running = true;
+                break;
+            // 用户明确地拒绝授权，或者相机设备无法访问
+            case AVAuthorizationStatus.Denied: break
+            case AVAuthorizationStatus.Restricted:break;
+            default:
+                break;
+        }
+    }
+    
+    func requestAccessForAudio() -> Void {
+        let status = AVCaptureDevice.authorizationStatusForMediaType(AVMediaTypeAudio)
+        switch status  {
+        // 许可对话没有出现，发起授权许可
+        case AVAuthorizationStatus.NotDetermined:
+            AVCaptureDevice.requestAccessForMediaType(AVMediaTypeAudio, completionHandler: { (granted) in
+            })
+            break;
+        // 已经开启授权，可继续
+        case AVAuthorizationStatus.Authorized:
+            break;
+        // 用户明确地拒绝授权，或者相机设备无法访问
+        case AVAuthorizationStatus.Denied: break
+        case AVAuthorizationStatus.Restricted:break;
+        default:
+            break;
+        }
+    }
+    
+    //MARK: - Callbacks
+    
+    // 回调
+    func liveSession(session: LFLiveSession?, debugInfo: LFLiveDebug?) {
+        print("debugInfo: \(debugInfo?.currentBandwidth)")
+    }
+    
+    func liveSession(session: LFLiveSession?, errorCode: LFLiveSocketErrorCode) {
+        print("errorCode: \(errorCode.rawValue)")
+    }
+    
+    func liveSession(session: LFLiveSession?, liveStateDidChange state: LFLiveState) {
+        print("liveStateDidChange: \(state.rawValue)")
+        switch state {
+            case LFLiveState.Ready:
+                stateLabel.text = "未连接"
+                break;
+            case LFLiveState.Pending:
+                stateLabel.text = "连接中"
+                break;
+            case LFLiveState.Start:
+                stateLabel.text = "已连接"
+                break;
+            case LFLiveState.Error:
+                stateLabel.text = "连接错误"
+                break;
+            case LFLiveState.Stop:
+                stateLabel.text = "未连接"
+                break;
+            default:
+                stateLabel.text = "未知"
+                break;
+        }
+    }
+    
+    //MARK: - Events
+    
+    // 开始直播
+    func didTappedStartLiveButton(button: UIButton) -> Void {
+        startLiveButton.selected = !startLiveButton.selected;
+        if (startLiveButton.selected) {
+            startLiveButton.setTitle("结束直播", forState: UIControlState.Normal)
+            let stream = LFLiveStreamInfo()
+            stream.url = "rtmp://30.96.179.95:1935/live/1234"
+            session.startLive(stream)
+        } else {
+            startLiveButton.setTitle("开始直播", forState: UIControlState.Normal)
+            session.stopLive()
+        }
+    }
+    
+    // 美颜
+    func didTappedBeautyButton(button: UIButton) -> Void {
+        session.beautyFace = !session.beautyFace;
+        beautyButton.selected = !session.beautyFace;
+    }
+    
+    // 摄像头
+    func didTappedCameraButton(button: UIButton) -> Void {
+        let devicePositon = session.captureDevicePosition;
+        session.captureDevicePosition = (devicePositon == AVCaptureDevicePosition.Back) ? AVCaptureDevicePosition.Front : AVCaptureDevicePosition.Back;
+    }
+    
+    // 关闭
+    func didTappedCloseButton(button: UIButton) -> Void  {
+        
+    }
+    
+    //MARK: - Getters and Setters
+    
+    //  默认分辨率368 ＊ 640  音频：44.1 iphone6以上48  双声道  方向竖屏
+    lazy var session: LFLiveSession = {
+        let audioConfiguration = LFLiveAudioConfiguration.defaultConfiguration()
+        let videoConfiguration = LFLiveVideoConfiguration.defaultConfigurationForQuality(LFLiveVideoQuality.Low3, landscape: false)
+        let session = LFLiveSession(audioConfiguration: audioConfiguration, videoConfiguration: videoConfiguration)
+        
+        session?.delegate = self
+        session?.preView = self.view
+        return session!
+    }()
+    
+    // 视图
+    lazy var containerView: UIView = {
+        let containerView = UIView(frame: CGRect(x: 0, y: 0, width: self.view.bounds.size.width, height: self.view.bounds.size.height))
+        containerView.backgroundColor = UIColor.clearColor()
+        containerView.autoresizingMask = [UIViewAutoresizing.FlexibleHeight, UIViewAutoresizing.FlexibleHeight]
+        return containerView
+    }()
+    
+    // 状态Label
+    lazy var stateLabel: UILabel = {
+        let stateLabel = UILabel(frame: CGRect(x: 20, y: 20, width: 80, height: 40))
+        stateLabel.text = "未连接"
+        stateLabel.textColor = UIColor.whiteColor()
+        stateLabel.font = UIFont.systemFontOfSize(14)
+        return stateLabel
+    }()
+    
+    // 关闭按钮
+    lazy var closeButton: UIButton = {
+        let closeButton = UIButton(frame: CGRect(x: self.view.frame.width - 10 - 44, y: 20, width: 44, height: 44))
+        closeButton.setImage(UIImage(named: "close_preview"), forState: UIControlState.Normal)
+        closeButton.addTarget(self, action: #selector(didTappedCloseButton(_:)), forControlEvents: UIControlEvents.TouchUpInside)
+        return closeButton
+    }()
+        
+    // 摄像头
+    lazy var cameraButton: UIButton = {
+        let cameraButton = UIButton(frame: CGRect(x: self.view.frame.width - 54 * 2, y: 20, width: 44, height: 44))
+        cameraButton.setImage(UIImage(named: "camra_preview"), forState: UIControlState.Normal)
+        cameraButton.addTarget(self, action: #selector(didTappedCameraButton(_:)), forControlEvents: UIControlEvents.TouchUpInside)
+        return cameraButton
+    }()
+    
+    // 摄像头
+    lazy var beautyButton: UIButton = {
+        let beautyButton = UIButton(frame: CGRect(x: self.view.frame.width - 54 * 3, y: 20, width: 44, height: 44))
+        beautyButton.setImage(UIImage(named: "camra_preview"), forState: UIControlState.Selected)
+        beautyButton.setImage(UIImage(named: "camra_beauty_close"), forState: UIControlState.Normal)
+        beautyButton.addTarget(self, action: #selector(didTappedBeautyButton(_:)), forControlEvents: UIControlEvents.TouchUpInside)
+        return beautyButton
+    }()
+    
+    // 开始直播按钮
+    lazy var startLiveButton: UIButton = {
+        let startLiveButton = UIButton(frame: CGRect(x: 30, y: self.view.frame.height - 50, width: self.view.frame.width - 10 - 44, height: 44))
+        startLiveButton.layer.cornerRadius = 22
+        startLiveButton.setTitleColor(UIColor.blackColor(), forState:UIControlState.Normal)
+        startLiveButton.setTitle("开始直播", forState: UIControlState.Normal)
+        startLiveButton.titleLabel!.font = UIFont.systemFontOfSize(14)
+        startLiveButton.backgroundColor = UIColor(colorLiteralRed: 50, green: 32, blue: 245, alpha: 1)
+        startLiveButton.addTarget(self, action: #selector(didTappedStartLiveButton(_:)), forControlEvents: UIControlEvents.TouchUpInside)
+        return startLiveButton
+    }()
+    
+    // 转屏
+    override func supportedInterfaceOrientations() -> UIInterfaceOrientationMask {
+        return UIInterfaceOrientationMask.Portrait
+    }
+    
+    override func shouldAutorotate() -> Bool {
+        return true
+    }
+}
+

LFLiveKitSwiftDemo/Podfile

@@ -1,8 +1,4 @@
 source 'https://github.com/CocoaPods/Specs.git'
 platform :ios,'8.0'
 
-target "LFLiveKitDemo" do
-
-pod 'LFLiveKit', '~> 1.5.2'
-
-end
+pod 'LFLiveKit', path: '../'

Podfile

@@ -1,10 +1,10 @@
 source 'https://github.com/CocoaPods/Specs.git'
 platform :ios,'8.0'
 
-target "LFLiveKit" do
+target 'LFLiveKit' do
 
-pod 'CocoaAsyncSocket', '~> 7.4.1'
-pod 'pili-librtmp', '~> 1.0.2'
+end
+
+pod 'pili-librtmp', '~> 1.0.3'
 pod 'LMGPUImage', '~> 0.1.9'
 
-end

README.md

@@ -3,99 +3,113 @@
 [![License MIT](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://raw.githubusercontent.com/chenliming777/LFLiveKit/master/LICENSE) 
 [![CocoaPods](http://img.shields.io/cocoapods/v/LFLiveKit.svg?style=flat)](http://cocoapods.org/?q=LFLiveKit) 
 [![Support](https://img.shields.io/badge/support-ios8%2B-orange.svg)](https://www.apple.com/nl/ios/) 
-
 ![platform](https://img.shields.io/badge/platform-ios-ff69b4.svg) 
 
-LFLiveKit
+## LFLiveKit
 
-	LFLiveKit IOS mobile phone push code，Default format support RTMP and FLV，At the same time, the structure is very easy to extend.
+**LFLiveKit is a opensource RTMP streaming SDK for iOS.**  
+
+## Features
+
+- [x] 	Background recording
+- [x] 	Support horizontal vertical recording
+- [x] 	Support Beauty Face With GPUImage
+- [x] 	Support H264+AAC Hardware Encoding
+- [x] 	Drop frames on bad network 
+- [x] 	Dynamic switching rate
+- [x] 	Audio configuration
+- [x] 	Video configuration
+- [x] 	RTMP Transport
+- [x] 	Switch camera position
+- [x] 	Audio Mute
+- [x] 	Support Send Buffer
+- [x] 	Swift Support
+- [ ] 	~~FLV package and send~~
+
+  
+## Installation
+
+#### CocoaPods
+	# To integrate LFLiveKit into your Xcode project using CocoaPods, specify it in your Podfile:
 
-Podfile
-	To integrate LFLiveKit into your Xcode project using CocoaPods, specify it in your Podfile:
-	
 	source 'https://github.com/CocoaPods/Specs.git'
 	platform :ios, '8.0'
 	pod 'LFLiveKit'
 	
-	Then, run the following command:
+	# Then, run the following command:
 	$ pod install
 
 
-Functional
-
-	Background recording
-	Support horizontal vertical recording
-	GPUImage Beauty
-	H264 Hard coding
-	AAC Hard coding
-	Weak network lost frame
-	Dynamic switching rate
-	Audio configuration
-	Video configuration
-	RTMP Transport
-	Switch camera
-	Audio Mute
-	Support Send Buffer
-	FLV package and send
-  
-
-Architecture
+## Architecture:
 
 	capture: LFAudioCapture and  LFVideoCapture
 	encode:  LFHardwareAudioEncoder and LFHardwareVideoEncoder
-	publish: LFStreamRtmpSocket LFStreamTcpSocket
+	publish: LFStreamRtmpSocket
 	
-Usage
-	
-	- (LFLiveSession*)session{
-    if(!_session){
-_session = [[LFLiveSession alloc] initWithAudioConfiguration:[LFLiveAudioConfiguration defaultConfiguration] videoConfiguration:[LFLiveVideoConfiguration defaultConfiguration] liveType:LFLiveRTMP];
-        _session.running = YES;
+## Usage:
+#### Objective-C
+```
+- (LFLiveSession*)session {
+    if (!_session) {
+        _session = [[LFLiveSession alloc] initWithAudioConfiguration:[LFLiveAudioConfiguration defaultConfiguration] videoConfiguration:[LFLiveVideoConfiguration defaultConfiguration]];
         _session.preView = self;
+        _session.delegate = self;
     }
     return _session;
-	}
-	
-	- (LFLiveSession*)session{
-    if(!_session){
-        LFLiveAudioConfiguration *audioConfiguration = [LFLiveAudioConfiguration new];
-         audioConfiguration.numberOfChannels = 2;
-         audioConfiguration.audioBitrate = LFLiveAudioBitRate_128Kbps;
-         audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
-         
-         LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
-         videoConfiguration.videoSize = CGSizeMake(1280, 720);
-         videoConfiguration.videoBitRate = 800*1024;
-         videoConfiguration.videoMaxBitRate = 1000*1024;
-         videoConfiguration.videoMinBitRate = 500*1024;
-         videoConfiguration.videoFrameRate = 15;
-         videoConfiguration.videoMaxKeyframeInterval = 30;
-         videoConfiguration.orientation = UIInterfaceOrientationLandscapeLeft;
-         videoConfiguration.sessionPreset = LFCaptureSessionPreset720x1280;
-         
-         _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration 				videoConfiguration:videoConfiguration liveType:LFLiveRTMP];
-        _session.running = YES;
-        _session.preView = self;
-    }
-    return _session;
-	}
+}
 	
+- (void)startLive {	
 	LFLiveStreamInfo *streamInfo = [LFLiveStreamInfo new];
 	streamInfo.url = @"your server rtmp url";
 	[self.session startLive:streamInfo];
+}
+
+- (void)stopLive {
 	[self.session stopLive];
+}
+
+//MARK: - CallBack:
+- (void)liveSession:(nullable LFLiveSession *)session liveStateDidChange: (LFLiveState)state;
+- (void)liveSession:(nullable LFLiveSession *)session debugInfo:(nullable LFLiveDebug*)debugInfo;
+- (void)liveSession:(nullable LFLiveSession*)session errorCode:(LFLiveSocketErrorCode)errorCode;
 	
-	CallBack:
-	- (void)liveSession:(nullable LFLiveSession *)session liveStateDidChange: (LFLiveState)state;
-	- (void)liveSession:(nullable LFLiveSession *)session debugInfo:(nullable LFLiveDebug*)debugInfo;
-	- (void)liveSession:(nullable LFLiveSession*)session errorCode:(LFLiveSocketErrorCode)errorCode;
-	
- License
- 
- 	LFLiveKit is released under the MIT license. See LICENSE for details.
-	
-
-
+```
+#### Swift
+
+```
+// import LFLiveKit in [ProjectName]-Bridging-Header.h
+import <LFLiveKit.h> 
+
+//MARK: - Getters and Setters
+lazy var session: LFLiveSession = {
+    let audioConfiguration = LFLiveAudioConfiguration.defaultConfiguration()
+    let videoConfiguration = LFLiveVideoConfiguration.defaultConfigurationForQuality(LFLiveVideoQuality.Low3, landscape: false)
+    let session = LFLiveSession(audioConfiguration: audioConfiguration, videoConfiguration: videoConfiguration)
+        
+    session?.delegate = self
+    session?.preView = self.view
+    return session!
+}()
+
+//MARK: - Event
+func startLive() -> Void { 
+    let stream = LFLiveStreamInfo()
+    stream.url = "your server rtmp url";
+    session.startLive(stream)
+}
+
+func stopLive() -> Void {
+    session.stopLive()
+}
+
+//MARK: - Callback
+func liveSession(session: LFLiveSession?, debugInfo: LFLiveDebug?) 
+func liveSession(session: LFLiveSession?, errorCode: LFLiveSocketErrorCode)
+func liveSession(session: LFLiveSession?, liveStateDidChange state: LFLiveState)
+```
+
+## License
+ **LFLiveKit is released under the MIT license. See LICENSE for details.**
 
 
 

uncrustify.cfg

@@ -0,0 +1,643 @@
+#
+# Uncrustify Configuration File
+# File Created With UncrustifyX 0.4.3 (252)
+#
+
+# Alignment
+# ---------
+
+## Alignment
+
+# Align ObjC declaration params on colon
+align_oc_decl_colon                     = true          # boolean (false/true)
+
+# Align function prototypes on operator keyword
+align_on_operator                       = false         # boolean (false/true)
+
+# Align on tabstop
+align_on_tabstop                        = false         # boolean (false/true)
+
+# Align open brace of single-line functions
+align_single_line_brace                 = false         # boolean (false/true)
+
+# Align parameters in single-line functions with same name
+align_same_func_call_params             = false         # boolean (false/true)
+
+# Align single-line functions with function prototypes
+align_single_line_func                  = false         # boolean (false/true)
+
+# Align variable definitions
+align_func_params                       = false         # boolean (false/true)
+
+# Align with tabs
+align_with_tabs                         = false         # boolean (false/true)
+
+# Keep non-indenting tabs
+align_keep_tabs                         = false         # boolean (false/true)
+
+# Left-align numbers
+align_number_left                       = false         # boolean (false/true)
+
+## Alignment Span
+
+# Alignment span for ObjC message colons
+align_oc_msg_colon_span                 = 16            # number
+
+# Alignment span for ObjC message spec
+align_oc_msg_spec_span                  = 0             # number
+
+# Alignment span for assignment
+align_assign_span                       = 0             # number
+
+# Alignment span for variable definitions
+align_var_def_span                      = 0             # number
+
+## Alignment Style
+
+# Alignment style for ampersand in typedefs
+align_typedef_amp_style                 = 2             # number
+
+# Alignment style for ampersand in variable definitions
+align_var_def_amp_style                 = 1             # number
+
+# Alignment style for star in typedefs
+align_typedef_star_style                = 2             # number
+
+# Alignment style for star in variable definitions
+align_var_def_star_style                = 1             # number
+
+## Other
+
+# Align attribute after variable name
+align_var_def_attribute                 = false         # boolean (false/true)
+
+# Align colon in struct bit fields
+align_var_def_colon                     = false         # boolean (false/true)
+
+# Align comments after close brace and endif
+align_right_cmt_mix                     = false         # boolean (false/true)
+
+# Align inline struct/enum/union variable definitions
+align_var_def_inline                    = false         # boolean (false/true)
+
+# Align left shift operators on new lines
+align_left_shift                        = true          # boolean (false/true)
+
+# Align macros wrapped with backslash and newline
+align_nl_cont                           = false         # boolean (false/true)
+
+# Mix aligining prototype and variable declarations
+align_mix_var_proto                     = false         # boolean (false/true)
+
+# Blank Lines
+# -----------
+
+## Newline After
+
+# Newline after multiline comment
+nl_after_multiline_comment              = false         # boolean (false/true)
+
+## Newline Count After
+
+# Newline count after function body
+nl_after_func_body                      = 2             # number
+
+## Other
+
+# Remove blank lines after open brace
+eat_blanks_after_open_brace             = false         # boolean (false/true)
+
+# Remove blank lines before close brace
+eat_blanks_before_close_brace           = false         # boolean (false/true)
+
+# Code-Modifying
+# --------------
+
+## Braces
+
+# Braces on chained if/elseif/else statements
+mod_full_brace_if_chain                 = false         # boolean (false/true)
+
+## Other
+
+# Move break in fully-braced case before close brace
+mod_move_case_break                     = false         # boolean (false/true)
+
+# Remove empty return as last statement in function
+mod_remove_empty_return                 = false         # boolean (false/true)
+
+## Parentheses
+
+# Add parentheses on while and if statements around bool
+mod_full_paren_if_bool                  = false         # boolean (false/true)
+
+## Semicolons
+
+# Change optional semicolons to real semicolons
+mod_pawn_semicolon                      = false         # boolean (false/true)
+
+# Remove superflous semicolons
+mod_remove_extra_semicolon              = false         # boolean (false/true)
+
+## Sorting
+
+# Sort consecutive import statements
+mod_sort_import                         = false         # boolean (false/true)
+
+# Sort include statements
+mod_sort_include                        = false         # boolean (false/true)
+
+# Sort using statements
+mod_sort_using                          = false         # boolean (false/true)
+
+# Comments
+# --------
+
+## Empty Lines
+
+# Empty first line for multi-line C comments
+cmt_c_nl_start                          = false         # boolean (false/true)
+
+# Empty first line for multi-line C++ comments
+cmt_cpp_nl_start                        = false         # boolean (false/true)
+
+# Empty last line for multi-line C comments
+cmt_c_nl_end                            = false         # boolean (false/true)
+
+# Empty last line for multi-line C++ comments
+cmt_cpp_nl_end                          = false         # boolean (false/true)
+
+## Other
+
+# Change C++ comments to C comments
+cmt_cpp_to_c                            = false         # boolean (false/true)
+
+# Group C comments
+cmt_c_group                             = false         # boolean (false/true)
+
+# Group C++ comments
+cmt_cpp_group                           = false         # boolean (false/true)
+
+# Indent multi-line comments
+cmt_indent_multi                        = true          # boolean (false/true)
+
+# Insert function comment if preprocessor statement
+cmt_insert_before_preproc               = false         # boolean (false/true)
+
+# Remove leading spaces from multi-line comments
+cmt_multi_check_last                    = true          # boolean (false/true)
+
+# Stars on multi-line comments
+cmt_star_cont                           = false         # boolean (false/true)
+
+# General
+# -------
+
+## Other
+
+# Interpret >=
+tok_split_gte                           = false         # boolean (false/true)
+
+# Indentation
+# -----------
+
+## Indentation
+
+# Disable indenting class braces
+indent_braces_no_class                  = false         # boolean (false/true)
+
+# Disable indenting function braces
+indent_braces_no_func                   = false         # boolean (false/true)
+
+# Disable indenting struct braces
+indent_braces_no_struct                 = false         # boolean (false/true)
+
+# Double indent size for Indentation options
+indent_func_param_double                = false         # boolean (false/true)
+
+# Indent ObjC block
+indent_oc_block                         = true          # boolean (false/true)
+
+# Indent braces
+indent_braces                           = false         # boolean (false/true)
+
+# Indent class body
+indent_class                            = false         # boolean (false/true)
+
+# Indent class variable constructors
+indent_func_ctor_var_param              = false         # boolean (false/true)
+
+# Indent continued function call parameters
+indent_func_call_param                  = false         # boolean (false/true)
+
+# Indent function call parameters in class declarations
+indent_func_class_param                 = false         # boolean (false/true)
+
+# Indent function definition parameters
+indent_func_def_param                   = false         # boolean (false/true)
+
+# Indent function prototype parameters
+indent_func_proto_param                 = false         # boolean (false/true)
+
+# Indent template parameters
+indent_template_param                   = false         # boolean (false/true)
+
+## Indentation Size
+
+# Indent size based on brace parent
+indent_brace_parent                     = false         # boolean (false/true)
+
+# Indentation column size
+indent_columns                          = 4             # number
+
+## Other
+
+# Align continued statements at equals
+indent_align_assign                     = true          # boolean (false/true)
+
+# Align strings broken by backslash
+indent_align_string                     = false         # boolean (false/true)
+
+# Indent BOOL inside parentheses
+indent_bool_paren                       = false         # boolean (false/true)
+
+# Indent after class colon
+indent_class_colon                      = false         # boolean (false/true)
+
+# Indent code after access specifier
+indent_access_spec_body                 = false         # boolean (false/true)
+
+# Indent comma inside parentheses
+indent_comma_paren                      = false         # boolean (false/true)
+
+# Indent comments in first column
+indent_col1_comment                     = false         # boolean (false/true)
+
+# Indent comments with tabs
+indent_cmt_with_tabs                    = false         # boolean (false/true)
+
+# Indent content after open square followed by newline
+indent_square_nl                        = false         # boolean (false/true)
+
+# Indent continued variable declarations
+indent_var_def_cont                     = false         # boolean (false/true)
+
+# Indent else\nif
+indent_else_if                          = false         # boolean (false/true)
+
+# Indent extern body
+indent_extern                           = false         # boolean (false/true)
+
+# Indent namespace body
+indent_namespace                        = false         # boolean (false/true)
+
+# Indent newline content after open parenthesis
+indent_paren_nl                         = false         # boolean (false/true)
+
+# Indent relative single line comments
+indent_relative_single_line_comments    = false         # boolean (false/true)
+
+# Indent with tabs
+indent_with_tabs                        = 0             # number
+
+# Indentation of first BOOL expression
+indent_first_bool_expr                  = false         # boolean (false/true)
+
+# Preserve SQL indentation
+indent_preserve_sql                     = false         # boolean (false/true)
+
+# Line-Splitting
+# --------------
+
+## Splitting
+
+# Split long for statements at semicolons
+ls_for_split_full                       = false         # boolean (false/true)
+
+# Split long function prototypes/calls at commas
+ls_func_split_full                      = false         # boolean (false/true)
+
+# Newlines
+# --------
+
+## Merging
+
+# Change unbraced for statements into one-liner
+nl_create_for_one_liner                 = false         # boolean (false/true)
+
+# Change unbraced if statements into one-liner
+nl_create_if_one_liner                  = false         # boolean (false/true)
+
+# Change unbraced while statements into one-liner
+nl_create_while_one_liner               = false         # boolean (false/true)
+
+## Newline After
+
+# Newline after brace close
+nl_after_brace_close                    = false         # boolean (false/true)
+
+# Newline after brace open
+nl_after_brace_open                     = false         # boolean (false/true)
+
+# Newline after brace open comment
+nl_after_brace_open_cmt                 = false         # boolean (false/true)
+
+# Newline after case statement
+nl_after_case                           = false         # boolean (false/true)
+
+# Newline after macro multi-line definition
+nl_multi_line_define                    = false         # boolean (false/true)
+
+# Newline after return
+nl_after_return                         = false         # boolean (false/true)
+
+# Newline after semicolon
+nl_after_semicolon                      = false         # boolean (false/true)
+
+# Newline after virtual brace close
+nl_after_vbrace_close                   = false         # boolean (false/true)
+
+# Newline after virtual brace open
+nl_after_vbrace_open                    = false         # boolean (false/true)
+
+# Newline after virtual brace open with empty body
+nl_after_vbrace_open_empty              = false         # boolean (false/true)
+
+## Newline Before
+
+# Newline before case statement
+nl_before_case                          = false         # boolean (false/true)
+
+## Newline Between
+
+# Newline between catch and open brace
+nl_catch_brace                          = remove        # string (add/force/ignore/remove)
+
+# Newline between close brace and catch
+nl_brace_catch                          = remove        # string (add/force/ignore/remove)
+
+# Newline between close brace and else
+nl_brace_else                           = remove        # string (add/force/ignore/remove)
+
+# Newline between close brace and finally
+nl_brace_finally                        = remove        # string (add/force/ignore/remove)
+
+# Newline between close brace and while
+nl_brace_while                          = remove        # string (add/force/ignore/remove)
+
+# Newline between close parenthesis and open brace in multi line conditional
+nl_multi_line_cond                      = false         # boolean (false/true)
+
+# Newline between do and open brace
+nl_do_brace                             = remove        # string (add/force/ignore/remove)
+
+# Newline between else and if
+nl_else_if                              = remove        # string (add/force/ignore/remove)
+
+# Newline between else and open brace
+nl_else_brace                           = remove        # string (add/force/ignore/remove)
+
+# Newline between else if and open brace
+nl_elseif_brace                         = remove        # string (add/force/ignore/remove)
+
+# Newline between enum and open brace
+nl_enum_brace                           = remove        # string (add/force/ignore/remove)
+
+# Newline between finally and open brace
+nl_finally_brace                        = remove        # string (add/force/ignore/remove)
+
+# Newline between for and open brace
+nl_for_brace                            = remove        # string (add/force/ignore/remove)
+
+# Newline between function call and open brace
+nl_fcall_brace                          = remove        # string (add/force/ignore/remove)
+
+# Newline between function signature and open brace
+nl_fdef_brace                           = remove        # string (add/force/ignore/remove)
+
+# Newline between if and open brace
+nl_if_brace                             = remove        # string (add/force/ignore/remove)
+
+# Newline between struct and open brace
+nl_struct_brace                         = remove        # string (add/force/ignore/remove)
+
+# Newline between switch and open brace
+nl_switch_brace                         = remove        # string (add/force/ignore/remove)
+
+# Newline between try and open brace
+nl_try_brace                            = remove        # string (add/force/ignore/remove)
+
+# Newline between union and open brace
+nl_union_brace                          = remove        # string (add/force/ignore/remove)
+
+# Newline between while and open brace
+nl_while_brace                          = remove        # string (add/force/ignore/remove)
+
+## Other
+
+# Alter newlines in #define macros
+nl_define_macro                         = false         # boolean (false/true)
+
+# Blank lines after preprocessor if/else
+nl_squeeze_ifdef                        = false         # boolean (false/true)
+
+# Collapse empty blocks between braces
+nl_collapse_empty_body                  = false         # boolean (false/true)
+
+# Double space before close brace of struct/union/enum
+nl_ds_struct_enum_close_brace           = false         # boolean (false/true)
+
+# Double space commented entries in struct/enum
+nl_ds_struct_enum_cmt                   = false         # boolean (false/true)
+
+## Splitting
+
+# Don’t split one-line braced assignments
+nl_assign_leave_one_liners              = false         # boolean (false/true)
+
+# Don’t split one-line braced statements
+nl_class_leave_one_liners               = false         # boolean (false/true)
+
+# Don’t split one-line enums
+nl_enum_leave_one_liners                = false         # boolean (false/true)
+
+# Don’t split one-line function definitions
+nl_func_leave_one_liners                = false         # boolean (false/true)
+
+# Don’t split one-line get/set functions
+nl_getset_leave_one_liners              = false         # boolean (false/true)
+
+# Don’t split one-line if/else statements
+nl_if_leave_one_liners                  = false         # boolean (false/true)
+
+# Other
+# -----
+
+## Other
+
+# Force encoding UTF-8
+utf8_force                              = false         # boolean (false/true)
+
+# UTF-8 output if file contains bytes > 128 and < 255
+utf8_byte                               = false         # boolean (false/true)
+
+# Preprocessor
+# ------------
+
+## Indentation
+
+# Indent preprocessor define
+pp_define_at_level                      = false         # boolean (false/true)
+
+# Indent preprocessor if/else/endif
+pp_if_indent_code                       = false         # boolean (false/true)
+
+# Indent preprocessor if/else/endif at level
+pp_indent_at_level                      = false         # boolean (false/true)
+
+# Indent preprocessor regions
+pp_region_indent_code                   = false         # boolean (false/true)
+
+# Spacing
+# -------
+
+## Other
+
+# Balance spaces inside nested parentheses
+sp_balance_nested_parens                = false         # boolean (false/true)
+
+## Space After
+
+# Space after ObjC block caret
+sp_after_oc_block_caret                 = remove        # string (add/force/ignore/remove)
+
+# Space after ObjC colon
+sp_after_oc_colon                       = remove        # string (add/force/ignore/remove)
+
+# Space after ObjC message colon
+sp_after_send_oc_colon                  = remove        # string (add/force/ignore/remove)
+
+# Space after ObjC message receiver
+sp_after_oc_msg_receiver                = force         # string (add/force/ignore/remove)
+
+# Space after ObjC return type
+sp_after_oc_return_type                 = remove        # string (add/force/ignore/remove)
+
+# Space after ObjC scope
+sp_after_oc_scope                       = force         # string (add/force/ignore/remove)
+
+# Space after ObjC type
+sp_after_oc_type                        = remove        # string (add/force/ignore/remove)
+
+# Space after cast
+sp_after_cast                           = remove        # string (add/force/ignore/remove)
+
+# Space after comma
+sp_after_comma                          = force         # string (add/force/ignore/remove)
+
+# Space after condition close parenthesis
+sp_after_sparen                         = force         # string (add/force/ignore/remove)
+
+# Space after operator
+sp_after_operator                       = force         # string (add/force/ignore/remove)
+
+# Space after pointer star
+sp_after_ptr_star                       = remove        # string (add/force/ignore/remove)
+
+## Space Around
+
+# Space around assignment operator
+sp_assign                               = force         # string (add/force/ignore/remove)
+
+# Space around boolean operators
+sp_bool                                 = force         # string (add/force/ignore/remove)
+
+# Space around compare operators
+sp_compare                              = force         # string (add/force/ignore/remove)
+
+# Space around ternary condition colon
+sp_cond_colon                           = force         # string (add/force/ignore/remove)
+
+# Space around ternary condition question mark
+sp_cond_question                        = force         # string (add/force/ignore/remove)
+
+## Space Before
+
+# Space before ObjC block caret
+sp_before_oc_block_caret                = remove        # string (add/force/ignore/remove)
+
+# Space before ObjC colon
+sp_before_oc_colon                      = remove        # string (add/force/ignore/remove)
+
+# Space before ObjC message colon
+sp_before_send_oc_colon                 = remove        # string (add/force/ignore/remove)
+
+# Space before comma
+sp_before_comma                         = remove        # string (add/force/ignore/remove)
+
+# Space before if/for/switch/while open parenthesis
+sp_before_sparen                        = force         # string (add/force/ignore/remove)
+
+# Space before pointer star
+sp_before_ptr_star                      = force         # string (add/force/ignore/remove)
+
+# Space before semicolon
+sp_before_semi                          = remove        # string (add/force/ignore/remove)
+
+# Space before unnamed pointer star
+sp_before_unnamed_ptr_star              = force         # string (add/force/ignore/remove)
+
+## Space Between
+
+# Space between @selector and open parenthesis
+sp_after_oc_at_sel                      = remove        # string (add/force/ignore/remove)
+
+# Space between close brace and else
+sp_brace_else                           = force         # string (add/force/ignore/remove)
+
+# Space between close parenthesis and open brace
+sp_paren_brace                          = remove        # string (add/force/ignore/remove)
+
+# Space between closing brace and finally
+sp_brace_finally                        = force         # string (add/force/ignore/remove)
+
+# Space between else and open brace
+sp_else_brace                           = force         # string (add/force/ignore/remove)
+
+# Space between finally and open brace
+sp_finally_brace                        = force         # string (add/force/ignore/remove)
+
+# Space between function name and empty parentheses
+sp_func_call_paren_empty                = remove        # string (add/force/ignore/remove)
+
+# Space between function name and open parenthesis
+sp_func_call_paren                      = remove        # string (add/force/ignore/remove)
+
+# Space between function name and open parenthesis in function definition
+sp_func_def_paren                       = remove        # string (add/force/ignore/remove)
+
+# Space between sizeof and open parenthesis
+sp_sizeof_paren                         = remove        # string (add/force/ignore/remove)
+
+# Space between try and open brace
+sp_try_brace                            = force         # string (add/force/ignore/remove)
+
+## Space Inside
+
+# Space inside @selector() parens
+sp_inside_oc_at_sel_parens              = remove        # string (add/force/ignore/remove)
+
+# Space inside cast parentheses
+sp_inside_paren_cast                    = remove        # string (add/force/ignore/remove)
+
+# Space inside function parentheses
+sp_inside_fparen                        = remove        # string (add/force/ignore/remove)
+
+# Space inside if-condition close parenthesis
+sp_inside_sparen_close                  = remove        # string (add/force/ignore/remove)
+
+# Space inside if-condition parentheses
+sp_inside_sparen                        = remove        # string (add/force/ignore/remove)
+
+# Space inside parentheses
+sp_inside_paren                         = remove        # string (add/force/ignore/remove)