添加demo

vasicvuk · Oct 20, 2016 · 1d7b1f7 · 1d7b1f7
1 parent 47f3505
commit 1d7b1f7
Show file tree

Hide file tree

Showing 301 changed files with 11,480 additions and 295 deletions.
diff --git a/FrameWork/LFLiveKit.xcodeproj/project.pbxproj b/FrameWork/LFLiveKit.xcodeproj/project.pbxproj
diff --git a/FrameWork/LFLiveKitFramework/Info.plist b/FrameWork/LFLiveKitFramework/Info.plist
@@ -0,0 +1,24 @@
+<?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>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/FrameWork/LFLiveKitFramework/LFLiveKitFramework.h b/FrameWork/LFLiveKitFramework/LFLiveKitFramework.h
@@ -0,0 +1,26 @@
+//
+//  LFLiveKitFramework.h
+//  LFLiveKitFramework
+//
+//  Created by admin on 2016/10/20.
+//  Copyright © 2016年 admin. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for LFLiveKitFramework.
+FOUNDATION_EXPORT double LFLiveKitFrameworkVersionNumber;
+
+//! Project version string for LFLiveKitFramework.
+FOUNDATION_EXPORT const unsigned char LFLiveKitFrameworkVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <LFLiveKitFramework/PublicHeader.h>
+
+#import <LFLiveKit/LFLiveSession.h>
+#import <LFLiveKit/LFLiveAudioConfiguration.h>
+#import <LFLiveKit/LFLiveVideoConfiguration.h>
+#import <LFLiveKit/LFAudioFrame.h>
+#import <LFLiveKit/LFFrame.h>
+#import <LFLiveKit/LFLiveStreamInfo.h>
+#import <LFLiveKit/LFVideoFrame.h>
+#import <LFLiveKit/LFLiveDebug.h>
diff --git a/FrameWork/Podfile b/FrameWork/Podfile
diff --git a/LFLiveKit/LFLiveKit.h b/LFLiveKit/LFLiveKit.h
@@ -6,16 +6,9 @@
 //  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFLiveSession.h>
-#import <LFLiveKit/LFLiveAudioConfiguration.h>
-#import <LFLiveKit/LFLiveVideoConfiguration.h>
-#import <LFLiveKit/LFAudioFrame.h>
-#import <LFLiveKit/LFFrame.h>
-#import <LFLiveKit/LFLiveStreamInfo.h>
-#import <LFLiveKit/LFVideoFrame.h>
-#import <LFLiveKit/LFLiveDebug.h>
-#else
+#ifndef LFLiveKit_h
+#define LFLiveKit_h
+
 #import "LFLiveSession.h"
 #import "LFLiveAudioConfiguration.h"
 #import "LFLiveVideoConfiguration.h"
@@ -24,5 +17,6 @@
 #import "LFLiveStreamInfo.h"
 #import "LFVideoFrame.h"
 #import "LFLiveDebug.h"
+
 #endif
 
diff --git a/LFLiveKit/LFLiveSession.h b/LFLiveKit/LFLiveSession.h
@@ -9,23 +9,13 @@
 
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFLiveStreamInfo.h>
-#import <LFLiveKit/LFAudioFrame.h>
-#import <LFLiveKit/LFVideoFrame.h>
-#import <LFLiveKit/LFLiveAudioConfiguration.h>
-#import <LFLiveKit/LFLiveVideoConfiguration.h>
-#import <LFLiveKit/LFLiveDebug.h>
-#else
 #import "LFLiveStreamInfo.h"
 #import "LFAudioFrame.h"
 #import "LFVideoFrame.h"
 #import "LFLiveAudioConfiguration.h"
 #import "LFLiveVideoConfiguration.h"
 #import "LFLiveDebug.h"
 
-#endif
-
 
 
 typedef NS_ENUM(NSInteger,LFLiveCaptureType) {

diff --git a/LFLiveKit/capture/LFAudioCapture.h b/LFLiveKit/capture/LFAudioCapture.h
@@ -8,12 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
-
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFLiveAudioConfiguration.h>
-#else
 #import "LFLiveAudioConfiguration.h"
-#endif
 
 #pragma mark -- AudioCaptureNotification
 /** compoentFialed will post the notification */

diff --git a/LFLiveKit/capture/LFVideoCapture.h b/LFLiveKit/capture/LFVideoCapture.h
@@ -8,12 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
-
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFLiveVideoConfiguration.h>
-#else
 #import "LFLiveVideoConfiguration.h"
-#endif
 
 @class LFVideoCapture;
 /** LFVideoCapture callback videoData */

diff --git a/LFLiveKit/coder/H264/LFAVEncoder.h b/LFLiveKit/coder/H264/LFAVEncoder.h
@@ -13,13 +13,8 @@
 #import <AVFoundation/AVVideoSettings.h>
 #import <sys/stat.h>
 
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFVideoEncoder.h>
-#import <LFLiveKit/LFMP4Atom.h>
-#else
 #import "LFVideoEncoder.h"
 #import "LFMP4Atom.h"
-#endif
 
 
 

diff --git a/LFLiveKit/coder/LFAudioEncoding.h b/LFLiveKit/coder/LFAudioEncoding.h
@@ -8,13 +8,8 @@
 
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFAudioFrame.h>
-#import <LFLiveKit/LFLiveAudioConfiguration.h>
-#else
 #import "LFAudioFrame.h"
 #import "LFLiveAudioConfiguration.h"
-#endif
 
 
 

diff --git a/LFLiveKit/coder/LFH264VideoEncoder.h b/LFLiveKit/coder/LFH264VideoEncoder.h
@@ -6,11 +6,7 @@
 //  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFVideoEncoding.h>
-#else
 #import "LFVideoEncoding.h"
-#endif
 
 @interface LFH264VideoEncoder : NSObject <LFVideoEncoding> {
 

diff --git a/LFLiveKit/coder/LFHardwareAudioEncoder.h b/LFLiveKit/coder/LFHardwareAudioEncoder.h
@@ -6,11 +6,7 @@
 //  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFAudioEncoding.h>
-#else
 #import "LFAudioEncoding.h"
-#endif
 
 @interface LFHardwareAudioEncoder : NSObject<LFAudioEncoding>
 

diff --git a/LFLiveKit/coder/LFHardwareAudioEncoder.m b/LFLiveKit/coder/LFHardwareAudioEncoder.m
@@ -176,17 +176,12 @@ - (BOOL)createAudioConvert { //根据输入样本初始化一个编码转换器
     OSStatus result = AudioConverterNewSpecific(&inputFormat, &outputFormat, 2, requestedCodecs, &m_converter);;
     UInt32 outputBitrate = _configuration.audioBitrate;
     UInt32 propSize = sizeof(outputBitrate);
-    //    UInt32 outputPacketSize = 0;
 
 
     if(result == noErr) {
         result = AudioConverterSetProperty(m_converter, kAudioConverterEncodeBitRate, propSize, &outputBitrate);
     }
 
-    //    if(result == noErr) {
-    //        AudioConverterGetProperty(m_converter, kAudioConverterPropertyMaximumOutputPacketSize, &propSize, &outputPacketSize);
-    //    }
-
     return YES;
 }
 

diff --git a/LFLiveKit/coder/LFHardwareVideoEncoder.h b/LFLiveKit/coder/LFHardwareVideoEncoder.h
@@ -6,11 +6,7 @@
 //  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFVideoEncoding.h>
-#else
 #import "LFVideoEncoding.h"
-#endif
 
 @interface LFHardwareVideoEncoder : NSObject<LFVideoEncoding>
 

diff --git a/LFLiveKit/coder/LFHardwareVideoEncoder.m b/LFLiveKit/coder/LFHardwareVideoEncoder.m
@@ -59,7 +59,7 @@ - (void)resetCompressionSession {
 
     _currentVideoBitRate = _configuration.videoBitRate;
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_MaxKeyFrameInterval, (__bridge CFTypeRef)@(_configuration.videoMaxKeyframeInterval));
-    VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_MaxKeyFrameIntervalDuration, (__bridge CFTypeRef)@(_configuration.videoMaxKeyframeInterval));
+    VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_MaxKeyFrameIntervalDuration, (__bridge CFTypeRef)@(_configuration.videoMaxKeyframeInterval/_configuration.videoFrameRate));
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_ExpectedFrameRate, (__bridge CFTypeRef)@(_configuration.videoFrameRate));
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_AverageBitRate, (__bridge CFTypeRef)@(_configuration.videoBitRate));
     NSArray *limit = @[@(_configuration.videoBitRate * 1.5/8), @(1)];

diff --git a/LFLiveKit/coder/LFVideoEncoding.h b/LFLiveKit/coder/LFVideoEncoding.h
@@ -7,15 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFVideoFrame.h>
-#import <LFLiveKit/LFLiveVideoConfiguration.h>
-#else
 #import "LFVideoFrame.h"
 #import "LFLiveVideoConfiguration.h"
-#endif
-
 
 @protocol LFVideoEncoding;
 /// 编码器编码后回调

diff --git a/LFLiveKit/filter/LFGPUImageBeautyFilter.h b/LFLiveKit/filter/LFGPUImageBeautyFilter.h
@@ -1,10 +1,9 @@
-#if __has_include(<GPUImage/GPUImage.h>)
-#import <GPUImage/GPUImage.h>
-#elif __has_include(<GPUImage/GPUImageFramework.h>)
+#if __has_include(<GPUImage/GPUImageFramework.h>)
 #import <GPUImage/GPUImageFramework.h>
 #else
 #import "GPUImage.h"
 #endif
+
 @interface LFGPUImageBeautyFilter : GPUImageFilter {
 }
 

diff --git a/LFLiveKit/filter/LFGPUImageEmptyFilter.h b/LFLiveKit/filter/LFGPUImageEmptyFilter.h
@@ -1,7 +1,5 @@
-#if __has_include(<GPUImage/GPUImage.h>)
-#import <GPUImage/GPUImage.h>
-#elif __has_include("GPUImage/GPUImage.h")
-#import "GPUImage/GPUImage.h"
+#if __has_include(<GPUImage/GPUImageFramework.h>)
+#import <GPUImage/GPUImageFramework.h>
 #else
 #import "GPUImage.h"
 #endif

diff --git a/LFLiveKit/objects/LFAudioFrame.h b/LFLiveKit/objects/LFAudioFrame.h
@@ -6,11 +6,7 @@
 //  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFFrame.h>
-#else
 #import "LFFrame.h"
-#endif
 
 @interface LFAudioFrame : LFFrame
 

diff --git a/LFLiveKit/objects/LFLiveStreamInfo.h b/LFLiveKit/objects/LFLiveStreamInfo.h
@@ -7,14 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFLiveAudioConfiguration.h>
-#import <LFLiveKit/LFLiveVideoConfiguration.h>
-#else
 #import "LFLiveAudioConfiguration.h"
 #import "LFLiveVideoConfiguration.h"
-#endif
 
 
 

diff --git a/LFLiveKit/objects/LFVideoFrame.h b/LFLiveKit/objects/LFVideoFrame.h
@@ -6,11 +6,7 @@
 //  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFFrame.h>
-#else
 #import "LFFrame.h"
-#endif
 
 
 @interface LFVideoFrame : LFFrame

diff --git a/LFLiveKit/publish/LFStreamRTMPSocket.h b/LFLiveKit/publish/LFStreamRTMPSocket.h
@@ -6,11 +6,7 @@
 //  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFStreamSocket.h>
-#else
 #import "LFStreamSocket.h"
-#endif
 
 @interface LFStreamRTMPSocket : NSObject<LFStreamSocket>
 

diff --git a/LFLiveKit/publish/LFStreamRtmpSocket.m b/LFLiveKit/publish/LFStreamRtmpSocket.m
@@ -10,8 +10,6 @@
 
 #if __has_include(<pili-librtmp/rtmp.h>)
 #import <pili-librtmp/rtmp.h>
-#elif __has_include("pili-librtmp/rtmp.h")
-#import "pili-librtmp/rtmp.h"
 #else
 #import "rtmp.h"
 #endif
@@ -541,7 +539,6 @@ void RTMPErrorCallback(RTMPError *error, void *userData) {
 }
 
 void ConnectionTimeCallback(PILI_CONNECTION_TIME *conn_time, void *userData) {
-    LFStreamRTMPSocket *socket = (__bridge LFStreamRTMPSocket*)userData;
 }
 
 #pragma mark -- LFStreamingBufferDelegate

diff --git a/LFLiveKit/publish/LFStreamSocket.h b/LFLiveKit/publish/LFStreamSocket.h
@@ -7,16 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFLiveStreamInfo.h>
-#import <LFLiveKit/LFStreamingBuffer.h>
-#import <LFLiveKit/LFLiveDebug.h>
-#else
 #import "LFLiveStreamInfo.h"
 #import "LFStreamingBuffer.h"
 #import "LFLiveDebug.h"
-#endif
 
 
 

diff --git a/LFLiveKit/publish/LFStreamingBuffer.h b/LFLiveKit/publish/LFStreamingBuffer.h
@@ -7,14 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-
-#if __has_include(<LFLiveKit/LFLiveKit.h>)
-#import <LFLiveKit/LFAudioFrame.h>
-#import <LFLiveKit/LFVideoFrame.h>
-#else
 #import "LFAudioFrame.h"
 #import "LFVideoFrame.h"
-#endif
 
 
 /** current buffer status */

diff --git a/LFLiveKitDemo/LFLiveKitDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/LFLiveKitDemo/LFLiveKitDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate