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 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 bool level_controller_enabled = false; | 364 bool level_controller_enabled = false; |
365 } capture_nonlocked_; | 365 } capture_nonlocked_; |
366 | 366 |
367 struct ApmRenderState { | 367 struct ApmRenderState { |
368 ApmRenderState(); | 368 ApmRenderState(); |
369 ~ApmRenderState(); | 369 ~ApmRenderState(); |
370 std::unique_ptr<AudioConverter> render_converter; | 370 std::unique_ptr<AudioConverter> render_converter; |
371 std::unique_ptr<AudioBuffer> render_audio; | 371 std::unique_ptr<AudioBuffer> render_audio; |
372 } render_ GUARDED_BY(crit_render_); | 372 } render_ GUARDED_BY(crit_render_); |
373 | 373 |
374 size_t render_queue_element_max_size_ GUARDED_BY(crit_render_) | 374 size_t float_render_queue_element_max_size_ GUARDED_BY(crit_render_) |
375 GUARDED_BY(crit_capture_) = 0; | 375 GUARDED_BY(crit_capture_) = 0; |
376 std::vector<float> render_queue_buffer_ GUARDED_BY(crit_render_); | 376 std::vector<float> float_render_queue_buffer_ GUARDED_BY(crit_render_); |
377 std::vector<float> capture_queue_buffer_ GUARDED_BY(crit_capture_); | 377 std::vector<float> float_capture_queue_buffer_ GUARDED_BY(crit_capture_); |
| 378 |
| 379 size_t int16_render_queue_element_max_size_ GUARDED_BY(crit_render_) |
| 380 GUARDED_BY(crit_capture_) = 0; |
| 381 std::vector<int16_t> int16_render_queue_buffer_ GUARDED_BY(crit_render_); |
| 382 std::vector<int16_t> int16_capture_queue_buffer_ GUARDED_BY(crit_capture_); |
378 | 383 |
379 // Lock protection not needed. | 384 // Lock protection not needed. |
380 std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>> | 385 std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>> |
381 render_signal_queue_; | 386 float_render_signal_queue_; |
| 387 std::unique_ptr< |
| 388 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>> |
| 389 int16_render_signal_queue_; |
382 }; | 390 }; |
383 | 391 |
384 } // namespace webrtc | 392 } // namespace webrtc |
385 | 393 |
386 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ | 394 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_ |
OLD | NEW |