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_SHARED_DATA_H | 11 #ifndef WEBRTC_VOICE_ENGINE_SHARED_DATA_H |
12 #define WEBRTC_VOICE_ENGINE_SHARED_DATA_H | 12 #define WEBRTC_VOICE_ENGINE_SHARED_DATA_H |
13 | 13 |
| 14 #include <memory> |
| 15 |
14 #include "webrtc/base/criticalsection.h" | 16 #include "webrtc/base/criticalsection.h" |
15 #include "webrtc/base/scoped_ptr.h" | |
16 #include "webrtc/modules/audio_device/include/audio_device.h" | 17 #include "webrtc/modules/audio_device/include/audio_device.h" |
17 #include "webrtc/modules/audio_processing/include/audio_processing.h" | 18 #include "webrtc/modules/audio_processing/include/audio_processing.h" |
18 #include "webrtc/modules/utility/include/process_thread.h" | 19 #include "webrtc/modules/utility/include/process_thread.h" |
19 #include "webrtc/voice_engine/channel_manager.h" | 20 #include "webrtc/voice_engine/channel_manager.h" |
20 #include "webrtc/voice_engine/statistics.h" | 21 #include "webrtc/voice_engine/statistics.h" |
21 #include "webrtc/voice_engine/voice_engine_defines.h" | 22 #include "webrtc/voice_engine/voice_engine_defines.h" |
22 | 23 |
23 class ProcessThread; | 24 class ProcessThread; |
24 | 25 |
25 namespace webrtc { | 26 namespace webrtc { |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 const char* msg) const; | 63 const char* msg) const; |
63 | 64 |
64 protected: | 65 protected: |
65 const uint32_t _instanceId; | 66 const uint32_t _instanceId; |
66 rtc::CriticalSection _apiCritPtr; | 67 rtc::CriticalSection _apiCritPtr; |
67 ChannelManager _channelManager; | 68 ChannelManager _channelManager; |
68 Statistics _engineStatistics; | 69 Statistics _engineStatistics; |
69 AudioDeviceModule* _audioDevicePtr; | 70 AudioDeviceModule* _audioDevicePtr; |
70 OutputMixer* _outputMixerPtr; | 71 OutputMixer* _outputMixerPtr; |
71 TransmitMixer* _transmitMixerPtr; | 72 TransmitMixer* _transmitMixerPtr; |
72 rtc::scoped_ptr<AudioProcessing> audioproc_; | 73 std::unique_ptr<AudioProcessing> audioproc_; |
73 rtc::scoped_ptr<ProcessThread> _moduleProcessThreadPtr; | 74 std::unique_ptr<ProcessThread> _moduleProcessThreadPtr; |
74 | 75 |
75 AudioDeviceModule::AudioLayer _audioDeviceLayer; | 76 AudioDeviceModule::AudioLayer _audioDeviceLayer; |
76 | 77 |
77 SharedData(const Config& config); | 78 SharedData(const Config& config); |
78 virtual ~SharedData(); | 79 virtual ~SharedData(); |
79 }; | 80 }; |
80 | 81 |
81 } // namespace voe | 82 } // namespace voe |
82 | 83 |
83 } // namespace webrtc | 84 } // namespace webrtc |
84 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H | 85 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H |
OLD | NEW |