OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 SubmodulePerformanceTimer capture_timer; | 198 SubmodulePerformanceTimer capture_timer; |
199 SubmodulePerformanceTimer total_timer; | 199 SubmodulePerformanceTimer total_timer; |
200 | 200 |
201 webrtc::Config config; | 201 webrtc::Config config; |
202 AudioProcessing::Config apm_config; | 202 AudioProcessing::Config apm_config; |
203 if (include_default_apm_processing) { | 203 if (include_default_apm_processing) { |
204 config.Set<DelayAgnostic>(new DelayAgnostic(true)); | 204 config.Set<DelayAgnostic>(new DelayAgnostic(true)); |
205 config.Set<ExtendedFilter>(new ExtendedFilter(true)); | 205 config.Set<ExtendedFilter>(new ExtendedFilter(true)); |
206 } | 206 } |
207 apm_config.level_controller.enabled = true; | 207 apm_config.level_controller.enabled = true; |
| 208 apm_config.residual_echo_detector.enabled = include_default_apm_processing; |
208 | 209 |
209 std::unique_ptr<AudioProcessing> apm; | 210 std::unique_ptr<AudioProcessing> apm; |
210 apm.reset(AudioProcessing::Create(config)); | 211 apm.reset(AudioProcessing::Create(config)); |
211 ASSERT_TRUE(apm.get()); | 212 ASSERT_TRUE(apm.get()); |
212 apm->ApplyConfig(apm_config); | 213 apm->ApplyConfig(apm_config); |
213 | 214 |
214 ASSERT_EQ(AudioProcessing::kNoError, | 215 ASSERT_EQ(AudioProcessing::kNoError, |
215 apm->gain_control()->Enable(include_default_apm_processing)); | 216 apm->gain_control()->Enable(include_default_apm_processing)); |
216 if (use_mobile_aec) { | 217 if (use_mobile_aec) { |
217 ASSERT_EQ(AudioProcessing::kNoError, | 218 ASSERT_EQ(AudioProcessing::kNoError, |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 RunTogetherWithApm("LevelControlAndDefaultMobileApm", 48000, 48000, | 347 RunTogetherWithApm("LevelControlAndDefaultMobileApm", 48000, 48000, |
347 capture_input_sample_rate_hz, | 348 capture_input_sample_rate_hz, |
348 capture_output_sample_rate_hz, num_channels, true, | 349 capture_output_sample_rate_hz, num_channels, true, |
349 true); | 350 true); |
350 } | 351 } |
351 } | 352 } |
352 } | 353 } |
353 } | 354 } |
354 | 355 |
355 } // namespace webrtc | 356 } // namespace webrtc |
OLD | NEW |