1111#import " flv-muxer.h"
1212
1313#include < iostream>
14- #include " wb_vad.h"
1514#import " TIoTPCMXEchoRecord.h"
1615#import < SoundTouchiOS/ijksoundtouch_wrap.h>
1716#import < GVoiceSEiOS/GVoiceSE.h>
1817
1918__weak static TIoTAVCaptionFLV *tAVCaptionFLV = nil ;
2019static flv_muxer_t * flvMuxer = nullptr ;
2120dispatch_queue_t muxerQueue;
22- static VadVars *vadstate = nullptr ;
2321// NSFileHandle *_fileHandle;
2422
2523@interface TIoTAVCaptionFLV ()<AVCaptureVideoDataOutputSampleBufferDelegate,AVCaptureAudioDataOutputSampleBufferDelegate,H264EncoderDelegate,TIoTAACEncoderDelegate>
@@ -41,7 +39,6 @@ @interface TIoTAVCaptionFLV ()<AVCaptureVideoDataOutputSampleBufferDelegate,AVCa
4139@property (nonatomic , assign ) int captureVideoFPS;
4240@property (nonatomic , strong ) AVCaptureSessionPreset resolutionRatioValue;
4341@property (nonatomic , strong ) TIoTPCMXEchoRecord *pcmRecord;
44- @property (nonatomic , assign ) BOOL isVadRecongize;
4542// @property (nonatomic, strong) dispatch_queue_t audioEncodeQueue;
4643@end
4744
@@ -54,7 +51,6 @@ -(instancetype) initWithAudioConfig:(TIoTAVCaptionFLVAudioType)audioSampleRate c
5451 _audioRate = audioSampleRate;
5552 _channel = channel;
5653 _isEchoCancel = NO ;
57- _isVadRecongize = NO ;
5854 _pitch = 0 ;
5955 _devicePosition = AVCaptureDevicePositionBack;
6056
@@ -87,7 +83,6 @@ - (void)setupAudioCapture {
8783 self.aacEncoder .audioType = _audioRate;
8884 return ;
8985 }
90- wb_vad_init (&(vadstate));
9186 AudioStreamBasicDescription inAudioStreamBasicDescription;
9287
9388 self.pcmRecord = [[TIoTPCMXEchoRecord alloc ] initWithChannel: _channel isEcho: _isEchoCancel];
@@ -376,7 +371,7 @@ - (void)setRemoteAudioFrame:(void *)pcmdata len:(int)pcmlen {
376371static uint8_t pcm_buffer_origin[640 ];
377372static uint8_t pcm_buffer_gvoice[640 ];
378373static uint8_t pcm_buffer_result[8192 ];
379- float indata[FRAME_LEN];
374+
380375TPCircularBuffer circularBuf_gvoice_pcm;
381376TPCircularBuffer circularBuf_result_pcm;
382377
@@ -570,7 +565,6 @@ -(BOOL) startCapture {
570565// [fileManager createFileAtPath:h264File contents:nil attributes:nil];
571566// _fileHandle = [NSFileHandle fileHandleForWritingAtPath:h264File];
572567
573- self.isVadRecongize = NO ;
574568 [self .pcmRecord Init_buffer: &circularBuf_gvoice_pcm :1920 ];
575569 [self .pcmRecord Init_buffer: &circularBuf_result_pcm :1920 ];
576570 flv_init_load ();
@@ -589,8 +583,6 @@ -(void) stopCapture{
589583
590584 [self .pcmRecord Destory_buffer: &circularBuf_gvoice_pcm];
591585 [self .pcmRecord Destory_buffer: &circularBuf_result_pcm];
592- wb_vad_exit (&vadstate);
593- self.isVadRecongize = NO ;
594586}
595587
596588- (void ) startCamera
0 commit comments