Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Unified Diff: webrtc/voice_engine/output_mixer.cc

Issue 1776363002: Use ProcessReverseStream in VoiceEngines OutputMixer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@reverse2
Patch Set: Take the lock in the right place Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_processing/include/audio_processing.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « webrtc/modules/audio_processing/include/audio_processing.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698