| 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 "webrtc/voice_engine/output_mixer.h" | 11 #include "webrtc/voice_engine/output_mixer.h" |
| 12 | 12 |
| 13 #include "webrtc/base/format_macros.h" |
| 13 #include "webrtc/modules/audio_processing/include/audio_processing.h" | 14 #include "webrtc/modules/audio_processing/include/audio_processing.h" |
| 14 #include "webrtc/rtc_base/format_macros.h" | |
| 15 #include "webrtc/system_wrappers/include/file_wrapper.h" | 15 #include "webrtc/system_wrappers/include/file_wrapper.h" |
| 16 #include "webrtc/system_wrappers/include/trace.h" | 16 #include "webrtc/system_wrappers/include/trace.h" |
| 17 #include "webrtc/voice_engine/statistics.h" | 17 #include "webrtc/voice_engine/statistics.h" |
| 18 #include "webrtc/voice_engine/utility.h" | 18 #include "webrtc/voice_engine/utility.h" |
| 19 | 19 |
| 20 namespace webrtc { | 20 namespace webrtc { |
| 21 namespace voe { | 21 namespace voe { |
| 22 | 22 |
| 23 void | 23 void |
| 24 OutputMixer::NewMixedAudio(int32_t id, | 24 OutputMixer::NewMixedAudio(int32_t id, |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, -1), | 383 WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, -1), |
| 384 "AudioProcessingModule::ProcessReverseStream() => error"); | 384 "AudioProcessingModule::ProcessReverseStream() => error"); |
| 385 RTC_NOTREACHED(); | 385 RTC_NOTREACHED(); |
| 386 } | 386 } |
| 387 } | 387 } |
| 388 | 388 |
| 389 return 0; | 389 return 0; |
| 390 } | 390 } |
| 391 } // namespace voe | 391 } // namespace voe |
| 392 } // namespace webrtc | 392 } // namespace webrtc |
| OLD | NEW |