| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 57 |
| 58 // EchoControlMobile implementation. | 58 // EchoControlMobile implementation. |
| 59 int Enable(bool enable) override; | 59 int Enable(bool enable) override; |
| 60 int set_routing_mode(RoutingMode mode) override; | 60 int set_routing_mode(RoutingMode mode) override; |
| 61 int enable_comfort_noise(bool enable) override; | 61 int enable_comfort_noise(bool enable) override; |
| 62 int SetEchoPath(const void* echo_path, size_t size_bytes) override; | 62 int SetEchoPath(const void* echo_path, size_t size_bytes) override; |
| 63 int GetEchoPath(void* echo_path, size_t size_bytes) const override; | 63 int GetEchoPath(void* echo_path, size_t size_bytes) const override; |
| 64 | 64 |
| 65 int Configure(); | 65 int Configure(); |
| 66 | 66 |
| 67 rtc::CriticalSection* const crit_render_ ACQUIRED_BEFORE(crit_capture_); | 67 rtc::CriticalSection* const crit_render_ RTC_ACQUIRED_BEFORE(crit_capture_); |
| 68 rtc::CriticalSection* const crit_capture_; | 68 rtc::CriticalSection* const crit_capture_; |
| 69 | 69 |
| 70 bool enabled_ = false; | 70 bool enabled_ = false; |
| 71 | 71 |
| 72 RoutingMode routing_mode_ GUARDED_BY(crit_capture_); | 72 RoutingMode routing_mode_ RTC_GUARDED_BY(crit_capture_); |
| 73 bool comfort_noise_enabled_ GUARDED_BY(crit_capture_); | 73 bool comfort_noise_enabled_ RTC_GUARDED_BY(crit_capture_); |
| 74 unsigned char* external_echo_path_ GUARDED_BY(crit_render_) | 74 unsigned char* external_echo_path_ RTC_GUARDED_BY(crit_render_) |
| 75 GUARDED_BY(crit_capture_); | 75 RTC_GUARDED_BY(crit_capture_); |
| 76 | 76 |
| 77 std::vector<std::unique_ptr<Canceller>> cancellers_; | 77 std::vector<std::unique_ptr<Canceller>> cancellers_; |
| 78 std::unique_ptr<StreamProperties> stream_properties_; | 78 std::unique_ptr<StreamProperties> stream_properties_; |
| 79 | 79 |
| 80 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoControlMobileImpl); | 80 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoControlMobileImpl); |
| 81 }; | 81 }; |
| 82 } // namespace webrtc | 82 } // namespace webrtc |
| 83 | 83 |
| 84 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ | 84 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ |
| OLD | NEW |