| 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 // Mix result callback | 174 // Mix result callback |
| 175 AudioMixerOutputReceiver* _mixReceiver; | 175 AudioMixerOutputReceiver* _mixReceiver; |
| 176 | 176 |
| 177 AudioMixerStatusReceiver* _mixerStatusCallback; | 177 AudioMixerStatusReceiver* _mixerStatusCallback; |
| 178 uint32_t _amountOf10MsBetweenCallbacks; | 178 uint32_t _amountOf10MsBetweenCallbacks; |
| 179 uint32_t _amountOf10MsUntilNextCallback; | 179 uint32_t _amountOf10MsUntilNextCallback; |
| 180 bool _mixerStatusCb; | 180 bool _mixerStatusCb; |
| 181 | 181 |
| 182 // The current sample frequency and sample size when mixing. | 182 // The current sample frequency and sample size when mixing. |
| 183 Frequency _outputFrequency; | 183 Frequency _outputFrequency; |
| 184 uint16_t _sampleSize; | 184 size_t _sampleSize; |
| 185 | 185 |
| 186 // Memory pool to avoid allocating/deallocating AudioFrames | 186 // Memory pool to avoid allocating/deallocating AudioFrames |
| 187 MemoryPool<AudioFrame>* _audioFramePool; | 187 MemoryPool<AudioFrame>* _audioFramePool; |
| 188 | 188 |
| 189 // List of all participants. Note all lists are disjunct | 189 // List of all participants. Note all lists are disjunct |
| 190 MixerParticipantList _participantList; // May be mixed. | 190 MixerParticipantList _participantList; // May be mixed. |
| 191 // Always mixed, anonomously. | 191 // Always mixed, anonomously. |
| 192 MixerParticipantList _additionalParticipantList; | 192 MixerParticipantList _additionalParticipantList; |
| 193 | 193 |
| 194 size_t _numMixedParticipants; | 194 size_t _numMixedParticipants; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 207 // Counter keeping track of concurrent calls to process. | 207 // Counter keeping track of concurrent calls to process. |
| 208 // Note: should never be higher than 1 or lower than 0. | 208 // Note: should never be higher than 1 or lower than 0. |
| 209 int16_t _processCalls; | 209 int16_t _processCalls; |
| 210 | 210 |
| 211 // Used for inhibiting saturation in mixing. | 211 // Used for inhibiting saturation in mixing. |
| 212 rtc::scoped_ptr<AudioProcessing> _limiter; | 212 rtc::scoped_ptr<AudioProcessing> _limiter; |
| 213 }; | 213 }; |
| 214 } // namespace webrtc | 214 } // namespace webrtc |
| 215 | 215 |
| 216 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IM
PL_H_ | 216 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IM
PL_H_ |
| OLD | NEW |