[#4367] Fix AudioRtpSession putDtmfEvent shadowing

sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp

@@ -62,6 +62,7 @@ AudioRtpRecord::AudioRtpRecord(ManagerImpl *manager) : _audioCodec(NULL)
 
 	_audioLayerFrameSize = Manager::instance().getAudioDriver()->getFrameSize(); // in ms
 	_audioLayerSampleRate = Manager::instance().getAudioDriver()->getSampleRate();
+
 }
 
 
@@ -308,6 +309,16 @@ void AudioRtpRecord::setSpkrFadeInComplete(bool _spkrFadeInComplete)
     this->_spkrFadeInComplete = _spkrFadeInComplete;
 }
 
+void AudioRtpRecord::setAudioProcessing(AudioProcessing *audioProcess)
+{
+	this->_audioProcess = audioProcess;
+}
+
+void AudioRtpRecord::setNoiseSuppress(NoiseSuppress *noiseSuppress)
+{
+	this->_noiseSuppress = noiseSuppress;
+}
+
 AudioRtpRecordHandler::AudioRtpRecordHandler(ManagerImpl *manager, SIPCall *ca) : _audioRtpRecord(manager), _ca(ca) {
 	// TODO Auto-generated constructor stub
 
@@ -365,6 +376,15 @@ void AudioRtpRecordHandler::initBuffers()
     Manager::instance().addStream(_ca->getCallId());
 }
 
+void AudioRtpRecordHandler::initNoiseSuppress()
+{
+	NoiseSuppress *noiseSuppress = new NoiseSuppress (getCodecFrameSize(), getCodecSampleRate());
+	AudioProcessing *processing = new AudioProcessing (noiseSuppress);
+
+	_audioRtpRecord.setNoiseSuppress(noiseSuppress);
+	_audioRtpRecord.setAudioProcessing(processing);
+}
+
 void AudioRtpRecordHandler::putDtmfEvent(int digit)
 {
 	sfl::DtmfEvent *dtmf = new sfl::DtmfEvent();

sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h

@@ -115,6 +115,8 @@ public:
     void setSpkrDataConverted(SFLDataFormat *_spkrDataConverted);
     void setSpkrDataDecoded(SFLDataFormat *_spkrDataDecoded);
     void setSpkrFadeInComplete(bool _spkrFadeInComplete);
+    void setAudioProcessing(AudioProcessing *audioProcess);
+    void setNoiseSuppress(NoiseSuppress *noiseSuppress);
 
 private:
     AudioCodec *_audioCodec;
@@ -192,6 +194,8 @@ public:
       */
      void initBuffers (void);
 
+     void initNoiseSuppress (void);
+
     /**
      * Encode audio data from mainbuffer
      */

sflphone-common/src/audio/audiortp/AudioRtpSession.cpp

@@ -53,7 +53,7 @@ AudioRtpSession::AudioRtpSession (ManagerImpl * manager, SIPCall * sipcall) :
         																	, _countNotificationTime (0)
         																	, _ca (sipcall)
 {
-	setCancel (cancelDefault);
+	this->setCancel (cancelDefault);
 
     assert (_ca);
 
@@ -66,7 +66,7 @@ AudioRtpSession::~AudioRtpSession()
     _debug ("AudioRtpSession: Delete AudioRtpSession instance");
 
     try {
-    	terminate();
+    	this->terminate();
     } catch (...) {
         _debugException ("AudioRtpSession: Thread destructor didn't terminate correctly");
         throw;
@@ -266,7 +266,9 @@ int AudioRtpSession::startRtpThread (AudioCodec* audiocodec)
     setSessionTimeouts();
     setSessionMedia (audiocodec);
     initBuffers();
-    return start (_mainloopSemaphore);
+    int ret = this->start (_mainloopSemaphore);
+    this->startRunning();
+    return ret;
 }
 
 void AudioRtpSession::run ()
@@ -284,6 +286,8 @@ void AudioRtpSession::run ()
         threadSleep = getAudioLayerFrameSize();
     }
 
+    initNoiseSuppress();
+
     TimerPort::setTimer (threadSleep);
 
     // Set recording sampling rate
@@ -291,7 +295,7 @@ void AudioRtpSession::run ()
 
     // Start audio stream (if not started) AND flush all buffers (main and urgent)
     _manager->getAudioDriver()->startStream();
-    startRunning();
+    // startRunning();
 
     _debug ("AudioRtpSession: Entering mainloop for call %s",_ca->getCallId().c_str());
 

sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp

@@ -335,6 +335,8 @@ void AudioZrtpSession::run ()
         threadSleep = getAudioLayerFrameSize();
     }
 
+    initNoiseSuppress();
+
     TimerPort::setTimer (threadSleep);
 
     // Set recording sampling rate
@@ -348,6 +350,8 @@ void AudioZrtpSession::run ()
 
     while (!testCancel()) {
 
+    	_debug("run");
+
         // Reset timestamp to make sure the timing information are up to date
         if (_timestampCount > RTP_TIMESTAMP_RESET_FREQ) {
             _timestamp = getCurrentTimestamp();

sflphone-common/src/managerimpl.cpp

@@ -3727,6 +3727,7 @@ void ManagerImpl::loadIptoipProfile()
     // build a default IP2IP account with default parameters
     _directIpAccount = AccountCreator::createAccount (AccountCreator::SIP_DIRECT_IP_ACCOUNT, "");
     _accountMap[IP2IP_PROFILE] = _directIpAccount;
+    _accountMap[""] = _directIpAccount;
 
     if (_directIpAccount == NULL) {
         _error ("Manager: Failed to create default \"account\"");