fix audioCapture crash

vasicvuk · Oct 12, 2016 · a1a7e9a · a1a7e9a
1 parent fabae8d
commit a1a7e9a
Show file tree

Hide file tree

Showing 36 changed files with 102 additions and 89 deletions.
diff --git a/LFLiveKit/LFLiveKit.h b/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>)

diff --git a/LFLiveKit/LFLiveSession.h b/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>

diff --git a/LFLiveKit/LFLiveSession.m b/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"

diff --git a/LFLiveKit/capture/LFAudioCapture.h b/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>

diff --git a/LFLiveKit/capture/LFAudioCapture.m b/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"

diff --git a/LFLiveKit/capture/LFVideoCapture.h b/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>

diff --git a/LFLiveKit/capture/LFVideoCapture.m b/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"

diff --git a/LFLiveKit/coder/LFAudioEncoding.h b/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>

diff --git a/LFLiveKit/coder/LFH264VideoEncoder.h b/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>)

diff --git a/LFLiveKit/coder/LFH264VideoEncoder.mm b/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>

diff --git a/LFLiveKit/coder/LFHardwareAudioEncoder.h b/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>)

diff --git a/LFLiveKit/coder/LFHardwareAudioEncoder.m b/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 @@ - (instancetype)initWithAudioStreamConfiguration:(nullable LFLiveAudioConfigurat
         if (!aacBuf) {
             aacBuf = malloc(_configuration.bufferLength);
         }
-
+        
 
 #ifdef DEBUG
         enabledWriteVideoFile = NO;
@@ -48,7 +48,6 @@ - (instancetype)initWithAudioStreamConfiguration:(nullable LFLiveAudioConfigurat
 - (void)dealloc {
     if (aacBuf) free(aacBuf);
     if (leftBuf) free(leftBuf);
-    if(m_converter) AudioConverterDispose(m_converter);
 }
 
 #pragma mark -- LFAudioEncoder
@@ -60,7 +59,7 @@ - (void)encodeAudioData:(nullable NSData*)audioData timeStamp:(uint64_t)timeStam
     if (![self createAudioConvert]) {
         return;
     }
-
+    
     if(leftLength + audioData.length >= self.configuration.bufferLength){
         ///<  发送
         NSInteger totalSize = leftLength + audioData.length;
@@ -100,7 +99,7 @@ - (void)encodeBuffer:(char*)buf timeStamp:(uint64_t)timeStamp{
     AudioBufferList buffers;
     buffers.mNumberBuffers = 1;
     buffers.mBuffers[0] = inBuffer;
-
+    
 
     // 初始化一个输出缓冲列表
     AudioBufferList outBufferList;
@@ -134,15 +133,15 @@ - (void)encodeBuffer:(char*)buf timeStamp:(uint64_t)timeStamp{
 }
 
 - (void)stopEncoder {
-
+    
 }
 
 #pragma mark -- CustomMethod
 - (BOOL)createAudioConvert { //根据输入样本初始化一个编码转换器
     if (m_converter != nil) {
         return TRUE;
     }
-
+    
     AudioStreamBasicDescription inputFormat = {0};
     inputFormat.mSampleRate = _configuration.audioSampleRate;
     inputFormat.mFormatID = kAudioFormatLinearPCM;
@@ -152,14 +151,14 @@ - (BOOL)createAudioConvert { //根据输入样本初始化一个编码转换器
     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 @@ - (BOOL)createAudioConvert { //根据输入样本初始化一个编码转换器
     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;
 }

diff --git a/LFLiveKit/coder/LFHardwareVideoEncoder.h b/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>)

diff --git a/LFLiveKit/coder/LFHardwareVideoEncoder.m b/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 @@ @interface LFHardwareVideoEncoder (){
 @property (nonatomic, strong) LFLiveVideoConfiguration *configuration;
 @property (nonatomic, weak) id<LFVideoEncodingDelegate> h264Delegate;
 @property (nonatomic) NSInteger currentVideoBitRate;
+@property (nonatomic) BOOL isBackGround;
 
 @end
 
@@ -32,7 +32,8 @@ - (instancetype)initWithVideoStreamConfiguration:(LFLiveVideoConfiguration *)con
         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)resetCompressionSession {
 }
 
 - (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 @@ - (void)dealloc {
         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 @@ - (void)setDelegate:(id<LFVideoEncodingDelegate>)delegate {
     _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;

diff --git a/LFLiveKit/coder/LFVideoEncoding.h b/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>

diff --git a/LFLiveKit/configuration/LFLiveAudioConfiguration.h b/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>

diff --git a/LFLiveKit/configuration/LFLiveAudioConfiguration.m b/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"

diff --git a/LFLiveKit/configuration/LFLiveVideoConfiguration.h b/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>

diff --git a/LFLiveKit/configuration/LFLiveVideoConfiguration.m b/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"

diff --git a/LFLiveKit/objects/LFAudioFrame.h b/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>)

diff --git a/LFLiveKit/objects/LFAudioFrame.m b/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"

diff --git a/LFLiveKit/objects/LFFrame.h b/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>