Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Side by Side Diff: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

Issue 1230503003: Update a ton of audio code to use size_t more correctly and in general reduce (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Resync Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 153
154 int32_t _id; 154 int32_t _id;
155 155
156 Frequency _minimumMixingFreq; 156 Frequency _minimumMixingFreq;
157 157
158 // Mix result callback 158 // Mix result callback
159 AudioMixerOutputReceiver* _mixReceiver; 159 AudioMixerOutputReceiver* _mixReceiver;
160 160
161 // The current sample frequency and sample size when mixing. 161 // The current sample frequency and sample size when mixing.
162 Frequency _outputFrequency; 162 Frequency _outputFrequency;
163 uint16_t _sampleSize; 163 size_t _sampleSize;
164 164
165 // Memory pool to avoid allocating/deallocating AudioFrames 165 // Memory pool to avoid allocating/deallocating AudioFrames
166 MemoryPool<AudioFrame>* _audioFramePool; 166 MemoryPool<AudioFrame>* _audioFramePool;
167 167
168 // List of all participants. Note all lists are disjunct 168 // List of all participants. Note all lists are disjunct
169 MixerParticipantList _participantList; // May be mixed. 169 MixerParticipantList _participantList; // May be mixed.
170 // Always mixed, anonomously. 170 // Always mixed, anonomously.
171 MixerParticipantList _additionalParticipantList; 171 MixerParticipantList _additionalParticipantList;
172 172
173 size_t _numMixedParticipants; 173 size_t _numMixedParticipants;
174 // Determines if we will use a limiter for clipping protection during 174 // Determines if we will use a limiter for clipping protection during
175 // mixing. 175 // mixing.
176 bool use_limiter_; 176 bool use_limiter_;
177 177
178 uint32_t _timeStamp; 178 uint32_t _timeStamp;
179 179
180 // Metronome class. 180 // Metronome class.
181 TimeScheduler _timeScheduler; 181 TimeScheduler _timeScheduler;
182 182
183 // Counter keeping track of concurrent calls to process. 183 // Counter keeping track of concurrent calls to process.
184 // Note: should never be higher than 1 or lower than 0. 184 // Note: should never be higher than 1 or lower than 0.
185 int16_t _processCalls; 185 int16_t _processCalls;
186 186
187 // Used for inhibiting saturation in mixing. 187 // Used for inhibiting saturation in mixing.
188 rtc::scoped_ptr<AudioProcessing> _limiter; 188 rtc::scoped_ptr<AudioProcessing> _limiter;
189 }; 189 };
190 } // namespace webrtc 190 } // namespace webrtc
191 191
192 #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_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698