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 |
11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ |
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ | 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ |
13 | 13 |
| 14 #include <memory> |
| 15 |
14 #include "webrtc/base/criticalsection.h" | 16 #include "webrtc/base/criticalsection.h" |
15 #include "webrtc/base/scoped_ptr.h" | |
16 #include "webrtc/common_audio/swap_queue.h" | 17 #include "webrtc/common_audio/swap_queue.h" |
17 #include "webrtc/modules/audio_processing/include/audio_processing.h" | 18 #include "webrtc/modules/audio_processing/include/audio_processing.h" |
18 #include "webrtc/modules/audio_processing/processing_component.h" | 19 #include "webrtc/modules/audio_processing/processing_component.h" |
19 | 20 |
20 namespace webrtc { | 21 namespace webrtc { |
21 | 22 |
22 class AudioBuffer; | 23 class AudioBuffer; |
23 | 24 |
24 class EchoCancellationImpl : public EchoCancellation, | 25 class EchoCancellationImpl : public EchoCancellation, |
25 public ProcessingComponent { | 26 public ProcessingComponent { |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 bool extended_filter_enabled_ GUARDED_BY(crit_capture_); | 95 bool extended_filter_enabled_ GUARDED_BY(crit_capture_); |
95 bool delay_agnostic_enabled_ GUARDED_BY(crit_capture_); | 96 bool delay_agnostic_enabled_ GUARDED_BY(crit_capture_); |
96 bool next_generation_aec_enabled_ GUARDED_BY(crit_capture_); | 97 bool next_generation_aec_enabled_ GUARDED_BY(crit_capture_); |
97 | 98 |
98 size_t render_queue_element_max_size_ GUARDED_BY(crit_render_) | 99 size_t render_queue_element_max_size_ GUARDED_BY(crit_render_) |
99 GUARDED_BY(crit_capture_); | 100 GUARDED_BY(crit_capture_); |
100 std::vector<float> render_queue_buffer_ GUARDED_BY(crit_render_); | 101 std::vector<float> render_queue_buffer_ GUARDED_BY(crit_render_); |
101 std::vector<float> capture_queue_buffer_ GUARDED_BY(crit_capture_); | 102 std::vector<float> capture_queue_buffer_ GUARDED_BY(crit_capture_); |
102 | 103 |
103 // Lock protection not needed. | 104 // Lock protection not needed. |
104 rtc::scoped_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>> | 105 std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>> |
105 render_signal_queue_; | 106 render_signal_queue_; |
106 }; | 107 }; |
107 | 108 |
108 } // namespace webrtc | 109 } // namespace webrtc |
109 | 110 |
110 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ | 111 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ |
OLD | NEW |