添加线程处理变声

Change-Id: Ie76b14156612ed0c3c3c5017d4318a15b021983a

Author: tonychanchen

Source/SDK/LinkVideo/FLV/TIoTAVCaptionFLV.mm

@@ -39,6 +39,8 @@ @interface TIoTAVCaptionFLV ()<AVCaptureVideoDataOutputSampleBufferDelegate,AVCa
 @property (nonatomic, assign) int captureVideoFPS;
 @property (nonatomic, strong) AVCaptureSessionPreset resolutionRatioValue;
 @property (nonatomic, strong) TIoTPCMXEchoRecord *pcmRecord;
+
+@property (nonatomic, strong) dispatch_queue_t audioEncodeQueue;
 @end
 
 @implementation TIoTAVCaptionFLV
@@ -52,6 +54,8 @@ -(instancetype) initWithAudioConfig:(TIoTAVCaptionFLVAudioType)audioSampleRate c
         _isEchoCancel = NO;
         _pitch = 0;
         _devicePosition = AVCaptureDevicePositionBack;
+        
+        _audioEncodeQueue = dispatch_queue_create("com.audio.aacencode", DISPATCH_QUEUE_SERIAL);
         [self onInit];
     }
     return self;
@@ -350,6 +354,8 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
 
 #pragma mark - PCM XEcho record_callback
 void *ijk_soundtouch_handle = NULL;
+TPCircularBuffer aac_circularBuffer;
+
 //trae_voice_changer_t *trae_voice_handle = NULL;
 - (void)setPitch:(int)pitch {
     _pitch = ((pitch >= 0) && (pitch <= 3 ))?pitch:2; //0 NONE  2萝莉，3 大叔
@@ -360,27 +366,36 @@ - (void)setPitch:(int)pitch {
 }
 
 static uint8_t  trae_pcm_buffer[640];
+static uint8_t  trae_aac_buffer[8192];
 static void record_callback(uint8_t *buffer, int size, void *u)
 {
 //    NSData *oridata = [NSData dataWithBytes:buffer length:size];
 //    [_originfileHandle writeData:oridata];
 
     TIoTAVCaptionFLV *vc = (__bridge TIoTAVCaptionFLV *)(u);
     memset(trae_pcm_buffer, 0, 640);
-    UInt32 len = [vc.pcmRecord getData:trae_pcm_buffer :640];
+    UInt32 len = [vc.pcmRecord getData:&pcm_circularBuffer :trae_pcm_buffer :640];
     if (len < 640) {
         return;
     }
     if (vc.pitch != 0) {
-        static int tmpChannel = vc.pcmRecord.pcmStreamDescription.mChannelsPerFrame;
+        
 //        int put_n_sample = (size/2) / tmpChannel;
 //        [TRAESoundTouch voice_handle_process:(short *)buffer output:(short *)trae_pcm_buffer frames:320];
         [TRAESoundTouch voice_handle_process:(short *)trae_pcm_buffer output:(short *)trae_pcm_buffer frames:320];
     }
 
-    NSData *data = [NSData dataWithBytes:trae_pcm_buffer length:640];
-//    [_fileHandle writeData:data];
-    [vc.aacEncoder encodePCMData:data];
+    [vc.pcmRecord addData:&aac_circularBuffer :trae_pcm_buffer :640];
+    dispatch_async(vc.audioEncodeQueue, ^{
+        static int tmpChannelDataLen = vc.pcmRecord.pcmStreamDescription.mChannelsPerFrame * 2048;
+        UInt32 aaclen = [vc.pcmRecord getData:&aac_circularBuffer :trae_aac_buffer :tmpChannelDataLen];
+        if (aaclen < tmpChannelDataLen) {
+            return;
+        }
+        NSData *data = [NSData dataWithBytes:trae_aac_buffer length:tmpChannelDataLen];
+        //    [_fileHandle writeData:data];
+        [vc.aacEncoder encodePCMData:data];
+    });
 }
 
 
@@ -522,7 +537,8 @@ -(BOOL) startCapture {
 //    [fileManager removeItemAtPath:originFile error:nil];
 //    [fileManager createFileAtPath:originFile contents:nil attributes:nil];
 //    _originfileHandle = [NSFileHandle fileHandleForWritingAtPath:originFile];
-        
+    [self.pcmRecord Init_buffer:&aac_circularBuffer :8192];
+
     flv_init_load();
 
     [self startCamera];
@@ -534,6 +550,8 @@ -(BOOL) startCapture {
 -(void) stopCapture{
     [self stopCarmera];
     [self.pcmRecord stop_record];
+    
+    [self.pcmRecord Destory_buffer:&aac_circularBuffer];
 }
 
 - (void) startCamera

Source/SDK/LinkVideo/FLV/TIoTPCMXEchoRecord.h

@@ -3,6 +3,7 @@
 #import <AudioUnit/AudioUnit.h>
 #import <TPCircularBuffer/TPCircularBuffer.h>
 
+extern TPCircularBuffer pcm_circularBuffer;
 typedef void(*RecordCallback)(uint8_t *buffer, int size, void *u);
 
 NS_ASSUME_NONNULL_BEGIN
@@ -15,8 +16,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)start_record;
 - (void)stop_record;
 
-
--(UInt32)getData:(void *)buf_ :(UInt32)size_;
+-(BOOL) Init_buffer:(TPCircularBuffer*)buffer_ :(UInt32)size_;
+-(void) Destory_buffer:(TPCircularBuffer*)buffer_;
+-(UInt32)addData:(TPCircularBuffer*)buffer_ :(void *)buf_ :(UInt32)size_;
+-(UInt32)getData:(TPCircularBuffer*)buffer_ :(void *)buf_ :(UInt32)size_;
 @end
 
 NS_ASSUME_NONNULL_END

Source/SDK/LinkVideo/FLV/TIoTPCMXEchoRecord.mm

@@ -102,7 +102,7 @@ static OSStatus record_callback(void *inRefCon, AudioUnitRenderActionFlags *ioAc
     UInt32   bufferSize = list.mBuffers[0].mDataByteSize;
     uint8_t *bufferData = (uint8_t *)list.mBuffers[0].mData;
 //    NSLog(@"record_callback__________size : %d", bufferSize);
-    [r addData:bufferData :bufferSize];
+    [r addData:&pcm_circularBuffer :bufferData :bufferSize];
     if (r->callback)
         r->callback(bufferData, bufferSize, r->user);
     return error;
@@ -137,7 +137,7 @@ OSStatus outputRender_cb(void *inRefCon, AudioUnitRenderActionFlags *ioActionFla
 
 - (void)start_record
 {
-    [self Init_buffer:4096];
+    [self Init_buffer:&pcm_circularBuffer :4096];
     pcm_buffer_size = 0;
     AudioOutputUnitStart(audioUnit);
 }
@@ -146,7 +146,7 @@ - (void)stop_record
 {
     AudioOutputUnitStop(audioUnit);
     pcm_buffer_size = 0;
-    [self Destory_buffer];
+    [self Destory_buffer:&pcm_circularBuffer];
 }
 
 - (void)set_record_callback:(RecordCallback)c user:(nonnull void *)u
@@ -165,38 +165,38 @@ - (void)dealloc
 
 
 
--(BOOL)Init_buffer:(UInt32)size_
+-(BOOL) Init_buffer:(TPCircularBuffer*)buffer_ :(UInt32)size_
 {
-     return TPCircularBufferInit(&pcm_circularBuffer, size_ );
+     return TPCircularBufferInit(buffer_, size_ );
 }
 
--(void)Destory_buffer
+-(void) Destory_buffer:(TPCircularBuffer*)buffer_
 {
-    TPCircularBufferCleanup(&pcm_circularBuffer );
+    TPCircularBufferCleanup(buffer_ );
 }
 
--(UInt32)addData:(void *)buf_ :(UInt32)size_
+-(UInt32)addData:(TPCircularBuffer*)buffer_ :(void *)buf_ :(UInt32)size_
 {
     uint32_t availableBytes = 0;
-    TPCircularBufferHead(&pcm_circularBuffer, &availableBytes);
+    TPCircularBufferHead(buffer_, &availableBytes);
     if (availableBytes <= 0)
           return 0;
 
     UInt32 len =  (availableBytes >= size_ ? size_ : availableBytes);
-    TPCircularBufferProduceBytes(&pcm_circularBuffer, (void*)buf_, size_);
+    TPCircularBufferProduceBytes(buffer_, (void*)buf_, size_);
     return len;
 }
 
--(UInt32)getData:(void *)buf_ :(UInt32)size_
+-(UInt32)getData:(TPCircularBuffer*)buffer_ :(void *)buf_ :(UInt32)size_
 {
     uint32_t availableBytes = 0;
-    void *bufferTail = TPCircularBufferTail(&pcm_circularBuffer, &availableBytes);
+    void *bufferTail = TPCircularBufferTail(buffer_, &availableBytes);
     if (availableBytes >= size_)
     {
         UInt32 len = 0;
         len = (size_ > availableBytes ? availableBytes : size_);
         memcpy(buf_, bufferTail, len);
-        TPCircularBufferConsume(&pcm_circularBuffer, len);
+        TPCircularBufferConsume(buffer_, len);
 //        NSLog(@"ggggggggggg=====len = %ld", len);
         return len;
     }