| 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 #ifndef WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_ | 11 #ifndef WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_ | 
| 12 #define WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_ | 12 #define WEBRTC_VOICE_ENGINE_OUTPUT_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_conference_mixer/include/audio_conference_mixer.h
     " | 19 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h
     " | 
| 20 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d
     efines.h" | 20 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d
     efines.h" | 
| 21 #include "webrtc/modules/utility/include/file_recorder.h" | 21 #include "webrtc/voice_engine/file_recorder.h" | 
| 22 #include "webrtc/voice_engine/level_indicator.h" | 22 #include "webrtc/voice_engine/level_indicator.h" | 
| 23 #include "webrtc/voice_engine/voice_engine_defines.h" | 23 #include "webrtc/voice_engine/voice_engine_defines.h" | 
| 24 | 24 | 
| 25 namespace webrtc { | 25 namespace webrtc { | 
| 26 | 26 | 
| 27 class AudioProcessing; | 27 class AudioProcessing; | 
| 28 class FileWrapper; | 28 class FileWrapper; | 
| 29 class VoEMediaProcess; | 29 class VoEMediaProcess; | 
| 30 | 30 | 
| 31 namespace voe { | 31 namespace voe { | 
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 123     int _mixingFrequencyHz; | 123     int _mixingFrequencyHz; | 
| 124     std::unique_ptr<FileRecorder> output_file_recorder_; | 124     std::unique_ptr<FileRecorder> output_file_recorder_; | 
| 125     bool _outputFileRecording; | 125     bool _outputFileRecording; | 
| 126 }; | 126 }; | 
| 127 | 127 | 
| 128 }  // namespace voe | 128 }  // namespace voe | 
| 129 | 129 | 
| 130 }  // namespace werbtc | 130 }  // namespace werbtc | 
| 131 | 131 | 
| 132 #endif  // VOICE_ENGINE_OUTPUT_MIXER_H_ | 132 #endif  // VOICE_ENGINE_OUTPUT_MIXER_H_ | 
| OLD | NEW | 
|---|