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/shared_data.h" | 11 #include "webrtc/voice_engine/shared_data.h" |
12 | 12 |
13 #include "webrtc/modules/audio_processing/include/audio_processing.h" | 13 #include "webrtc/modules/audio_processing/include/audio_processing.h" |
14 #include "webrtc/system_wrappers/include/trace.h" | 14 #include "webrtc/system_wrappers/include/trace.h" |
15 #include "webrtc/voice_engine/channel.h" | 15 #include "webrtc/voice_engine/channel.h" |
16 #include "webrtc/voice_engine/output_mixer.h" | 16 #include "webrtc/voice_engine/output_mixer.h" |
17 #include "webrtc/voice_engine/transmit_mixer.h" | 17 #include "webrtc/voice_engine/transmit_mixer.h" |
18 | 18 |
19 namespace webrtc { | 19 namespace webrtc { |
20 | 20 |
21 namespace voe { | 21 namespace voe { |
22 | 22 |
23 static int32_t _gInstanceCounter = 0; | 23 static int32_t _gInstanceCounter = 0; |
24 | 24 |
25 SharedData::SharedData(const Config& config) | 25 SharedData::SharedData(const Config& config) |
26 : _instanceId(++_gInstanceCounter), | 26 : _instanceId(++_gInstanceCounter), |
27 _channelManager(_gInstanceCounter, config), | 27 _channelManager(_gInstanceCounter, config), |
28 _engineStatistics(_gInstanceCounter), | 28 _engineStatistics(_gInstanceCounter), |
29 _audioDevicePtr(NULL), | 29 _audioDevicePtr(NULL), |
30 _moduleProcessThreadPtr(ProcessThread::Create("VoiceProcessThread")) { | 30 _moduleProcessThreadPtr( |
| 31 rtc::ScopedToUnique(ProcessThread::Create("VoiceProcessThread"))) { |
31 Trace::CreateTrace(); | 32 Trace::CreateTrace(); |
32 if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0) | 33 if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0) |
33 { | 34 { |
34 _outputMixerPtr->SetEngineInformation(_engineStatistics); | 35 _outputMixerPtr->SetEngineInformation(_engineStatistics); |
35 } | 36 } |
36 if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) | 37 if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) |
37 { | 38 { |
38 _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr, | 39 _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr, |
39 _engineStatistics, | 40 _engineStatistics, |
40 _channelManager); | 41 _channelManager); |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 } | 106 } |
106 | 107 |
107 void SharedData::SetLastError(int32_t error, TraceLevel level, | 108 void SharedData::SetLastError(int32_t error, TraceLevel level, |
108 const char* msg) const { | 109 const char* msg) const { |
109 _engineStatistics.SetLastError(error, level, msg); | 110 _engineStatistics.SetLastError(error, level, msg); |
110 } | 111 } |
111 | 112 |
112 } // namespace voe | 113 } // namespace voe |
113 | 114 |
114 } // namespace webrtc | 115 } // namespace webrtc |
OLD | NEW |