OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2017 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 |
11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ |
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ | 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ |
13 | 13 |
14 #include <vector> | 14 #include <vector> |
15 | 15 |
16 #include "webrtc/base/constructormagic.h" | 16 #include "webrtc/base/constructormagic.h" |
17 #include "webrtc/base/optional.h" | 17 #include "webrtc/base/optional.h" |
18 #include "webrtc/modules/audio_processing/aec3/matched_filter.h" | |
19 #include "webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h" | |
20 #include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" | |
18 | 21 |
19 namespace webrtc { | 22 namespace webrtc { |
20 | 23 |
21 class ApmDataDumper; | 24 class ApmDataDumper; |
22 | 25 |
26 // Estimates the delay of the echo path. | |
23 class EchoPathDelayEstimator { | 27 class EchoPathDelayEstimator { |
24 public: | 28 public: |
25 EchoPathDelayEstimator(ApmDataDumper* data_dumper, int sample_rate_hz); | 29 EchoPathDelayEstimator(ApmDataDumper* data_dumper, int sample_rate_hz); |
aleloi
2017/02/03 15:46:48
Does the delay estimator need to know the sample r
peah-webrtc
2017/02/06 11:25:38
That is correct. It is no longer needed. I removed
| |
26 ~EchoPathDelayEstimator(); | 30 ~EchoPathDelayEstimator(); |
31 | |
32 // Produce a delay estimate if such is avaliable. | |
27 rtc::Optional<size_t> EstimateDelay(rtc::ArrayView<const float> render, | 33 rtc::Optional<size_t> EstimateDelay(rtc::ArrayView<const float> render, |
28 rtc::ArrayView<const float> capture); | 34 rtc::ArrayView<const float> capture); |
29 | 35 |
30 private: | 36 private: |
37 ApmDataDumper* const data_dumper_; | |
38 DecimatorBy4 render_decimator_; | |
39 DecimatorBy4 capture_decimator_; | |
40 MatchedFilter matched_filter_; | |
41 MatchedFilterLagAggregator matched_filter_lag_aggregator_; | |
42 | |
31 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoPathDelayEstimator); | 43 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoPathDelayEstimator); |
32 }; | 44 }; |
33 } // namespace webrtc | 45 } // namespace webrtc |
34 | 46 |
35 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ | 47 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ |
OLD | NEW |