#5814: Process noise reduction before echo cancelling

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

@@ -294,13 +294,14 @@ int AudioRtpRecordHandler::processDataEncode (void)
 
         _audioRtpRecord.audioProcessMutex.enter();
 
-        echoCanceller.process(micDataConverted, micDataEchoCancelled, nbSample * sizeof(SFLDataFormat));
-        
         if (Manager::instance().audioPreference.getNoiseReduce()) {
-            _audioRtpRecord._audioProcess->processAudio (micDataEchoCancelled, nbSample * sizeof (SFLDataFormat));
-            // _audioRtpRecord._audioProcess->processAudio (micDataConverted, nbSample * sizeof (SFLDataFormat));
+            // _audioRtpRecord._audioProcess->processAudio (micDataEchoCancelled, nbSample * sizeof (SFLDataFormat));
+            _audioRtpRecord._audioProcess->processAudio (micDataConverted, nbSample * sizeof (SFLDataFormat));
         }
 
+        echoCanceller.process(micDataConverted, micDataEchoCancelled, nbSample * sizeof(SFLDataFormat));
+
+
         _audioRtpRecord.audioProcessMutex.leave();
 
         _audioRtpRecord.audioCodecMutex.enter();
@@ -314,14 +315,15 @@ int AudioRtpRecordHandler::processDataEncode (void)
 
         _audioRtpRecord.audioProcessMutex.enter();
 
+        if (Manager::instance().audioPreference.getNoiseReduce()) {
+            _audioRtpRecord._audioProcess->processAudio (micData, nbSample * sizeof (SFLDataFormat));
+            // _audioRtpRecord._audioProcess->processAudio (micDataEchoCancelled, nbSample * sizeof (SFLDataFormat));
+        }
+
         echoCanceller.process(micData, micDataEchoCancelled, nbSample * sizeof(SFLDataFormat));
 
         teststream.write(reinterpret_cast<char *>(micDataEchoCancelled), nbSample * sizeof(SFLDataFormat));
 
-        if (Manager::instance().audioPreference.getNoiseReduce()) {
-            // _audioRtpRecord._audioProcess->processAudio (micData, nbSample * sizeof (SFLDataFormat));
-            _audioRtpRecord._audioProcess->processAudio (micDataEchoCancelled, nbSample * sizeof (SFLDataFormat));
-        }
         
         _audioRtpRecord.audioProcessMutex.leave();