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

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

Issue 2779623002: remove more CriticalSectionWrappers. (Closed)
Patch Set: rebase Created 3 years, 8 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
« no previous file with comments | « no previous file | webrtc/modules/video_coding/media_optimization.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 const AudioFrameList& audioFrameList) const; 141 const AudioFrameList& audioFrameList) const;
142 142
143 // Mix the AudioFrames stored in audioFrameList into mixedAudio. No 143 // Mix the AudioFrames stored in audioFrameList into mixedAudio. No
144 // record will be kept of this mix (e.g. the corresponding MixerParticipants 144 // record will be kept of this mix (e.g. the corresponding MixerParticipants
145 // will not be marked as IsMixed() 145 // will not be marked as IsMixed()
146 int32_t MixAnonomouslyFromList(AudioFrame* mixedAudio, 146 int32_t MixAnonomouslyFromList(AudioFrame* mixedAudio,
147 const AudioFrameList& audioFrameList) const; 147 const AudioFrameList& audioFrameList) const;
148 148
149 bool LimitMixedAudio(AudioFrame* mixedAudio) const; 149 bool LimitMixedAudio(AudioFrame* mixedAudio) const;
150 150
151 const rtc::CriticalSection _crit; 151 rtc::CriticalSection _crit;
152 const rtc::CriticalSection _cbCrit; 152 rtc::CriticalSection _cbCrit;
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;
(...skipping 20 matching lines...) Expand all
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 std::unique_ptr<AudioProcessing> _limiter; 188 std::unique_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
« no previous file with comments | « no previous file | webrtc/modules/video_coding/media_optimization.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698