更换变声器

Change-Id: I8a16fc8e1abd670efc3fa7406aefda13aeb80031

Author: tonychanchen

Podfile.lock

@@ -31,15 +31,17 @@ PODS:
     - YYModel (= 1.0.4)
   - TIoTLinkKit_FLV (2.2.3)
   - TIoTLinkKit_IJKPlayer (2.0.8-beta.202212290234)
-  - TIoTLinkKit_SoundTouch (0.0.4)
+  - TIoTLinkKit_SoundTouch (0.0.5)
   - TIoTLinkKit_TPNS (1.0.1)
   - TIoTLinkKit_WechatOpenSDK (1.0.1)
   - TIoTLinkKit_XP2P (2.4.34-beta.202211150834)
   - TIoTLinkVideo (1.0.0):
     - CocoaAsyncSocket (= 7.6.5)
     - TIoTLinkKit_FLV (= 2.2.3)
-    - TIoTLinkKit_SoundTouch (= 0.0.4)
+    - TIoTLinkKit_SoundTouch
     - TIoTLinkKit_XP2P (= 2.4.34-beta.202211150834)
+    - TPCircularBuffer (= 1.6.1)
+  - TPCircularBuffer (1.6.1)
   - TrueTime (5.0.3)
   - TXLiteAVSDK_TRTC (8.0.9644)
   - TZImagePickerController (3.2.1)
@@ -93,6 +95,7 @@ SPEC REPOS:
     - TIoTLinkKit_TPNS
     - TIoTLinkKit_WechatOpenSDK
     - TIoTLinkKit_XP2P
+    - TPCircularBuffer
     - TrueTime
     - TXLiteAVSDK_TRTC
     - TZImagePickerController
@@ -123,11 +126,12 @@ SPEC CHECKSUMS:
   TIoTLinkKit: 0386fb583c61765a02ad5cca810c7661d5a0bc53
   TIoTLinkKit_FLV: aec2b2ec9664990ec6c5b9f760fc1a9043d5a9a5
   TIoTLinkKit_IJKPlayer: 423fb51f6d04f59a2f2a0ba3c875592f8048735c
-  TIoTLinkKit_SoundTouch: 3b558a8663d8c867305f4336960ca078a9ae9768
+  TIoTLinkKit_SoundTouch: ad6b0009ee12d65959aca605073fabb92db87a91
   TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
   TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
   TIoTLinkKit_XP2P: a5409ccbbaa2de3faf8aa82bf98b0c3df193541a
-  TIoTLinkVideo: 1b22edc89b230a34dbaedc139f575291f2320979
+  TIoTLinkVideo: 961719b41bfff549fd76a807ee753431fe60eab3
+  TPCircularBuffer: c13243556527551c4d320709c7b14a6d20cdc30a
   TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
   TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d

Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m

@@ -108,7 +108,7 @@ - (void)viewDidLoad {
 //    [TIoTCoreXP2PBridge sharedInstance].logEnable = NO;
     self.navigationController.navigationBar.tintColor = [UIColor blackColor];
 
-    self.qualityString = quality_high;
+    self.qualityString = quality_standard;
     self.screenRect = [UIApplication sharedApplication].delegate.window.frame;
 
     if (self.isNVR == NO) {
@@ -260,12 +260,12 @@ - (void)getDeviceStatusWithType:(NSString *)singleType qualityType:(NSString *)q
 //                [[TIoTCoreXP2PBridge sharedInstance] sendVoiceToServer:weakSelf.deviceName?:@"" channel:channel];
                 [[TIoTSessionManager sharedInstance] resumeRTCAudioSession];
 
-                static int tt_pitch = 0;
+                static int tt_pitch = 3; 
                 TIoTCoreAudioConfig *audio_config = [TIoTCoreAudioConfig new];
                 audio_config.refreshSession = NO;
                 audio_config.sampleRate = TIoTAVCaptionFLVAudio_16;
                 audio_config.channels = 1;
-                audio_config.isEchoCancel = NO;
+                audio_config.isEchoCancel = YES;
                 audio_config.pitch =  tt_pitch; // -6声音会变粗一点;    6声音会变细一点
 
                 TIoTCoreVideoConfig *video_config = [TIoTCoreVideoConfig new];

Source/SDK/LinkVideo/FLV/TIoTAVCaptionFLV.mm

@@ -12,13 +12,14 @@
 
 #include <iostream>
 #import "TIoTPCMXEchoRecord.h"
-#import <SoundTouchiOS/ijksoundtouch_wrap.h>
+//#import <SoundTouchiOS/ijksoundtouch_wrap.h>
+#import <SoundTouchiOS/TRAESoundTouch.h>
 
 __weak static TIoTAVCaptionFLV *tAVCaptionFLV = nil;
 static flv_muxer_t* flvMuxer = nullptr;
 dispatch_queue_t muxerQueue;
 //NSFileHandle *_fileHandle;
-
+//NSFileHandle *_originfileHandle;
 @interface TIoTAVCaptionFLV ()<AVCaptureVideoDataOutputSampleBufferDelegate,AVCaptureAudioDataOutputSampleBufferDelegate,H264EncoderDelegate,TIoTAACEncoderDelegate>
 // 负责输如何输出设备之间的数据传递
 @property (nonatomic, strong) AVCaptureSession           *session;
@@ -349,35 +350,35 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
 
 #pragma mark - PCM XEcho record_callback
 void *ijk_soundtouch_handle = NULL;
+//trae_voice_changer_t *trae_voice_handle = NULL;
 - (void)setPitch:(int)pitch {
-    _pitch = ((pitch >= -12) && (pitch <= 12 ))?pitch:-6;
+    _pitch = ((pitch >= 0) && (pitch <= 3 ))?pitch:2; //0 NONE  2萝莉，3 大叔
     NSLog(@"设置变调参数:%d<===>修正为:%d",pitch, _pitch);
     int tmpChannel = _channel;
-    
-    if (ijk_soundtouch_handle != NULL) {
-        ijk_soundtouch_destroy(ijk_soundtouch_handle);
-    }
-    ijk_soundtouch_handle = ijk_soundtouch_create(1.0, _pitch, tmpChannel, 16000);
+        
+    [TRAESoundTouch voice_handle_open:_pitch channels:tmpChannel];
 }
 
+static uint8_t  trae_pcm_buffer[640];
 static void record_callback(uint8_t *buffer, int size, void *u)
 {
-//    printf("pcm_size_callback: %d\n", size);
-    int ret_len = size;
-    // Sets pitch change in semi-tones compared to the original pitch
-    // (-12 .. +12)
+//    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];
+    if (len < 640) {
+        return;
+    }
     if (vc.pitch != 0) {
         static int tmpChannel = vc.pcmRecord.pcmStreamDescription.mChannelsPerFrame;
-        ret_len = ijk_soundtouch_translate(ijk_soundtouch_handle, (short *)buffer, size/2, 2, tmpChannel);
-        if (ret_len<1) {
-            return;
-        }
+//        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];
     }
-//    printf("pcm_size_callback_translate: %d\n", ret_len);
-    
 
-    NSData *data = [NSData dataWithBytes:buffer length:ret_len];
+    NSData *data = [NSData dataWithBytes:trae_pcm_buffer length:640];
 //    [_fileHandle writeData:data];
     [vc.aacEncoder encodePCMData:data];
 }
@@ -510,11 +511,17 @@ -(BOOL) startCapture {
 //    NSFileManager *fileManager = [NSFileManager defaultManager];
 //    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
 //    NSString *documentsDirectory = [paths firstObject];
-    
-//    NSString *h264File = [documentsDirectory stringByAppendingPathComponent:@"lyh.pcm"];
+//
+//    NSString *h264File = [documentsDirectory stringByAppendingPathComponent:@"out.pcm"];
 //    [fileManager removeItemAtPath:h264File error:nil];
 //    [fileManager createFileAtPath:h264File contents:nil attributes:nil];
 //    _fileHandle = [NSFileHandle fileHandleForWritingAtPath:h264File];
+//
+//
+//    NSString *originFile = [documentsDirectory stringByAppendingPathComponent:@"origin.pcm"];
+//    [fileManager removeItemAtPath:originFile error:nil];
+//    [fileManager createFileAtPath:originFile contents:nil attributes:nil];
+//    _originfileHandle = [NSFileHandle fileHandleForWritingAtPath:originFile];
 
     flv_init_load();
 

Source/SDK/LinkVideo/FLV/TIoTPCMXEchoRecord.h

@@ -1,6 +1,7 @@
 
 #import <Foundation/Foundation.h>
 #import <AudioUnit/AudioUnit.h>
+#import <TPCircularBuffer/TPCircularBuffer.h>
 
 typedef void(*RecordCallback)(uint8_t *buffer, int size, void *u);
 
@@ -13,6 +14,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)set_record_callback:(RecordCallback)c user:(void *)u;
 - (void)start_record;
 - (void)stop_record;
+
+
+-(UInt32)getData:(void *)buf_ :(UInt32)size_;
 @end
 
 NS_ASSUME_NONNULL_END

Source/SDK/LinkVideo/FLV/TIoTPCMXEchoRecord.mm

@@ -82,6 +82,8 @@ - (instancetype)initWithChannel:(int)channel isEcho:(BOOL)isEcho
 static int          pcm_buffer_size = 0;
 static uint8_t      pcm_buffer[kTVURecoderPCMMaxBuffSize*4];
 
+TPCircularBuffer pcm_circularBuffer;
+
 static OSStatus record_callback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrame, AudioBufferList *__nullable ioData)
 {
     TIoTPCMXEchoRecord *r = (__bridge TIoTPCMXEchoRecord *)(inRefCon);
@@ -99,7 +101,12 @@ 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];
+    if (r->callback)
+        r->callback(bufferData, bufferSize, r->user);
+    return error;
+
 //    if (size > 0 && src)
 //    {
 //        char *dst = (char*)calloc(1, size);
@@ -130,6 +137,7 @@ OSStatus outputRender_cb(void *inRefCon, AudioUnitRenderActionFlags *ioActionFla
 
 - (void)start_record
 {
+    [self Init_buffer:4096];
     pcm_buffer_size = 0;
     AudioOutputUnitStart(audioUnit);
 }
@@ -138,6 +146,7 @@ - (void)stop_record
 {
     AudioOutputUnitStop(audioUnit);
     pcm_buffer_size = 0;
+    [self Destory_buffer];
 }
 
 - (void)set_record_callback:(RecordCallback)c user:(nonnull void *)u
@@ -153,4 +162,45 @@ - (void)dealloc
     [self stop_record];
     AudioComponentInstanceDispose(audioUnit);
 }
+
+
+
+-(BOOL)Init_buffer:(UInt32)size_
+{
+     return TPCircularBufferInit(&pcm_circularBuffer, size_ );
+}
+
+-(void)Destory_buffer
+{
+    TPCircularBufferCleanup(&pcm_circularBuffer );
+}
+
+-(UInt32)addData:(void *)buf_ :(UInt32)size_
+{
+    uint32_t availableBytes = 0;
+    TPCircularBufferHead(&pcm_circularBuffer, &availableBytes);
+    if (availableBytes <= 0)
+          return 0;
+     
+    UInt32 len =  (availableBytes >= size_ ? size_ : availableBytes);
+    TPCircularBufferProduceBytes(&pcm_circularBuffer, (void*)buf_, size_);
+    return len;
+}
+
+-(UInt32)getData:(void *)buf_ :(UInt32)size_
+{
+    uint32_t availableBytes = 0;
+    void *bufferTail = TPCircularBufferTail(&pcm_circularBuffer, &availableBytes);
+    if (availableBytes >= size_)
+    {
+        UInt32 len = 0;
+        len = (size_ > availableBytes ? availableBytes : size_);
+        memcpy(buf_, bufferTail, len);
+        TPCircularBufferConsume(&pcm_circularBuffer, len);
+//        NSLog(@"ggggggggggg=====len = %ld", len);
+        return len;
+    }
+    return 0;
+}
+
 @end

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

@@ -331,7 +331,27 @@ - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_numbe
     [self sendVoiceToServer:dev_name channel:channel_number audioConfig:audio_config videoConfig:video_config];
 }
 
+
+- (void)setupAVAudioSession:(TIoTCoreAudioConfig *)audio_config {
+    AVAudioSession *avsession = [AVAudioSession sharedInstance];
+    [avsession setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker error:nil];
+    [avsession setPreferredSampleRate:16000 error:nil];
+    [avsession setPreferredInputNumberOfChannels:audio_config.channels error:nil];
+    
+    //16khz * 1channel * notEcho = 640frame 设置为0.03
+    NSTimeInterval duration = 0.015;
+    if (audio_config.isEchoCancel) {
+        duration = duration*2; //回音消除打开会减少采样
+    }
+    if (audio_config.channels == 2) {
+        duration = duration/2;
+    }
+    [avsession setPreferredIOBufferDuration:duration error:nil];
+    [avsession setActive:YES error:nil];
+}
+
 - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTCoreAudioConfig *)audio_config videoConfig:(TIoTCoreVideoConfig *)video_config {
+    [self setupAVAudioSession:audio_config];
 //    NSString *audioFile = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject] stringByAppendingPathComponent:@"testVideoStreamfile.flv"];
 //    [[NSFileManager defaultManager] removeItemAtPath:audioFile error:nil];
 //    [[NSFileManager defaultManager] createFileAtPath:audioFile contents:nil attributes:nil];