| 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_CONTROL_MOBILE_IMPL_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ |
| 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ | 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_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 EchoControlMobileImpl : public EchoControlMobile, | 25 class EchoControlMobileImpl : public EchoControlMobile, |
| 25 public ProcessingComponent { | 26 public ProcessingComponent { |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 unsigned char* external_echo_path_ GUARDED_BY(crit_render_) | 75 unsigned char* external_echo_path_ GUARDED_BY(crit_render_) |
| 75 GUARDED_BY(crit_capture_); | 76 GUARDED_BY(crit_capture_); |
| 76 | 77 |
| 77 size_t render_queue_element_max_size_ GUARDED_BY(crit_render_) | 78 size_t render_queue_element_max_size_ GUARDED_BY(crit_render_) |
| 78 GUARDED_BY(crit_capture_); | 79 GUARDED_BY(crit_capture_); |
| 79 | 80 |
| 80 std::vector<int16_t> render_queue_buffer_ GUARDED_BY(crit_render_); | 81 std::vector<int16_t> render_queue_buffer_ GUARDED_BY(crit_render_); |
| 81 std::vector<int16_t> capture_queue_buffer_ GUARDED_BY(crit_capture_); | 82 std::vector<int16_t> capture_queue_buffer_ GUARDED_BY(crit_capture_); |
| 82 | 83 |
| 83 // Lock protection not needed. | 84 // Lock protection not needed. |
| 84 rtc::scoped_ptr< | 85 std::unique_ptr< |
| 85 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>> | 86 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>> |
| 86 render_signal_queue_; | 87 render_signal_queue_; |
| 87 }; | 88 }; |
| 88 } // namespace webrtc | 89 } // namespace webrtc |
| 89 | 90 |
| 90 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ | 91 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ |
| OLD | NEW |