| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 int enable_comfort_noise(bool enable) override; | 51 int enable_comfort_noise(bool enable) override; |
| 52 int SetEchoPath(const void* echo_path, size_t size_bytes) override; | 52 int SetEchoPath(const void* echo_path, size_t size_bytes) override; |
| 53 int GetEchoPath(void* echo_path, size_t size_bytes) const override; | 53 int GetEchoPath(void* echo_path, size_t size_bytes) const override; |
| 54 | 54 |
| 55 // ProcessingComponent implementation. | 55 // ProcessingComponent implementation. |
| 56 // Called holding both the render and capture locks. | 56 // Called holding both the render and capture locks. |
| 57 void* CreateHandle() const override; | 57 void* CreateHandle() const override; |
| 58 int InitializeHandle(void* handle) const override; | 58 int InitializeHandle(void* handle) const override; |
| 59 int ConfigureHandle(void* handle) const override; | 59 int ConfigureHandle(void* handle) const override; |
| 60 void DestroyHandle(void* handle) const override; | 60 void DestroyHandle(void* handle) const override; |
| 61 int num_handles_required() const override; | 61 size_t num_handles_required() const override; |
| 62 int GetHandleError(void* handle) const override; | 62 int GetHandleError(void* handle) const override; |
| 63 | 63 |
| 64 void AllocateRenderQueue(); | 64 void AllocateRenderQueue(); |
| 65 | 65 |
| 66 // Not guarded as its public API is thread safe. | 66 // Not guarded as its public API is thread safe. |
| 67 const AudioProcessing* apm_; | 67 const AudioProcessing* apm_; |
| 68 | 68 |
| 69 rtc::CriticalSection* const crit_render_ ACQUIRED_BEFORE(crit_capture_); | 69 rtc::CriticalSection* const crit_render_ ACQUIRED_BEFORE(crit_capture_); |
| 70 rtc::CriticalSection* const crit_capture_; | 70 rtc::CriticalSection* const crit_capture_; |
| 71 | 71 |
| 72 RoutingMode routing_mode_ GUARDED_BY(crit_capture_); | 72 RoutingMode routing_mode_ GUARDED_BY(crit_capture_); |
| 73 bool comfort_noise_enabled_ GUARDED_BY(crit_capture_); | 73 bool comfort_noise_enabled_ GUARDED_BY(crit_capture_); |
| 74 unsigned char* external_echo_path_ GUARDED_BY(crit_render_) | 74 unsigned char* external_echo_path_ GUARDED_BY(crit_render_) |
| 75 GUARDED_BY(crit_capture_); | 75 GUARDED_BY(crit_capture_); |
| 76 | 76 |
| 77 size_t render_queue_element_max_size_ GUARDED_BY(crit_render_) | 77 size_t render_queue_element_max_size_ GUARDED_BY(crit_render_) |
| 78 GUARDED_BY(crit_capture_); | 78 GUARDED_BY(crit_capture_); |
| 79 | 79 |
| 80 std::vector<int16_t> render_queue_buffer_ GUARDED_BY(crit_render_); | 80 std::vector<int16_t> render_queue_buffer_ GUARDED_BY(crit_render_); |
| 81 std::vector<int16_t> capture_queue_buffer_ GUARDED_BY(crit_capture_); | 81 std::vector<int16_t> capture_queue_buffer_ GUARDED_BY(crit_capture_); |
| 82 | 82 |
| 83 // Lock protection not needed. | 83 // Lock protection not needed. |
| 84 rtc::scoped_ptr< | 84 rtc::scoped_ptr< |
| 85 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>> | 85 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>> |
| 86 render_signal_queue_; | 86 render_signal_queue_; |
| 87 }; | 87 }; |
| 88 } // namespace webrtc | 88 } // namespace webrtc |
| 89 | 89 |
| 90 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ | 90 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ |
| OLD | NEW |