| 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 ASSERT_EQ(AudioProcessing::kNoError, | 218 ASSERT_EQ(AudioProcessing::kNoError, |
| 219 apm->echo_cancellation()->Enable(false)); | 219 apm->echo_cancellation()->Enable(false)); |
| 220 ASSERT_EQ(AudioProcessing::kNoError, apm->echo_control_mobile()->Enable( | 220 ASSERT_EQ(AudioProcessing::kNoError, apm->echo_control_mobile()->Enable( |
| 221 include_default_apm_processing)); | 221 include_default_apm_processing)); |
| 222 } else { | 222 } else { |
| 223 ASSERT_EQ(AudioProcessing::kNoError, | 223 ASSERT_EQ(AudioProcessing::kNoError, |
| 224 apm->echo_cancellation()->Enable(include_default_apm_processing)); | 224 apm->echo_cancellation()->Enable(include_default_apm_processing)); |
| 225 ASSERT_EQ(AudioProcessing::kNoError, | 225 ASSERT_EQ(AudioProcessing::kNoError, |
| 226 apm->echo_control_mobile()->Enable(false)); | 226 apm->echo_control_mobile()->Enable(false)); |
| 227 } | 227 } |
| 228 ASSERT_EQ(AudioProcessing::kNoError, | 228 apm_config.high_pass_filter.enabled = include_default_apm_processing; |
| 229 apm->high_pass_filter()->Enable(include_default_apm_processing)); | |
| 230 ASSERT_EQ(AudioProcessing::kNoError, | 229 ASSERT_EQ(AudioProcessing::kNoError, |
| 231 apm->noise_suppression()->Enable(include_default_apm_processing)); | 230 apm->noise_suppression()->Enable(include_default_apm_processing)); |
| 232 ASSERT_EQ(AudioProcessing::kNoError, | 231 ASSERT_EQ(AudioProcessing::kNoError, |
| 233 apm->voice_detection()->Enable(include_default_apm_processing)); | 232 apm->voice_detection()->Enable(include_default_apm_processing)); |
| 234 ASSERT_EQ(AudioProcessing::kNoError, | 233 ASSERT_EQ(AudioProcessing::kNoError, |
| 235 apm->level_estimator()->Enable(include_default_apm_processing)); | 234 apm->level_estimator()->Enable(include_default_apm_processing)); |
| 236 | 235 |
| 237 StreamConfig render_input_config(render_input_sample_rate_hz, num_channels, | 236 StreamConfig render_input_config(render_input_sample_rate_hz, num_channels, |
| 238 false); | 237 false); |
| 239 StreamConfig render_output_config(render_output_sample_rate_hz, num_channels, | 238 StreamConfig render_output_config(render_output_sample_rate_hz, num_channels, |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 RunTogetherWithApm("LevelControlAndDefaultMobileApm", 48000, 48000, | 346 RunTogetherWithApm("LevelControlAndDefaultMobileApm", 48000, 48000, |
| 348 capture_input_sample_rate_hz, | 347 capture_input_sample_rate_hz, |
| 349 capture_output_sample_rate_hz, num_channels, true, | 348 capture_output_sample_rate_hz, num_channels, true, |
| 350 true); | 349 true); |
| 351 } | 350 } |
| 352 } | 351 } |
| 353 } | 352 } |
| 354 } | 353 } |
| 355 | 354 |
| 356 } // namespace webrtc | 355 } // namespace webrtc |
| OLD | NEW |