Skip to content
Snippets Groups Projects
Commit 4f86fc54 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

AudioRtpRecordHandler::initNoiseSuppress() : use noiseSuppress directly

parent 90d9c09c
No related branches found
No related tags found
No related merge requests found
...@@ -46,7 +46,6 @@ AudioRtpRecord::AudioRtpRecord () : _audioCodec (NULL) ...@@ -46,7 +46,6 @@ AudioRtpRecord::AudioRtpRecord () : _audioCodec (NULL)
, _codecSampleRate (0) , _codecSampleRate (0)
, _codecFrameSize (0) , _codecFrameSize (0)
, _micAmplFactor (initFadeinFactor) , _micAmplFactor (initFadeinFactor)
, _audioProcess (NULL)
, _noiseSuppress (NULL) , _noiseSuppress (NULL)
, _callId ("") , _callId ("")
, _dtmfPayloadType(101) // same as Asterisk , _dtmfPayloadType(101) // same as Asterisk
...@@ -59,7 +58,6 @@ AudioRtpRecord::~AudioRtpRecord() ...@@ -59,7 +58,6 @@ AudioRtpRecord::~AudioRtpRecord()
{ {
delete _converter; delete _converter;
delete _audioCodec; delete _audioCodec;
delete _audioProcess;
delete _noiseSuppress; delete _noiseSuppress;
} }
...@@ -103,11 +101,9 @@ void AudioRtpRecordHandler::initNoiseSuppress() ...@@ -103,11 +101,9 @@ void AudioRtpRecordHandler::initNoiseSuppress()
{ {
_audioRtpRecord.audioProcessMutex.enter(); _audioRtpRecord.audioProcessMutex.enter();
delete _audioRtpRecord._audioProcess;
delete _audioRtpRecord._noiseSuppress; delete _audioRtpRecord._noiseSuppress;
_audioRtpRecord._noiseSuppress = new NoiseSuppress (getCodecFrameSize(), getCodecSampleRate()); _audioRtpRecord._noiseSuppress = new NoiseSuppress (getCodecFrameSize(), getCodecSampleRate());
_audioRtpRecord._audioProcess = new AudioProcessing (_audioRtpRecord._noiseSuppress);
_audioRtpRecord.audioProcessMutex.leave(); _audioRtpRecord.audioProcessMutex.leave();
} }
...@@ -153,7 +149,7 @@ int AudioRtpRecordHandler::processDataEncode (void) ...@@ -153,7 +149,7 @@ int AudioRtpRecordHandler::processDataEncode (void)
_audioRtpRecord.audioProcessMutex.enter(); _audioRtpRecord.audioProcessMutex.enter();
if (Manager::instance().audioPreference.getNoiseReduce()) if (Manager::instance().audioPreference.getNoiseReduce())
_audioRtpRecord._audioProcess->processAudio (micData, bytesToGet); _audioRtpRecord._noiseSuppress->process(micData, bytesToGet);
_audioRtpRecord.audioProcessMutex.leave(); _audioRtpRecord.audioProcessMutex.leave();
#ifdef DUMP_PROCESS_DATA_ENCODE #ifdef DUMP_PROCESS_DATA_ENCODE
......
...@@ -95,7 +95,6 @@ class AudioRtpRecord ...@@ -95,7 +95,6 @@ class AudioRtpRecord
int _converterSamplingRate; int _converterSamplingRate;
std::list<int> _dtmfQueue; std::list<int> _dtmfQueue;
SFLDataFormat _micAmplFactor; SFLDataFormat _micAmplFactor;
AudioProcessing *_audioProcess;
NoiseSuppress *_noiseSuppress; NoiseSuppress *_noiseSuppress;
ost::Mutex audioProcessMutex; ost::Mutex audioProcessMutex;
std::string _callId; std::string _callId;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment