| 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 |
| 11 #include "voice_engine/transmit_mixer.h" | 11 #include "voice_engine/transmit_mixer.h" |
| 12 | 12 |
| 13 #include <memory> | 13 #include <memory> |
| 14 | 14 |
| 15 #include "audio/utility/audio_frame_operations.h" | 15 #include "audio/utility/audio_frame_operations.h" |
| 16 #include "rtc_base/format_macros.h" | 16 #include "rtc_base/format_macros.h" |
| 17 #include "rtc_base/location.h" | 17 #include "rtc_base/location.h" |
| 18 #include "rtc_base/logging.h" | 18 #include "rtc_base/logging.h" |
| 19 #include "system_wrappers/include/event_wrapper.h" | 19 #include "system_wrappers/include/event_wrapper.h" |
| 20 #include "system_wrappers/include/trace.h" | 20 #include "system_wrappers/include/trace.h" |
| 21 #include "voice_engine/channel.h" | 21 #include "voice_engine/channel.h" |
| 22 #include "voice_engine/channel_manager.h" | 22 #include "voice_engine/channel_manager.h" |
| 23 #include "voice_engine/statistics.h" | |
| 24 #include "voice_engine/utility.h" | 23 #include "voice_engine/utility.h" |
| 25 | 24 |
| 26 namespace webrtc { | 25 namespace webrtc { |
| 27 namespace voe { | 26 namespace voe { |
| 28 | 27 |
| 29 // TODO(solenberg): The thread safety in this class is dubious. | 28 // TODO(solenberg): The thread safety in this class is dubious. |
| 30 | 29 |
| 31 int32_t | 30 int32_t |
| 32 TransmitMixer::Create(TransmitMixer*& mixer, uint32_t instanceId) | 31 TransmitMixer::Create(TransmitMixer*& mixer, uint32_t instanceId) |
| 33 { | 32 { |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 return swap_stereo_channels_; | 263 return swap_stereo_channels_; |
| 265 } | 264 } |
| 266 | 265 |
| 267 bool TransmitMixer::typing_noise_detected() const { | 266 bool TransmitMixer::typing_noise_detected() const { |
| 268 rtc::CritScope cs(&lock_); | 267 rtc::CritScope cs(&lock_); |
| 269 return typing_noise_detected_; | 268 return typing_noise_detected_; |
| 270 } | 269 } |
| 271 | 270 |
| 272 } // namespace voe | 271 } // namespace voe |
| 273 } // namespace webrtc | 272 } // namespace webrtc |
| OLD | NEW |