modify...

Author: chenliming

LFLiveKit.podspec

@@ -2,15 +2,15 @@
 Pod::Spec.new do |s|
 
   s.name         = "LFLiveKit"
-  s.version      = "1.4.1"
+  s.version      = "1.5"
   s.summary      = "LaiFeng ios Live. LFLiveKit."
   s.homepage     = "https://github.com/chenliming777"
   s.license      = { :type => "MIT", :file => "FILE_LICENSE" }
   s.author       = { "chenliming" => "chenliming777@qq.com" }
   s.platform     = :ios, "8.0"
   s.ios.deployment_target = "8.0"
   s.source       = { :git => "https://github.com/LaiFengiOS/LFLiveKit", :tag => "#{s.version}" }
-  s.source_files  = "LFLiveKit/**/*.{h,m}"
+  s.source_files  = "LFLiveKit/**/*.{*}"
   s.public_header_files = "LFLiveKit/**/*.h"
 
   s.frameworks = "VideoToolbox", "AudioToolbox","AVFoundation","Foundation","UIKit"

LFLiveKit.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate

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

LFLiveKit/Info.plist

@@ -17,6 +17,13 @@
 
 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>
@@ -82,7 +89,7 @@ typedef void (^ LFRequestComplete)(_Nullable id info,NSError *_Nullable errorMsg
  The designated initializer. Multiple instances with the same configuration will make the
  capture unstable.
  */
-- (nullable instancetype)initWithAudioConfiguration:(nullable LFLiveAudioConfiguration*)audioConfiguration videoConfiguration:(nullable LFLiveVideoConfiguration*)videoConfiguration NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithAudioConfiguration:(nullable LFLiveAudioConfiguration*)audioConfiguration videoConfiguration:(nullable LFLiveVideoConfiguration*)videoConfiguration liveType:(LFLiveType)liveType NS_DESIGNATED_INITIALIZER;
 
 /** The start stream .*/
 - (void)startLive:(nonnull LFLiveStreamInfo*)streamInfo;

LFLiveKit/LFLiveSession.h

@@ -12,6 +12,7 @@
 #import "LFHardwareVideoEncoder.h"
 #import "LFHardwareAudioEncoder.h"
 #import "LFStreamRtmpSocket.h"
+#import "LFStreamTcpSocket.h"
 #import "LFLiveStreamInfo.h"
 
 #define LFLiveReportKey @"com.youku.liveSessionReport"
@@ -20,6 +21,8 @@ @interface LFLiveSession ()<LFAudioCaptureDelegate,LFVideoCaptureDelegate,LFAudi
 {
     dispatch_semaphore_t _lock;
 }
+///流媒体格式
+@property (nonatomic, assign) LFLiveType liveType;
 ///音频配置
 @property (nonatomic, strong) LFLiveAudioConfiguration *audioConfiguration;
 ///视频配置
@@ -62,11 +65,12 @@ @interface LFLiveSession ()
 @implementation LFLiveSession
 
 #pragma mark -- LifeCycle
-- (instancetype)initWithAudioConfiguration:(LFLiveAudioConfiguration *)audioConfiguration videoConfiguration:(LFLiveVideoConfiguration *)videoConfiguration{
+- (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]){
         _audioConfiguration = audioConfiguration;
         _videoConfiguration = videoConfiguration;
+        _liveType = liveType;
         _lock = dispatch_semaphore_create(1);
     }
     return self;
@@ -235,7 +239,11 @@ - (LFVideoCapture*)videoCaptureSource{
 
 - (id<LFStreamSocket>)socket{
     if(!_socket){
-        _socket = [[LFStreamRtmpSocket alloc] initWithStream:self.streamInfo];
+        if(self.liveType == LFLiveRTMP){
+            _socket = [[LFStreamRtmpSocket alloc] initWithStream:self.streamInfo];
+        }else if(self.liveType == LFLiveFLV){
+            _socket = [[LFStreamTcpSocket alloc] initWithStream:self.streamInfo videoSize:self.videoConfiguration.videoSize reconnectInterval:self.reconnectInterval reconnectCount:self.reconnectCount];
+        }
         [_socket setDelegate:self];
     }
     return _socket;

LFLiveKit/LFLiveSession.m

@@ -0,0 +1,20 @@
+//
+//  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