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

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

Issue 2731993002: Update formatting of AudioLevel class (Closed)
Patch Set: Review comments Created 3 years, 9 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/output_mixer.h ('k') | no next file » | 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
11 #ifndef WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H 11 #ifndef WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
12 #define WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H 12 #define WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/common_audio/resampler/include/push_resampler.h" 17 #include "webrtc/common_audio/resampler/include/push_resampler.h"
18 #include "webrtc/common_types.h" 18 #include "webrtc/common_types.h"
19 #include "webrtc/modules/audio_processing/typing_detection.h" 19 #include "webrtc/modules/audio_processing/typing_detection.h"
20 #include "webrtc/modules/include/module_common_types.h" 20 #include "webrtc/modules/include/module_common_types.h"
21 #include "webrtc/voice_engine/audio_level.h"
21 #include "webrtc/voice_engine/file_player.h" 22 #include "webrtc/voice_engine/file_player.h"
22 #include "webrtc/voice_engine/file_recorder.h" 23 #include "webrtc/voice_engine/file_recorder.h"
23 #include "webrtc/voice_engine/include/voe_base.h" 24 #include "webrtc/voice_engine/include/voe_base.h"
24 #include "webrtc/voice_engine/level_indicator.h"
25 #include "webrtc/voice_engine/monitor_module.h" 25 #include "webrtc/voice_engine/monitor_module.h"
26 #include "webrtc/voice_engine/voice_engine_defines.h" 26 #include "webrtc/voice_engine/voice_engine_defines.h"
27 27
28 #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) 28 #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS)
29 #define WEBRTC_VOICE_ENGINE_TYPING_DETECTION 1 29 #define WEBRTC_VOICE_ENGINE_TYPING_DETECTION 1
30 #else 30 #else
31 #define WEBRTC_VOICE_ENGINE_TYPING_DETECTION 0 31 #define WEBRTC_VOICE_ENGINE_TYPING_DETECTION 0
32 #endif 32 #endif
33 33
34 namespace webrtc { 34 namespace webrtc {
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 bool _mixFileWithMicrophone = false; 228 bool _mixFileWithMicrophone = false;
229 uint32_t _captureLevel = 0; 229 uint32_t _captureLevel = 0;
230 bool _mute = false; 230 bool _mute = false;
231 bool stereo_codec_ = false; 231 bool stereo_codec_ = false;
232 bool swap_stereo_channels_ = false; 232 bool swap_stereo_channels_ = false;
233 }; 233 };
234 } // namespace voe 234 } // namespace voe
235 } // namespace webrtc 235 } // namespace webrtc
236 236
237 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H 237 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/output_mixer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698