From 4f86fc54c8838dd3e2d9f209c31b70fc1cb95d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Mon, 29 Aug 2011 15:37:19 -0400
Subject: [PATCH] AudioRtpRecordHandler::initNoiseSuppress() : use
noiseSuppress directly
---
daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp | 6 +-----
daemon/src/audio/audiortp/AudioRtpRecordHandler.h | 1 -
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp b/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
index 21a44927f7..32573218a9 100644
--- a/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
+++ b/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
@@ -46,7 +46,6 @@ AudioRtpRecord::AudioRtpRecord () : _audioCodec (NULL)
, _codecSampleRate (0)
, _codecFrameSize (0)
, _micAmplFactor (initFadeinFactor)
- , _audioProcess (NULL)
, _noiseSuppress (NULL)
, _callId ("")
, _dtmfPayloadType(101) // same as Asterisk
@@ -59,7 +58,6 @@ AudioRtpRecord::~AudioRtpRecord()
{
delete _converter;
delete _audioCodec;
- delete _audioProcess;
delete _noiseSuppress;
}
@@ -103,11 +101,9 @@ void AudioRtpRecordHandler::initNoiseSuppress()
{
_audioRtpRecord.audioProcessMutex.enter();
- delete _audioRtpRecord._audioProcess;
delete _audioRtpRecord._noiseSuppress;
_audioRtpRecord._noiseSuppress = new NoiseSuppress (getCodecFrameSize(), getCodecSampleRate());
- _audioRtpRecord._audioProcess = new AudioProcessing (_audioRtpRecord._noiseSuppress);
_audioRtpRecord.audioProcessMutex.leave();
}
@@ -153,7 +149,7 @@ int AudioRtpRecordHandler::processDataEncode (void)
_audioRtpRecord.audioProcessMutex.enter();
if (Manager::instance().audioPreference.getNoiseReduce())
- _audioRtpRecord._audioProcess->processAudio (micData, bytesToGet);
+ _audioRtpRecord._noiseSuppress->process(micData, bytesToGet);
_audioRtpRecord.audioProcessMutex.leave();
#ifdef DUMP_PROCESS_DATA_ENCODE
diff --git a/daemon/src/audio/audiortp/AudioRtpRecordHandler.h b/daemon/src/audio/audiortp/AudioRtpRecordHandler.h
index 7d7343d9f9..5bd3aad367 100644
--- a/daemon/src/audio/audiortp/AudioRtpRecordHandler.h
+++ b/daemon/src/audio/audiortp/AudioRtpRecordHandler.h
@@ -95,7 +95,6 @@ class AudioRtpRecord
int _converterSamplingRate;
std::list<int> _dtmfQueue;
SFLDataFormat _micAmplFactor;
- AudioProcessing *_audioProcess;
NoiseSuppress *_noiseSuppress;
ost::Mutex audioProcessMutex;
std::string _callId;
--
GitLab