| 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_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL
_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL
_H_ |
| 12 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL
_H_ | 12 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL
_H_ |
| 13 | 13 |
| 14 #include <list> | 14 #include <list> |
| 15 #include <map> | 15 #include <map> |
| 16 #include <memory> |
| 16 | 17 |
| 17 #include "webrtc/base/scoped_ptr.h" | |
| 18 #include "webrtc/engine_configurations.h" | 18 #include "webrtc/engine_configurations.h" |
| 19 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h
" | 19 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h
" |
| 20 #include "webrtc/modules/audio_conference_mixer/source/memory_pool.h" | 20 #include "webrtc/modules/audio_conference_mixer/source/memory_pool.h" |
| 21 #include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h" | 21 #include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h" |
| 22 #include "webrtc/modules/include/module_common_types.h" | 22 #include "webrtc/modules/include/module_common_types.h" |
| 23 | 23 |
| 24 namespace webrtc { | 24 namespace webrtc { |
| 25 class AudioProcessing; | 25 class AudioProcessing; |
| 26 class CriticalSectionWrapper; | 26 class CriticalSectionWrapper; |
| 27 | 27 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 const AudioFrameList& audioFrameList) const; | 135 const AudioFrameList& audioFrameList) const; |
| 136 | 136 |
| 137 // Mix the AudioFrames stored in audioFrameList into mixedAudio. No | 137 // Mix the AudioFrames stored in audioFrameList into mixedAudio. No |
| 138 // record will be kept of this mix (e.g. the corresponding MixerParticipants | 138 // record will be kept of this mix (e.g. the corresponding MixerParticipants |
| 139 // will not be marked as IsMixed() | 139 // will not be marked as IsMixed() |
| 140 int32_t MixAnonomouslyFromList(AudioFrame* mixedAudio, | 140 int32_t MixAnonomouslyFromList(AudioFrame* mixedAudio, |
| 141 const AudioFrameList& audioFrameList) const; | 141 const AudioFrameList& audioFrameList) const; |
| 142 | 142 |
| 143 bool LimitMixedAudio(AudioFrame* mixedAudio) const; | 143 bool LimitMixedAudio(AudioFrame* mixedAudio) const; |
| 144 | 144 |
| 145 rtc::scoped_ptr<CriticalSectionWrapper> _crit; | 145 std::unique_ptr<CriticalSectionWrapper> _crit; |
| 146 rtc::scoped_ptr<CriticalSectionWrapper> _cbCrit; | 146 std::unique_ptr<CriticalSectionWrapper> _cbCrit; |
| 147 | 147 |
| 148 int32_t _id; | 148 int32_t _id; |
| 149 | 149 |
| 150 Frequency _minimumMixingFreq; | 150 Frequency _minimumMixingFreq; |
| 151 | 151 |
| 152 // Mix result callback | 152 // Mix result callback |
| 153 AudioMixerOutputReceiver* _mixReceiver; | 153 AudioMixerOutputReceiver* _mixReceiver; |
| 154 | 154 |
| 155 // The current sample frequency and sample size when mixing. | 155 // The current sample frequency and sample size when mixing. |
| 156 Frequency _outputFrequency; | 156 Frequency _outputFrequency; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 172 uint32_t _timeStamp; | 172 uint32_t _timeStamp; |
| 173 | 173 |
| 174 // Metronome class. | 174 // Metronome class. |
| 175 TimeScheduler _timeScheduler; | 175 TimeScheduler _timeScheduler; |
| 176 | 176 |
| 177 // Counter keeping track of concurrent calls to process. | 177 // Counter keeping track of concurrent calls to process. |
| 178 // Note: should never be higher than 1 or lower than 0. | 178 // Note: should never be higher than 1 or lower than 0. |
| 179 int16_t _processCalls; | 179 int16_t _processCalls; |
| 180 | 180 |
| 181 // Used for inhibiting saturation in mixing. | 181 // Used for inhibiting saturation in mixing. |
| 182 rtc::scoped_ptr<AudioProcessing> _limiter; | 182 std::unique_ptr<AudioProcessing> _limiter; |
| 183 }; | 183 }; |
| 184 } // namespace webrtc | 184 } // namespace webrtc |
| 185 | 185 |
| 186 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IM
PL_H_ | 186 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IM
PL_H_ |
| OLD | NEW |