update version

FrameWork/Info.plist

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

LFLiveKit.podspec

@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "LFLiveKit"
-  s.version      = "2.4"
+  s.version      = "2.4.2"
   s.summary      = "LaiFeng ios Live. LFLiveKit."
   s.homepage     = "https://github.com/chenliming777"
   s.license      = { :type => "MIT", :file => "LICENSE" }

LFLiveKit/LFLiveKit.h

@@ -2,8 +2,8 @@
 //  LFLiveKit.h
 //  LFLiveKit
 //
-//  Created by admin on 16/5/24.
-//  Copyright © 2016年 admin. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #if __has_include(<LFLiveKit/LFLiveKit.h>)

LFLiveKit/LFLiveSession.h

@@ -2,8 +2,9 @@
 //  LFLiveSession.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/LFLiveSession.m

@@ -2,8 +2,8 @@
 //  LFLiveSession.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFLiveSession.h"

LFLiveKit/capture/LFAudioCapture.h

@@ -2,8 +2,8 @@
 //  LFAudioCapture.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/1.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/capture/LFAudioCapture.m

@@ -2,8 +2,8 @@
 //  LFAudioCapture.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/1.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFAudioCapture.h"

LFLiveKit/capture/LFVideoCapture.h

@@ -2,8 +2,8 @@
 //  LFVideoCapture.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/1.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/capture/LFVideoCapture.m

@@ -2,8 +2,8 @@
 //  LFVideoCapture.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/1.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFVideoCapture.h"

LFLiveKit/coder/LFAudioEncoding.h

@@ -2,8 +2,8 @@
 //  LFAudioEncoding.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/coder/LFH264VideoEncoder.h

@@ -2,8 +2,8 @@
 //  LFH264VideoEncoder
 //  LFLiveKit
 //
-//  Created by feng on 7/5/16.
-//  Copyright (c) 2014 zhanqi.tv. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #if __has_include(<LFLiveKit/LFLiveKit.h>)

LFLiveKit/coder/LFH264VideoEncoder.mm

@@ -2,8 +2,8 @@
 //  LFH264VideoEncoder
 //  LFLiveKit
 //
-//  Created by feng on 7/5/16.
-//  Copyright (c) 2014 zhanqi.tv. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <CoreMedia/CoreMedia.h>

LFLiveKit/coder/LFHardwareAudioEncoder.h

@@ -2,8 +2,8 @@
 //  LFHardwareAudioEncoder.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #if __has_include(<LFLiveKit/LFLiveKit.h>)

LFLiveKit/coder/LFHardwareAudioEncoder.m

@@ -2,8 +2,8 @@
 //  LFHardwareAudioEncoder.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFHardwareAudioEncoder.h"
@@ -35,7 +35,7 @@
         if (!aacBuf) {
             aacBuf = malloc(_configuration.bufferLength);
         }
-
+        
         
 #ifdef DEBUG
         enabledWriteVideoFile = NO;
@@ -48,7 +48,6 @@
 - (void)dealloc {
     if (aacBuf) free(aacBuf);
     if (leftBuf) free(leftBuf);
-    if(m_converter) AudioConverterDispose(m_converter);
 }
 
 #pragma mark -- LFAudioEncoder
@@ -60,7 +59,7 @@
     if (![self createAudioConvert]) {
         return;
     }
-
+    
     if(leftLength + audioData.length >= self.configuration.bufferLength){
         ///<  发送
         NSInteger totalSize = leftLength + audioData.length;
@@ -100,7 +99,7 @@
     AudioBufferList buffers;
     buffers.mNumberBuffers = 1;
     buffers.mBuffers[0] = inBuffer;
-
+    
     
     // 初始化一个输出缓冲列表
     AudioBufferList outBufferList;
@@ -134,7 +133,7 @@
 }
 
 - (void)stopEncoder {
-
+    
 }
 
 #pragma mark -- CustomMethod
@@ -142,7 +141,7 @@
     if (m_converter != nil) {
         return TRUE;
     }
-
+    
     AudioStreamBasicDescription inputFormat = {0};
     inputFormat.mSampleRate = _configuration.audioSampleRate;
     inputFormat.mFormatID = kAudioFormatLinearPCM;
@@ -152,14 +151,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.mChannelsPerFrame = (UInt32)_configuration.numberOfChannels;;
     outputFormat.mFramesPerPacket = 1024;                     // AAC一帧是1024个字节
-
+    
     const OSType subtype = kAudioFormatMPEG4AAC;
     AudioClassDescription requestedCodecs[2] = {
         {
@@ -177,16 +176,16 @@
     OSStatus result = AudioConverterNewSpecific(&inputFormat, &outputFormat, 2, requestedCodecs, &m_converter);;
     UInt32 outputBitrate = _configuration.audioBitrate;
     UInt32 propSize = sizeof(outputBitrate);
-//    UInt32 outputPacketSize = 0;
-
+    //    UInt32 outputPacketSize = 0;
+    
     
     if(result == noErr) {
         result = AudioConverterSetProperty(m_converter, kAudioConverterEncodeBitRate, propSize, &outputBitrate);
     }
     
-//    if(result == noErr) {
-//        AudioConverterGetProperty(m_converter, kAudioConverterPropertyMaximumOutputPacketSize, &propSize, &outputPacketSize);
-//    }
+    //    if(result == noErr) {
+    //        AudioConverterGetProperty(m_converter, kAudioConverterPropertyMaximumOutputPacketSize, &propSize, &outputPacketSize);
+    //    }
     
     return YES;
 }

LFLiveKit/coder/LFHardwareVideoEncoder.h

@@ -2,8 +2,8 @@
 //  LFHardwareVideoEncoder.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #if __has_include(<LFLiveKit/LFLiveKit.h>)

LFLiveKit/coder/LFHardwareVideoEncoder.m

@@ -2,10 +2,9 @@
 //  LFHardwareVideoEncoder.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
-
 #import "LFHardwareVideoEncoder.h"
 #import <VideoToolbox/VideoToolbox.h>
 
@@ -21,6 +20,7 @@
 @property (nonatomic, strong) LFLiveVideoConfiguration *configuration;
 @property (nonatomic, weak) id<LFVideoEncodingDelegate> h264Delegate;
 @property (nonatomic) NSInteger currentVideoBitRate;
+@property (nonatomic) BOOL isBackGround;
 
 @end
 
@@ -32,7 +32,8 @@
         NSLog(@"USE LFHardwareVideoEncoder");
         _configuration = configuration;
         [self resetCompressionSession];
-
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterBackground:) name:UIApplicationWillResignActiveNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterForeground:) name:UIApplicationDidBecomeActiveNotification object:nil];
 #ifdef DEBUG
         enabledWriteVideoFile = NO;
         [self initForFilePath];
@@ -72,6 +73,7 @@
 }
 
 - (void)setVideoBitRate:(NSInteger)videoBitRate {
+    if(_isBackGround) return;
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_AverageBitRate, (__bridge CFTypeRef)@(videoBitRate));
     NSArray *limit = @[@(videoBitRate * 1.5/8), @(1)];
     VTSessionSetProperty(compressionSession, kVTCompressionPropertyKey_DataRateLimits, (__bridge CFArrayRef)limit);
@@ -90,11 +92,12 @@
         CFRelease(compressionSession);
         compressionSession = NULL;
     }
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 #pragma mark -- LFVideoEncoder
 - (void)encodeVideoData:(CVPixelBufferRef)pixelBuffer timeStamp:(uint64_t)timeStamp {
-    
+    if(_isBackGround) return;
     frameCount++;
     CMTime presentationTimeStamp = CMTimeMake(frameCount, (int32_t)_configuration.videoFrameRate);
     VTEncodeInfoFlags flags;
@@ -120,6 +123,16 @@
     _h264Delegate = delegate;
 }
 
+#pragma mark -- Notification
+- (void)willEnterBackground:(NSNotification*)notification{
+    _isBackGround = YES;
+}
+
+- (void)willEnterForeground:(NSNotification*)notification{
+    [self resetCompressionSession];
+    _isBackGround = NO;
+}
+
 #pragma mark -- VideoCallBack
 static void VideoCompressonOutputCallback(void *VTref, void *VTFrameRef, OSStatus status, VTEncodeInfoFlags infoFlags, CMSampleBufferRef sampleBuffer){
     if (!sampleBuffer) return;

LFLiveKit/coder/LFVideoEncoding.h

@@ -2,8 +2,8 @@
 //  LFVideoEncoding.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/configuration/LFLiveAudioConfiguration.h

@@ -2,8 +2,8 @@
 //  LFLiveAudioConfiguration.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/1.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/configuration/LFLiveAudioConfiguration.m

@@ -2,8 +2,8 @@
 //  LFLiveAudioConfiguration.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/1.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFLiveAudioConfiguration.h"

LFLiveKit/configuration/LFLiveVideoConfiguration.h

@@ -2,8 +2,8 @@
 //  LFLiveVideoConfiguration.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/1.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/configuration/LFLiveVideoConfiguration.m

@@ -2,8 +2,8 @@
 //  LFLiveVideoConfiguration.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/1.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFLiveVideoConfiguration.h"

LFLiveKit/filter/LFGPUImageBeautyFilter.h

@@ -1,7 +1,7 @@
 #if __has_include(<GPUImage/GPUImage.h>)
 #import <GPUImage/GPUImage.h>
-#elif __has_include("GPUImage/GPUImage.h")
-#import "GPUImage/GPUImage.h"
+#elif __has_include(<GPUImage/GPUImageFramework.h>)
+#import <GPUImage/GPUImageFramework.h>
 #else
 #import "GPUImage.h"
 #endif

LFLiveKit/objects/LFAudioFrame.h

@@ -2,8 +2,8 @@
 //  LFAudioFrame.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #if __has_include(<LFLiveKit/LFLiveKit.h>)

LFLiveKit/objects/LFAudioFrame.m

@@ -2,8 +2,8 @@
 //  LFAudioFrame.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFAudioFrame.h"

LFLiveKit/objects/LFFrame.h

@@ -2,8 +2,8 @@
 //  LFFrame.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/objects/LFFrame.m

@@ -2,8 +2,8 @@
 //  LFFrame.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFFrame.h"

LFLiveKit/objects/LFLiveDebug.h

@@ -2,8 +2,8 @@
 //  LFLiveDebug.h
 //  LaiFeng
 //
-//  Created by admin on 16/5/19.
-//  Copyright © 2016年 live Interactive. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/objects/LFLiveDebug.m

@@ -2,8 +2,8 @@
 //  LFLiveDebug.m
 //  LaiFeng
 //
-//  Created by admin on 16/5/19.
-//  Copyright © 2016年 live Interactive. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFLiveDebug.h"

LFLiveKit/objects/LFLiveStreamInfo.h

@@ -2,9 +2,9 @@
 //  LFLiveStreamInfo.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
-//  真正的上传地址 token等
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
+//
 
 #import <Foundation/Foundation.h>
 

LFLiveKit/objects/LFLiveStreamInfo.m

@@ -2,8 +2,8 @@
 //  LFLiveStreamInfo.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFLiveStreamInfo.h"

LFLiveKit/objects/LFVideoFrame.h

@@ -2,8 +2,8 @@
 //  LFVideoFrame.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #if __has_include(<LFLiveKit/LFLiveKit.h>)

LFLiveKit/objects/LFVideoFrame.m

@@ -2,8 +2,8 @@
 //  LFVideoFrame.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFVideoFrame.h"

LFLiveKit/publish/LFStreamRTMPSocket.h

@@ -2,8 +2,8 @@
 //  LFStreamRTMPSocket.h
 //  LaiFeng
 //
-//  Created by admin on 16/5/18.
-//  Copyright © 2016年 live Interactive. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #if __has_include(<LFLiveKit/LFLiveKit.h>)

LFLiveKit/publish/LFStreamRtmpSocket.m

@@ -2,8 +2,8 @@
 //  LFStreamRTMPSocket.m
 //  LFLiveKit
 //
-//  Created by admin on 16/5/18.
-//  Copyright © 2016年 live Interactive. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFStreamRTMPSocket.h"

LFLiveKit/publish/LFStreamSocket.h

@@ -2,8 +2,8 @@
 //  LFStreamSocket.h
 //  LFLiveKit
 //
-//  Created by admin on 16/5/3.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/publish/LFStreamingBuffer.h

@@ -2,8 +2,8 @@
 //  LFStreamingBuffer.h
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/publish/LFStreamingBuffer.m

@@ -2,8 +2,8 @@
 //  LFStreamingBuffer.m
 //  LFLiveKit
 //
-//  Created by 倾慕 on 16/5/2.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "LFStreamingBuffer.h"

LFLiveKit/publish/NSMutableArray+LFAdd.h

@@ -2,8 +2,8 @@
 //  NSMutableArray+LFAdd.h
 //  YYKit
 //
-//  Created by admin on 16/5/20.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

LFLiveKit/publish/NSMutableArray+LFAdd.m

@@ -2,8 +2,8 @@
 //  NSMutableArray+LFAdd.m
 //  YYKit
 //
-//  Created by admin on 16/5/20.
-//  Copyright © 2016年 倾慕. All rights reserved.
+//  Created by LaiFeng on 16/5/20.
+//  Copyright © 2016年 LaiFeng All rights reserved.
 //
 
 #import "NSMutableArray+LFAdd.h"