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

Unified Diff: talk/app/webrtc/localaudiosource.cc

Issue 1151573021: Re-land r9378 "Rename APM Config DelayCorrection to ExtendedFilter" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Adding a comment Created 5 years, 6 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 | « no previous file | talk/app/webrtc/localaudiosource_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/localaudiosource.cc
diff --git a/talk/app/webrtc/localaudiosource.cc b/talk/app/webrtc/localaudiosource.cc
index b37d1e3e41f8a704309465f25577adcc225ca578..65e423e968e1123f1e049ea44e507d47b9126b41 100644
--- a/talk/app/webrtc/localaudiosource.cc
+++ b/talk/app/webrtc/localaudiosource.cc
@@ -58,8 +58,14 @@ void FromConstraints(const MediaConstraintsInterface::Constraints& constraints,
if (iter->key == MediaConstraintsInterface::kEchoCancellation)
options->echo_cancellation.Set(value);
else if (iter->key ==
- MediaConstraintsInterface::kExperimentalEchoCancellation)
- options->experimental_aec.Set(value);
+ MediaConstraintsInterface::kExperimentalEchoCancellation ||
+ iter->key ==
+ MediaConstraintsInterface::kExtendedFilterEchoCancellation)
tommi 2015/06/08 16:41:34 hmm... don't suppose you can start adding braces :
hlundin-webrtc 2015/06/09 08:42:51 Like that?
+ // Both kExperimentalEchoCancellation (old) and
+ // kExtendedFilterEchoCancellation (new) translate to extended_filter_aec
+ // option being set. This is to manage the transition from the old to the
+ // new without breaking dependent code.
+ options->extended_filter_aec.Set(value);
else if (iter->key == MediaConstraintsInterface::kDAEchoCancellation)
options->delay_agnostic_aec.Set(value);
else if (iter->key == MediaConstraintsInterface::kAutoGainControl)
« no previous file with comments | « no previous file | talk/app/webrtc/localaudiosource_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698