| 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 #include <memory> |
| 17 | 17 |
| 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 |
| 28 typedef std::list<AudioFrame*> AudioFrameList; | 28 struct FrameAndMuteInfo { |
| 29 FrameAndMuteInfo(AudioFrame* f, bool m) : frame(f), muted(m) {} |
| 30 AudioFrame* frame; |
| 31 bool muted; |
| 32 }; |
| 33 |
| 34 typedef std::list<FrameAndMuteInfo> AudioFrameList; |
| 29 typedef std::list<MixerParticipant*> MixerParticipantList; | 35 typedef std::list<MixerParticipant*> MixerParticipantList; |
| 30 | 36 |
| 31 // Cheshire cat implementation of MixerParticipant's non virtual functions. | 37 // Cheshire cat implementation of MixerParticipant's non virtual functions. |
| 32 class MixHistory | 38 class MixHistory |
| 33 { | 39 { |
| 34 public: | 40 public: |
| 35 MixHistory(); | 41 MixHistory(); |
| 36 ~MixHistory(); | 42 ~MixHistory(); |
| 37 | 43 |
| 38 // Returns true if the participant is being mixed. | 44 // Returns true if the participant is being mixed. |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 // Counter keeping track of concurrent calls to process. | 183 // Counter keeping track of concurrent calls to process. |
| 178 // Note: should never be higher than 1 or lower than 0. | 184 // Note: should never be higher than 1 or lower than 0. |
| 179 int16_t _processCalls; | 185 int16_t _processCalls; |
| 180 | 186 |
| 181 // Used for inhibiting saturation in mixing. | 187 // Used for inhibiting saturation in mixing. |
| 182 std::unique_ptr<AudioProcessing> _limiter; | 188 std::unique_ptr<AudioProcessing> _limiter; |
| 183 }; | 189 }; |
| 184 } // namespace webrtc | 190 } // namespace webrtc |
| 185 | 191 |
| 186 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IM
PL_H_ | 192 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IM
PL_H_ |
| OLD | NEW |