Integrate Intelligibility with APM

webrtc/voice_engine/output_mixer.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 557 matching lines @@
     _audioLevel.ComputeLevel(_audioFrame);
 
     return 0;
 }
 
 // ----------------------------------------------------------------------------
 //                             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) {
+  if (_audioProcessingModulePtr->AnalyzeReverseStream(&_audioFrame) == -1) {

[Andrew MacDonald, 2015/07/29 03:52:28]

Can you run through a bunch of codecs in voe_cmd_test with AEC on/off
intelligibility on/off and make sure everything sounds OK? I'll do the same once
you land this.

[ekm, 2015/07/29 23:35:06]

Tried a bunch on loopback. AEC is effective for all with or without
intelligibility enabled, except for opus. For opus, I couldn't get AEC to be
effective in any case, even using AnalyzeReverseStream instead of
ProcessReverseStream. I'm guessing this is a separate issue.

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

Hmm, OK, I'll try it once this lands.

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

Acknowledged.

     WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId,-1),
                  "AudioProcessingModule::AnalyzeReverseStream() => error");
   }
 }
 
 int
 OutputMixer::InsertInbandDtmfTone()
 {
     uint16_t sampleRate(0);
     _dtmfGenerator.GetSampleRate(sampleRate);
@@ skipping 31 matching lines @@
             _audioFrame.data_[2 * i + 1] = 0;
         }
     }
     assert(_audioFrame.samples_per_channel_ == toneSamples);
 
     return 0;
 }
 
 }  // namespace voe
 }  // namespace webrtc