Chromium Code Reviews| 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 352 if (swap_stereo_channels_ && stereo_codec_) | 352 if (swap_stereo_channels_ && stereo_codec_) |
| 353 // Only bother swapping if we're using a stereo codec. | 353 // Only bother swapping if we're using a stereo codec. |
| 354 AudioFrameOperations::SwapStereoChannels(&_audioFrame); | 354 AudioFrameOperations::SwapStereoChannels(&_audioFrame); |
| 355 | 355 |
| 356 // --- Annoying typing detection (utilizes the APM/VAD decision) | 356 // --- Annoying typing detection (utilizes the APM/VAD decision) |
| 357 #ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION | 357 #ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION |
| 358 TypingDetection(keyPressed); | 358 TypingDetection(keyPressed); |
| 359 #endif | 359 #endif |
| 360 | 360 |
| 361 // --- Mute signal | 361 // --- Mute signal |
| 362 if (_mute) | 362 AudioFrameOperations::Mute(&_audioFrame, _mute, _mute); |
| 363 { | |
| 364 AudioFrameOperations::Mute(_audioFrame); | |
| 365 } | |
|
peah-webrtc
2016/03/24 07:04:54
Sorry for the late comment on this, but why is the
the sun
2016/03/24 09:33:15
Exactly.
| |
| 366 | 363 |
| 367 // --- Mix with file (does not affect the mixing frequency) | 364 // --- Mix with file (does not affect the mixing frequency) |
| 368 if (_filePlaying) | 365 if (_filePlaying) |
| 369 { | 366 { |
| 370 MixOrReplaceAudioWithFile(_audioFrame.sample_rate_hz_); | 367 MixOrReplaceAudioWithFile(_audioFrame.sample_rate_hz_); |
| 371 } | 368 } |
| 372 | 369 |
| 373 // --- Record to file | 370 // --- Record to file |
| 374 bool file_recording = false; | 371 bool file_recording = false; |
| 375 { | 372 { |
| (...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1304 void TransmitMixer::EnableStereoChannelSwapping(bool enable) { | 1301 void TransmitMixer::EnableStereoChannelSwapping(bool enable) { |
| 1305 swap_stereo_channels_ = enable; | 1302 swap_stereo_channels_ = enable; |
| 1306 } | 1303 } |
| 1307 | 1304 |
| 1308 bool TransmitMixer::IsStereoChannelSwappingEnabled() { | 1305 bool TransmitMixer::IsStereoChannelSwappingEnabled() { |
| 1309 return swap_stereo_channels_; | 1306 return swap_stereo_channels_; |
| 1310 } | 1307 } |
| 1311 | 1308 |
| 1312 } // namespace voe | 1309 } // namespace voe |
| 1313 } // namespace webrtc | 1310 } // namespace webrtc |
| OLD | NEW |