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

Side by Side Diff: webrtc/voice_engine/transmit_mixer.h

Issue 2984473002: Move total audio energy and duration tracking to AudioLevel and protect with existing critial secti… (Closed)
Patch Set: rebase Created 3 years, 5 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 | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/transmit_mixer.cc » ('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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 std::unique_ptr<FilePlayer> file_player_; 190 std::unique_ptr<FilePlayer> file_player_;
191 std::unique_ptr<FileRecorder> file_recorder_; 191 std::unique_ptr<FileRecorder> file_recorder_;
192 std::unique_ptr<FileRecorder> file_call_recorder_; 192 std::unique_ptr<FileRecorder> file_call_recorder_;
193 int _filePlayerId = 0; 193 int _filePlayerId = 0;
194 int _fileRecorderId = 0; 194 int _fileRecorderId = 0;
195 int _fileCallRecorderId = 0; 195 int _fileCallRecorderId = 0;
196 bool _filePlaying = false; 196 bool _filePlaying = false;
197 bool _fileRecording = false; 197 bool _fileRecording = false;
198 bool _fileCallRecording = false; 198 bool _fileCallRecording = false;
199 voe::AudioLevel _audioLevel; 199 voe::AudioLevel _audioLevel;
200 double totalInputEnergy_ = 0.0;
201 double totalInputDuration_ = 0.0;
202 // protect file instances and their variables in MixedParticipants() 200 // protect file instances and their variables in MixedParticipants()
203 rtc::CriticalSection _critSect; 201 rtc::CriticalSection _critSect;
204 rtc::CriticalSection _callbackCritSect; 202 rtc::CriticalSection _callbackCritSect;
205 203
206 #if WEBRTC_VOICE_ENGINE_TYPING_DETECTION 204 #if WEBRTC_VOICE_ENGINE_TYPING_DETECTION
207 MonitorModule<TransmitMixer> _monitorModule; 205 MonitorModule<TransmitMixer> _monitorModule;
208 webrtc::TypingDetection _typingDetection; 206 webrtc::TypingDetection _typingDetection;
209 bool _typingNoiseWarningPending = false; 207 bool _typingNoiseWarningPending = false;
210 bool _typingNoiseDetected = false; 208 bool _typingNoiseDetected = false;
211 #endif 209 #endif
212 210
213 int _instanceId = 0; 211 int _instanceId = 0;
214 bool _mixFileWithMicrophone = false; 212 bool _mixFileWithMicrophone = false;
215 uint32_t _captureLevel = 0; 213 uint32_t _captureLevel = 0;
216 bool stereo_codec_ = false; 214 bool stereo_codec_ = false;
217 bool swap_stereo_channels_ = false; 215 bool swap_stereo_channels_ = false;
218 }; 216 };
219 } // namespace voe 217 } // namespace voe
220 } // namespace webrtc 218 } // namespace webrtc
221 219
222 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H 220 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/transmit_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698