Skip to content
Snippets Groups Projects
Commit c46eeb8a authored by Alexandre Savard's avatar Alexandre Savard
Browse files

#10230: Get back default mainbuffer sampling rate to 8kHz, no need of decoding noise suppressor

parent 1bd22d30
No related branches found
No related tags found
No related merge requests found
...@@ -63,7 +63,6 @@ AudioRtpRecord::AudioRtpRecord() : ...@@ -63,7 +63,6 @@ AudioRtpRecord::AudioRtpRecord() :
, dtmfQueue_() , dtmfQueue_()
, fadeFactor_(INIT_FADE_IN_FACTOR) , fadeFactor_(INIT_FADE_IN_FACTOR)
, noiseSuppressEncode_(0) , noiseSuppressEncode_(0)
, noiseSuppressDecode_(0)
, audioProcessMutex_() , audioProcessMutex_()
, callId_("") , callId_("")
, dtmfPayloadType_(101) // same as Asterisk , dtmfPayloadType_(101) // same as Asterisk
...@@ -80,7 +79,6 @@ AudioRtpRecord::~AudioRtpRecord() ...@@ -80,7 +79,6 @@ AudioRtpRecord::~AudioRtpRecord()
delete converterDecode_; delete converterDecode_;
delete audioCodec_; delete audioCodec_;
delete noiseSuppressEncode_; delete noiseSuppressEncode_;
delete noiseSuppressDecode_;
} }
...@@ -125,8 +123,6 @@ void AudioRtpRecordHandler::initNoiseSuppress() ...@@ -125,8 +123,6 @@ void AudioRtpRecordHandler::initNoiseSuppress()
ost::MutexLock lock(audioRtpRecord_.audioProcessMutex_); ost::MutexLock lock(audioRtpRecord_.audioProcessMutex_);
delete audioRtpRecord_.noiseSuppressEncode_; delete audioRtpRecord_.noiseSuppressEncode_;
audioRtpRecord_.noiseSuppressEncode_ = new NoiseSuppress(getCodecFrameSize(), getCodecSampleRate()); audioRtpRecord_.noiseSuppressEncode_ = new NoiseSuppress(getCodecFrameSize(), getCodecSampleRate());
delete audioRtpRecord_.noiseSuppressDecode_;
audioRtpRecord_.noiseSuppressDecode_ = new NoiseSuppress(getCodecFrameSize(), getCodecSampleRate());
} }
void AudioRtpRecordHandler::putDtmfEvent(int digit) void AudioRtpRecordHandler::putDtmfEvent(int digit)
......
...@@ -93,7 +93,6 @@ class AudioRtpRecord { ...@@ -93,7 +93,6 @@ class AudioRtpRecord {
std::list<int> dtmfQueue_; std::list<int> dtmfQueue_;
SFLDataFormat fadeFactor_; SFLDataFormat fadeFactor_;
NoiseSuppress *noiseSuppressEncode_; NoiseSuppress *noiseSuppressEncode_;
NoiseSuppress *noiseSuppressDecode_;
ost::Mutex audioProcessMutex_; ost::Mutex audioProcessMutex_;
std::string callId_; std::string callId_;
unsigned int dtmfPayloadType_; unsigned int dtmfPayloadType_;
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
const char * const MainBuffer::DEFAULT_ID = "audiolayer_id"; const char * const MainBuffer::DEFAULT_ID = "audiolayer_id";
MainBuffer::MainBuffer() : ringBufferMap_(), callIDMap_(), mutex_(), internalSamplingRate_(16000) MainBuffer::MainBuffer() : ringBufferMap_(), callIDMap_(), mutex_(), internalSamplingRate_(8000)
{} {}
MainBuffer::~MainBuffer() MainBuffer::~MainBuffer()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment