Integrate Intelligibility with APM

webrtc/voice_engine/output_mixer.cc

Index: webrtc/voice_engine/output_mixer.cc
diff --git a/webrtc/voice_engine/output_mixer.cc b/webrtc/voice_engine/output_mixer.cc
index f065f7941b8ed297643f82eaff919d05848e4a76..ae2b5e05050d4cce450dd8a89d3a1169efdf2f3f 100644
--- a/webrtc/voice_engine/output_mixer.cc
+++ b/webrtc/voice_engine/output_mixer.cc
@@ -518,7 +518,7 @@ OutputMixer::DoOperationsOnCombinedSignal(bool feed_data_to_apm)
 
     // --- Far-end Voice Quality Enhancement (AudioProcessing Module)
     if (feed_data_to_apm)
-      APMAnalyzeReverseStream();
+      APMProcessReverseStream();
 
     // --- External media processing
     {
@@ -549,17 +549,10 @@ OutputMixer::DoOperationsOnCombinedSignal(bool feed_data_to_apm)
 //                             Private methods
 // ----------------------------------------------------------------------------
 
-void OutputMixer::APMAnalyzeReverseStream() {
-  // Convert from mixing to AudioProcessing sample rate, determined by the send
-  // side. Downmix to mono.
-  AudioFrame frame;
-  frame.num_channels_ = 1;
-  frame.sample_rate_hz_ = _audioProcessingModulePtr->input_sample_rate_hz();
-  RemixAndResample(_audioFrame, &audioproc_resampler_, &frame);
-
-  if (_audioProcessingModulePtr->AnalyzeReverseStream(&frame) == -1) {
-    WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId,-1),
-                 "AudioProcessingModule::AnalyzeReverseStream() => error");
+void OutputMixer::APMProcessReverseStream() {
+  if (_audioProcessingModulePtr->ProcessReverseStream(&_audioFrame) == -1) {
+    WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, -1),

[Andrew MacDonald, 2015/07/30 03:53:17]

Since we're here, can you make this a kTraceError?

[ekm, 2015/07/30 06:15:19]

Done.

+                 "AudioProcessingModule::ProcessReverseStream() => error");
   }
 }