| Index: webrtc/voice_engine/output_mixer.cc
|
| diff --git a/webrtc/voice_engine/output_mixer.cc b/webrtc/voice_engine/output_mixer.cc
|
| index 1c9525a1ab64c0de5f57ba79677f6ee00cd4cc7f..fa4d2a4889b8b0b2b856a4e201adeb45cf7318c1 100644
|
| --- a/webrtc/voice_engine/output_mixer.cc
|
| +++ b/webrtc/voice_engine/output_mixer.cc
|
| @@ -516,14 +516,7 @@ OutputMixer::DoOperationsOnCombinedSignal(bool feed_data_to_apm)
|
|
|
| // --- Far-end Voice Quality Enhancement (AudioProcessing Module)
|
| if (feed_data_to_apm) {
|
| - // Convert from mixing to AudioProcessing sample rate, similarly to how it
|
| - // is done on 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) != 0) {
|
| + if (_audioProcessingModulePtr->ProcessReverseStream(&_audioFrame) != 0) {
|
| WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, -1),
|
| "AudioProcessingModule::AnalyzeReverseStream() => error");
|
| RTC_DCHECK(false);
|
|
|