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_AUDIO_MIXER_IMPL_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ |
12 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ | 12 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ |
13 | 13 |
14 #include <map> | 14 #include <map> |
15 #include <memory> | 15 #include <memory> |
16 #include <vector> | 16 #include <vector> |
17 | 17 |
18 #include "webrtc/base/thread_annotations.h" | 18 #include "webrtc/base/thread_annotations.h" |
19 #include "webrtc/base/thread_checker.h" | 19 #include "webrtc/base/thread_checker.h" |
20 #include "webrtc/engine_configurations.h" | |
21 #include "webrtc/modules/audio_mixer/audio_mixer.h" | 20 #include "webrtc/modules/audio_mixer/audio_mixer.h" |
22 #include "webrtc/modules/audio_mixer/audio_mixer_defines.h" | 21 #include "webrtc/modules/audio_mixer/audio_mixer_defines.h" |
23 #include "webrtc/modules/audio_processing/include/audio_processing.h" | 22 #include "webrtc/modules/audio_processing/include/audio_processing.h" |
24 #include "webrtc/modules/include/module_common_types.h" | 23 #include "webrtc/modules/include/module_common_types.h" |
25 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | 24 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
26 #include "webrtc/voice_engine/level_indicator.h" | 25 #include "webrtc/voice_engine/level_indicator.h" |
| 26 #include "webrtc/voice_engine_configurations.h" |
27 | 27 |
28 namespace webrtc { | 28 namespace webrtc { |
29 | 29 |
30 typedef std::vector<AudioFrame*> AudioFrameList; | 30 typedef std::vector<AudioFrame*> AudioFrameList; |
31 typedef std::vector<MixerAudioSource*> MixerAudioSourceList; | 31 typedef std::vector<MixerAudioSource*> MixerAudioSourceList; |
32 | 32 |
33 class AudioMixerImpl : public AudioMixer { | 33 class AudioMixerImpl : public AudioMixer { |
34 public: | 34 public: |
35 // AudioProcessing only accepts 10 ms frames. | 35 // AudioProcessing only accepts 10 ms frames. |
36 static const int kFrameDurationInMs = 10; | 36 static const int kFrameDurationInMs = 10; |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 std::unique_ptr<AudioProcessing> limiter_ ACCESS_ON(&thread_checker_); | 114 std::unique_ptr<AudioProcessing> limiter_ ACCESS_ON(&thread_checker_); |
115 | 115 |
116 // Measures audio level for the combined signal. | 116 // Measures audio level for the combined signal. |
117 voe::AudioLevel audio_level_ ACCESS_ON(&thread_checker_); | 117 voe::AudioLevel audio_level_ ACCESS_ON(&thread_checker_); |
118 | 118 |
119 RTC_DISALLOW_COPY_AND_ASSIGN(AudioMixerImpl); | 119 RTC_DISALLOW_COPY_AND_ASSIGN(AudioMixerImpl); |
120 }; | 120 }; |
121 } // namespace webrtc | 121 } // namespace webrtc |
122 | 122 |
123 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ | 123 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ |
OLD | NEW |