OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
886 // TODO(bjornv): Fix this test to work with DA-AEC. | 886 // TODO(bjornv): Fix this test to work with DA-AEC. |
887 // Enable AEC only. | 887 // Enable AEC only. |
888 EXPECT_EQ(apm_->kNoError, | 888 EXPECT_EQ(apm_->kNoError, |
889 apm_->echo_cancellation()->enable_drift_compensation(false)); | 889 apm_->echo_cancellation()->enable_drift_compensation(false)); |
890 EXPECT_EQ(apm_->kNoError, | 890 EXPECT_EQ(apm_->kNoError, |
891 apm_->echo_cancellation()->enable_metrics(false)); | 891 apm_->echo_cancellation()->enable_metrics(false)); |
892 EXPECT_EQ(apm_->kNoError, | 892 EXPECT_EQ(apm_->kNoError, |
893 apm_->echo_cancellation()->enable_delay_logging(true)); | 893 apm_->echo_cancellation()->enable_delay_logging(true)); |
894 EXPECT_EQ(apm_->kNoError, apm_->echo_cancellation()->Enable(true)); | 894 EXPECT_EQ(apm_->kNoError, apm_->echo_cancellation()->Enable(true)); |
895 Config config; | 895 Config config; |
896 config.Set<ReportedDelay>(new ReportedDelay(true)); | 896 config.Set<DelayAgnostic>(new DelayAgnostic(false)); |
897 apm_->SetExtraOptions(config); | 897 apm_->SetExtraOptions(config); |
898 | 898 |
899 // Internally in the AEC the amount of lookahead the delay estimation can | 899 // Internally in the AEC the amount of lookahead the delay estimation can |
900 // handle is 15 blocks and the maximum delay is set to 60 blocks. | 900 // handle is 15 blocks and the maximum delay is set to 60 blocks. |
901 const int kLookaheadBlocks = 15; | 901 const int kLookaheadBlocks = 15; |
902 const int kMaxDelayBlocks = 60; | 902 const int kMaxDelayBlocks = 60; |
903 // The AEC has a startup time before it actually starts to process. This | 903 // The AEC has a startup time before it actually starts to process. This |
904 // procedure can flush the internal far-end buffer, which of course affects | 904 // procedure can flush the internal far-end buffer, which of course affects |
905 // the delay estimation. Therefore, we set a system_delay high enough to | 905 // the delay estimation. Therefore, we set a system_delay high enough to |
906 // avoid that. The smallest system_delay you can report without flushing the | 906 // avoid that. The smallest system_delay you can report without flushing the |
(...skipping 1713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2620 std::tr1::make_tuple(16000, 16000, 32000, 40), | 2620 std::tr1::make_tuple(16000, 16000, 32000, 40), |
2621 std::tr1::make_tuple(16000, 16000, 16000, 0))); | 2621 std::tr1::make_tuple(16000, 16000, 16000, 0))); |
2622 #endif | 2622 #endif |
2623 | 2623 |
2624 // TODO(henrike): re-implement functionality lost when removing the old main | 2624 // TODO(henrike): re-implement functionality lost when removing the old main |
2625 // function. See | 2625 // function. See |
2626 // https://code.google.com/p/webrtc/issues/detail?id=1981 | 2626 // https://code.google.com/p/webrtc/issues/detail?id=1981 |
2627 | 2627 |
2628 } // namespace | 2628 } // namespace |
2629 } // namespace webrtc | 2629 } // namespace webrtc |
OLD | NEW |