From c46eeb8a85bef9948e0cbf1d5b77b2f9f81f6762 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Thu, 3 May 2012 16:21:01 -0400
Subject: [PATCH] #10230: Get back default mainbuffer sampling rate to 8kHz, no
need of decoding noise suppressor
---
daemon/src/audio/audiortp/audio_rtp_record_handler.cpp | 4 ----
daemon/src/audio/audiortp/audio_rtp_record_handler.h | 1 -
daemon/src/audio/mainbuffer.cpp | 2 +-
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp b/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
index 0a36cc96bd..135f26f392 100644
--- a/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
+++ b/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
@@ -63,7 +63,6 @@ AudioRtpRecord::AudioRtpRecord() :
, dtmfQueue_()
, fadeFactor_(INIT_FADE_IN_FACTOR)
, noiseSuppressEncode_(0)
- , noiseSuppressDecode_(0)
, audioProcessMutex_()
, callId_("")
, dtmfPayloadType_(101) // same as Asterisk
@@ -80,7 +79,6 @@ AudioRtpRecord::~AudioRtpRecord()
delete converterDecode_;
delete audioCodec_;
delete noiseSuppressEncode_;
- delete noiseSuppressDecode_;
}
@@ -125,8 +123,6 @@ void AudioRtpRecordHandler::initNoiseSuppress()
ost::MutexLock lock(audioRtpRecord_.audioProcessMutex_);
delete audioRtpRecord_.noiseSuppressEncode_;
audioRtpRecord_.noiseSuppressEncode_ = new NoiseSuppress(getCodecFrameSize(), getCodecSampleRate());
- delete audioRtpRecord_.noiseSuppressDecode_;
- audioRtpRecord_.noiseSuppressDecode_ = new NoiseSuppress(getCodecFrameSize(), getCodecSampleRate());
}
void AudioRtpRecordHandler::putDtmfEvent(int digit)
diff --git a/daemon/src/audio/audiortp/audio_rtp_record_handler.h b/daemon/src/audio/audiortp/audio_rtp_record_handler.h
index 3f3a7ec649..422095a57c 100644
--- a/daemon/src/audio/audiortp/audio_rtp_record_handler.h
+++ b/daemon/src/audio/audiortp/audio_rtp_record_handler.h
@@ -93,7 +93,6 @@ class AudioRtpRecord {
std::list<int> dtmfQueue_;
SFLDataFormat fadeFactor_;
NoiseSuppress *noiseSuppressEncode_;
- NoiseSuppress *noiseSuppressDecode_;
ost::Mutex audioProcessMutex_;
std::string callId_;
unsigned int dtmfPayloadType_;
diff --git a/daemon/src/audio/mainbuffer.cpp b/daemon/src/audio/mainbuffer.cpp
index f77a00954e..6925bf0f43 100644
--- a/daemon/src/audio/mainbuffer.cpp
+++ b/daemon/src/audio/mainbuffer.cpp
@@ -37,7 +37,7 @@
const char * const MainBuffer::DEFAULT_ID = "audiolayer_id";
-MainBuffer::MainBuffer() : ringBufferMap_(), callIDMap_(), mutex_(), internalSamplingRate_(16000)
+MainBuffer::MainBuffer() : ringBufferMap_(), callIDMap_(), mutex_(), internalSamplingRate_(8000)
{}
MainBuffer::~MainBuffer()
--
GitLab