添加pcm变调操作

Change-Id: Iea7f102eea7283b82709bf607e8a311171561492
(cherry picked from commit f3b184c)

Author: tonychanchen

Podfile.lock

@@ -31,12 +31,14 @@ PODS:
     - YYModel (= 1.0.4)
   - TIoTLinkKit_FLV (2.2.3)
   - TIoTLinkKit_IJKPlayer (2.0.7)
+  - TIoTLinkKit_SoundTouch (0.0.3)
   - TIoTLinkKit_TPNS (1.0.1)
   - TIoTLinkKit_WechatOpenSDK (1.0.1)
   - TIoTLinkKit_XP2P (2.4.27)
   - TIoTLinkVideo (1.0.0):
     - CocoaAsyncSocket (= 7.6.5)
     - TIoTLinkKit_FLV (= 2.2.3)
+    - TIoTLinkKit_SoundTouch (= 0.0.3)
     - TIoTLinkKit_XP2P (= 2.4.27)
   - TrueTime (5.0.3)
   - TXLiteAVSDK_TRTC (8.0.9644)
@@ -87,6 +89,7 @@ SPEC REPOS:
     - Tencent-MapSDK
     - TIoTLinkKit_FLV
     - TIoTLinkKit_IJKPlayer
+    - TIoTLinkKit_SoundTouch
     - TIoTLinkKit_TPNS
     - TIoTLinkKit_WechatOpenSDK
     - TIoTLinkKit_XP2P
@@ -120,10 +123,11 @@ SPEC CHECKSUMS:
   TIoTLinkKit: 0386fb583c61765a02ad5cca810c7661d5a0bc53
   TIoTLinkKit_FLV: aec2b2ec9664990ec6c5b9f760fc1a9043d5a9a5
   TIoTLinkKit_IJKPlayer: 69e819379a5bbbf2eb956e20fec20249d0497ecd
+  TIoTLinkKit_SoundTouch: 56caa7c7f60e3b98eecc26f003cf7b770c37bd15
   TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
   TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
   TIoTLinkKit_XP2P: 645a54568e9ecd9915c392a2bd07413a5a79c72f
-  TIoTLinkVideo: 2be39eb99a6c39e21a390302b50d4b36e1fcd4e3
+  TIoTLinkVideo: c75b476428d71dab49f368faeaa57faa98017d90
   TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
   TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d

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

@@ -107,7 +107,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) {
@@ -261,7 +261,8 @@ - (void)getDeviceStatusWithType:(NSString *)singleType qualityType:(NSString *)q
                 TIoTCoreAudioConfig *audio_config = [TIoTCoreAudioConfig new];
                 audio_config.sampleRate = TIoTAVCaptionFLVAudio_8;
                 audio_config.channels = 1;
-                audio_config.isEchoCancel = NO;
+                audio_config.isEchoCancel = YES;
+                audio_config.pitch =  -6; //声音会变粗一点
 
                 TIoTCoreVideoConfig *video_config = [TIoTCoreVideoConfig new];
                 video_config.localView = nil;

Source/SDK/LinkVideo/FLV/TIoTAVCaptionFLV.h

@@ -12,6 +12,7 @@
 @property (nonatomic, weak) id<TIoTAVCaptionFLVDelegate> delegate;
 @property (nonatomic, assign)UIView *videoLocalView;
 @property (nonatomic, assign)BOOL isEchoCancel;
+@property (nonatomic, assign)int pitch;
 @property (nonatomic, assign)AVCaptureDevicePosition devicePosition;
 -(instancetype) initWithAudioConfig:(TIoTAVCaptionFLVAudioType)audioSampleRate channel:(int)channel;
 

Source/SDK/LinkVideo/FLV/TIoTAVCaptionFLV.mm

@@ -12,6 +12,7 @@
 
 #include <iostream>
 #import "TIoTPCMXEchoRecord.h"
+#include "ijksoundtouch_wrap.h"
 
 __weak static TIoTAVCaptionFLV *tAVCaptionFLV = nil;
 static flv_muxer_t* flvMuxer = nullptr;
@@ -48,6 +49,7 @@ -(instancetype) initWithAudioConfig:(TIoTAVCaptionFLVAudioType)audioSampleRate c
         _audioRate = audioSampleRate;
         _channel = channel;
         _isEchoCancel = NO;
+        _pitch = 0;
         _devicePosition = AVCaptureDevicePositionBack;
         [self onInit];
     }
@@ -320,9 +322,25 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
 #pragma mark - PCM XEcho record_callback
 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)
     TIoTAVCaptionFLV *vc = (__bridge TIoTAVCaptionFLV *)(u);
+    if (vc.pitch != 0) {
+        static int tmpChannel = vc.pcmRecord.pcmStreamDescription.mChannelsPerFrame;
+        static int pitch = ((vc.pitch >= -12) && (vc.pitch <= 12 ))?vc.pitch:-6;
+        static void *ijk_soundtouch_handle = ijk_soundtouch_create(1.0, pitch, tmpChannel, 16000);
+        ret_len = ijk_soundtouch_translate(ijk_soundtouch_handle, (short *)buffer, size/2, 2, tmpChannel);
+        if (ret_len<1) {
+            return;
+        }
+    }
+//    printf("pcm_size_callback_translate: %d\n", ret_len);
 
-    NSData *data = [NSData dataWithBytes:buffer length:size];
+
+    NSData *data = [NSData dataWithBytes:buffer length:ret_len];
+//    [_fileHandle writeData:data];
     [vc.aacEncoder encodePCMData:data];
 }
 
@@ -455,7 +473,7 @@ -(BOOL) startCapture {
 //    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
 //    NSString *documentsDirectory = [paths firstObject];
 
-//    NSString *h264File = [documentsDirectory stringByAppendingPathComponent:@"lyh.aac"];
+//    NSString *h264File = [documentsDirectory stringByAppendingPathComponent:@"lyh.pcm"];
 //    [fileManager removeItemAtPath:h264File error:nil];
 //    [fileManager createFileAtPath:h264File contents:nil attributes:nil];
 //    _fileHandle = [NSFileHandle fileHandleForWritingAtPath:h264File];

Source/SDK/LinkVideo/TIoTCoreAudioConfig.h

@@ -30,6 +30,12 @@ typedef NS_ENUM(NSInteger, TIoTAVCaptionFLVAudioType) {
  */
 @property (nonatomic,assign) BOOL isEchoCancel;
 
+/**
+ *  是否变声， Sets pitch change in semi-tones compared to the original pitch
+ *  (-12 .. +12)，默认为0不变声
+ */
+@property (nonatomic,assign) int pitch;
+
 @end
 
 NS_ASSUME_NONNULL_END

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

@@ -323,6 +323,7 @@ - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_numbe
     audio_config.sampleRate = audio_rate;
     audio_config.channels = 1;
     audio_config.isEchoCancel = isEchoCancel;
+    audio_config.pitch = 0;
 
     TIoTCoreVideoConfig *video_config = [TIoTCoreVideoConfig new];
     video_config.localView = localView;
@@ -347,6 +348,7 @@ - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_numbe
         systemAvCapture = [[TIoTAVCaptionFLV alloc] initWithAudioConfig:audio_config.sampleRate channel:audio_config.channels];
         systemAvCapture.videoLocalView = video_config.localView;
         systemAvCapture.isEchoCancel = audio_config.isEchoCancel;
+        systemAvCapture.pitch = audio_config.pitch;
     }
     systemAvCapture.devicePosition = video_config.videoPosition;
     systemAvCapture.videoLocalView = video_config.localView;

TIoTLinkVideo.podspec

@@ -21,6 +21,7 @@ Pod::Spec.new do |s|
   s.dependency 'TIoTLinkKit_XP2P', '2.4.27' #~> 2.4.21-beta.202202101145  
   s.dependency 'TIoTLinkKit_FLV', '2.2.3'
   s.dependency 'CocoaAsyncSocket', '7.6.5'
+  s.dependency 'TIoTLinkKit_SoundTouch', '0.0.3'
 
   s.pod_target_xcconfig = {
     'VALID_ARCHS'  => 'arm64'