添加回音消除接口开关

Change-Id: I82f2afffada54949581a5000a3162b5e6e6b99a9

Author: tonychanchen

Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTAVP2PPlayCaptureVC.m

@@ -400,7 +400,7 @@ - (void)deviceP2PVideoReport:(NSNotification *)reportInfo {
             NSError *outError;
             AVAudioSessionSetActiveOptions options = active ? 0 : AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation;
 
-            [session setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker|AVAudioSessionCategoryOptionAllowBluetooth error:&outError];
+            [session setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker|AVAudioSessionCategoryOptionAllowBluetooth|AVAudioSessionCategoryOptionMixWithOthers error:&outError];
             [session setMode:AVAudioSessionModeVoiceChat error:&outError];
             [session overrideOutputAudioPort:AVAudioSessionPortOverrideSpeaker error:&outError];
             [session setActive:active withOptions:options error:nil];

Source/SDK/LinkVideo/FLV/TIoTAVCaptionFLV.mm

@@ -255,7 +255,7 @@ - (void)setVideoBitRate:(int32_t)bitRate {
 
     int32_t ret = bitRate;
     [self.h264Encoder setEncoderBitrateBps:ret];
-    NSLog(@"-------------------------setEncoderBitrateBps---%d-----------------",ret);
+//    NSLog(@"-------------------------setEncoderBitrateBps---%d-----------------",ret);
 }
 
 - (int32_t)getVideoBitRate {

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h

@@ -110,6 +110,7 @@ extern NSNotificationName const TIoTCoreXP2PBridgeNotificationStreamEnd;
 //音视频采样
 - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTAVCaptionFLVAudioType)audio_rate withLocalPreviewView:(UIView *)localView;
 - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTAVCaptionFLVAudioType)audio_rate withLocalPreviewView:(UIView *)localView videoPosition:(AVCaptureDevicePosition)videoPosition;
+- (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTAVCaptionFLVAudioType)audio_rate withLocalPreviewView:(UIView *)localView videoPosition:(AVCaptureDevicePosition)videoPosition isEchoCancel:(BOOL)isEchoCancel;
 //刷新本地预览视图
 - (void)refreshLocalView:(UIView *)localView;
 - (XP2PErrCode)stopVoiceToServer;

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

@@ -319,6 +319,10 @@ - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_numbe
 }
 
 - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTAVCaptionFLVAudioType)audio_rate withLocalPreviewView:(UIView *)localView videoPosition:(AVCaptureDevicePosition)videoPosition {
+    [self sendVoiceToServer:dev_name channel:channel_number audioConfig:audio_rate withLocalPreviewView:localView videoPosition:videoPosition isEchoCancel:NO];
+}
+
+- (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTAVCaptionFLVAudioType)audio_rate withLocalPreviewView:(UIView *)localView videoPosition:(AVCaptureDevicePosition)videoPosition isEchoCancel:(BOOL)isEchoCancel {
     NSString *audioFile = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject] stringByAppendingPathComponent:@"testVideoStreamfile.flv"];
     [[NSFileManager defaultManager] removeItemAtPath:audioFile error:nil];
     [[NSFileManager defaultManager] createFileAtPath:audioFile contents:nil attributes:nil];
@@ -334,7 +338,7 @@ - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_numbe
     if (systemAvCapture == nil) {
         systemAvCapture = [[TIoTAVCaptionFLV alloc] initWithAudioConfig:audio_rate];
         systemAvCapture.videoLocalView = localView;
-        systemAvCapture.isEchoCancel = YES;
+        systemAvCapture.isEchoCancel = isEchoCancel;
     }
     systemAvCapture.devicePosition = videoPosition;
     systemAvCapture.videoLocalView = localView;
@@ -367,7 +371,7 @@ - (void)getSendBufSize {
 //    for (int i =0; i < _p2p_wl_avg_ctx.len; i++) {
 //        printf("\n stream_buf_con==%d \n",_p2p_wl_avg_ctx.buf[i]);
 //    }
-    NSLog(@"send_bufsize==%d, now_video_rate==%d, avg_index==%d",bufsize, now_video_rate, p2p_wl_avg);
+//    NSLog(@"send_bufsize==%d, now_video_rate==%d, avg_index==%d",bufsize, now_video_rate, p2p_wl_avg);
 
     // 降码率
     // 当发现p2p的水线超过一定值时，降低视频码率，这是一个经验值，一般来说要大于 [视频码率/2]