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_MIXER_SOURCE_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_MIXER_SOURCE_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_ |
12 #define WEBRTC_MODULES_AUDIO_MIXER_SOURCE_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_ | 12 #define WEBRTC_MODULES_AUDIO_MIXER_SOURCE_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_ |
13 | 13 |
14 #include <list> | 14 #include <list> |
15 #include <map> | 15 #include <map> |
16 #include <memory> | 16 #include <memory> |
17 #include <vector> | |
aleloi
2016/08/08 14:21:34
git cl presubmit checks found missing include.
| |
17 | 18 |
18 #include "webrtc/base/thread_checker.h" | 19 #include "webrtc/base/thread_checker.h" |
19 #include "webrtc/engine_configurations.h" | 20 #include "webrtc/engine_configurations.h" |
20 #include "webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h" | 21 #include "webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h" |
21 #include "webrtc/modules/audio_conference_mixer/source/memory_pool.h" | 22 #include "webrtc/modules/audio_conference_mixer/source/memory_pool.h" |
22 #include "webrtc/modules/include/module_common_types.h" | 23 #include "webrtc/modules/include/module_common_types.h" |
23 | 24 |
24 namespace webrtc { | 25 namespace webrtc { |
25 class AudioProcessing; | 26 class AudioProcessing; |
26 class CriticalSectionWrapper; | 27 class CriticalSectionWrapper; |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
147 | 148 |
148 // Ensures that Mix is called from the same thread. | 149 // Ensures that Mix is called from the same thread. |
149 rtc::ThreadChecker thread_checker_; | 150 rtc::ThreadChecker thread_checker_; |
150 | 151 |
151 // Used for inhibiting saturation in mixing. | 152 // Used for inhibiting saturation in mixing. |
152 std::unique_ptr<AudioProcessing> _limiter; | 153 std::unique_ptr<AudioProcessing> _limiter; |
153 }; | 154 }; |
154 } // namespace webrtc | 155 } // namespace webrtc |
155 | 156 |
156 #endif // WEBRTC_MODULES_AUDIO_MIXER_SOURCE_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_ | 157 #endif // WEBRTC_MODULES_AUDIO_MIXER_SOURCE_NEW_AUDIO_CONFERENCE_MIXER_IMPL_H_ |
OLD | NEW |