| 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 ApmDebugDumpThreadState* debug_state); | 232 ApmDebugDumpThreadState* debug_state); |
| 233 int WriteInitMessage() EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_); | 233 int WriteInitMessage() EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_); |
| 234 | 234 |
| 235 // Writes Config message. If not |forced|, only writes the current config if | 235 // Writes Config message. If not |forced|, only writes the current config if |
| 236 // it is different from the last saved one; if |forced|, writes the config | 236 // it is different from the last saved one; if |forced|, writes the config |
| 237 // regardless of the last saved. | 237 // regardless of the last saved. |
| 238 int WriteConfigMessage(bool forced) EXCLUSIVE_LOCKS_REQUIRED(crit_capture_) | 238 int WriteConfigMessage(bool forced) EXCLUSIVE_LOCKS_REQUIRED(crit_capture_) |
| 239 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); | 239 EXCLUSIVE_LOCKS_REQUIRED(crit_capture_); |
| 240 | 240 |
| 241 // Critical section. | 241 // Critical section. |
| 242 mutable rtc::CriticalSection crit_debug_; | 242 rtc::CriticalSection crit_debug_; |
| 243 | 243 |
| 244 // Debug dump state. | 244 // Debug dump state. |
| 245 ApmDebugDumpState debug_dump_; | 245 ApmDebugDumpState debug_dump_; |
| 246 #endif | 246 #endif |
| 247 | 247 |
| 248 // Critical sections. | 248 // Critical sections. |
| 249 mutable rtc::CriticalSection crit_render_ ACQUIRED_BEFORE(crit_capture_); | 249 rtc::CriticalSection crit_render_ ACQUIRED_BEFORE(crit_capture_); |
| 250 mutable rtc::CriticalSection crit_capture_; | 250 rtc::CriticalSection crit_capture_; |
| 251 | 251 |
| 252 // Structs containing the pointers to the submodules. | 252 // Structs containing the pointers to the submodules. |
| 253 rtc::scoped_ptr<ApmPublicSubmodules> public_submodules_; | 253 rtc::scoped_ptr<ApmPublicSubmodules> public_submodules_; |
| 254 rtc::scoped_ptr<ApmPrivateSubmodules> private_submodules_ | 254 rtc::scoped_ptr<ApmPrivateSubmodules> private_submodules_ |
| 255 GUARDED_BY(crit_capture_); | 255 GUARDED_BY(crit_capture_); |
| 256 | 256 |
| 257 // State that is written to while holding both the render and capture locks | 257 // State that is written to while holding both the render and capture locks |
| 258 // but can be read without any lock being held. | 258 // but can be read without any lock being held. |
| 259 // As this is only accessed internally of APM, and all internal methods in APM | 259 // As this is only accessed internally of APM, and all internal methods in APM |
| 260 // either are holding the render or capture locks, this construct is safe as | 260 // either are holding the render or capture locks, this construct is safe as |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 | 338 |
| 339 struct ApmRenderState { | 339 struct ApmRenderState { |
| 340 rtc::scoped_ptr<AudioConverter> render_converter; | 340 rtc::scoped_ptr<AudioConverter> render_converter; |
| 341 rtc::scoped_ptr<AudioBuffer> render_audio; | 341 rtc::scoped_ptr<AudioBuffer> render_audio; |
| 342 } render_ GUARDED_BY(crit_render_); | 342 } render_ GUARDED_BY(crit_render_); |
| 343 }; | 343 }; |
| 344 | 344 |
| 345 } // namespace webrtc | 345 } // namespace webrtc |
| 346 | 346 |
| 347 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ | 347 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ |
| OLD | NEW |