OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2004 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_MEDIA_ENGINE_WEBRTCVOE_H_ | 11 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ |
12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ | 12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ |
13 | 13 |
14 #include <memory> | 14 #include <memory> |
15 | 15 |
16 #include "webrtc/base/common.h" | 16 #include "webrtc/base/common.h" |
17 #include "webrtc/media/engine/webrtccommon.h" | 17 #include "webrtc/media/engine/webrtccommon.h" |
18 | 18 |
19 #include "webrtc/common_types.h" | 19 #include "webrtc/common_types.h" |
20 #include "webrtc/modules/audio_device/include/audio_device.h" | 20 #include "webrtc/modules/audio_device/include/audio_device.h" |
21 #include "webrtc/voice_engine/include/voe_audio_processing.h" | 21 #include "webrtc/voice_engine/include/voe_audio_processing.h" |
22 #include "webrtc/voice_engine/include/voe_base.h" | 22 #include "webrtc/voice_engine/include/voe_base.h" |
23 #include "webrtc/voice_engine/include/voe_codec.h" | 23 #include "webrtc/voice_engine/include/voe_codec.h" |
24 #include "webrtc/voice_engine/include/voe_errors.h" | 24 #include "webrtc/voice_engine/include/voe_errors.h" |
25 #include "webrtc/voice_engine/include/voe_hardware.h" | 25 #include "webrtc/voice_engine/include/voe_hardware.h" |
26 #include "webrtc/voice_engine/include/voe_network.h" | |
kwiberg-webrtc
2016/06/16 09:33:45
This appears unrelated to this CL?
the sun
2016/06/16 12:31:38
Yes, sorry.
| |
27 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" | 26 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" |
28 #include "webrtc/voice_engine/include/voe_volume_control.h" | 27 #include "webrtc/voice_engine/include/voe_volume_control.h" |
29 | 28 |
30 namespace cricket { | 29 namespace cricket { |
31 // automatically handles lifetime of WebRtc VoiceEngine | 30 // automatically handles lifetime of WebRtc VoiceEngine |
32 class scoped_voe_engine { | 31 class scoped_voe_engine { |
33 public: | 32 public: |
34 explicit scoped_voe_engine(webrtc::VoiceEngine* e) : ptr(e) {} | 33 explicit scoped_voe_engine(webrtc::VoiceEngine* e) : ptr(e) {} |
35 // VERIFY, to ensure that there are no leaks at shutdown | 34 // VERIFY, to ensure that there are no leaks at shutdown |
36 ~scoped_voe_engine() { if (ptr) VERIFY(webrtc::VoiceEngine::Delete(ptr)); } | 35 ~scoped_voe_engine() { if (ptr) VERIFY(webrtc::VoiceEngine::Delete(ptr)); } |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
108 scoped_voe_ptr<webrtc::VoEAudioProcessing> processing_; | 107 scoped_voe_ptr<webrtc::VoEAudioProcessing> processing_; |
109 scoped_voe_ptr<webrtc::VoEBase> base_; | 108 scoped_voe_ptr<webrtc::VoEBase> base_; |
110 scoped_voe_ptr<webrtc::VoECodec> codec_; | 109 scoped_voe_ptr<webrtc::VoECodec> codec_; |
111 scoped_voe_ptr<webrtc::VoEHardware> hw_; | 110 scoped_voe_ptr<webrtc::VoEHardware> hw_; |
112 scoped_voe_ptr<webrtc::VoERTP_RTCP> rtp_; | 111 scoped_voe_ptr<webrtc::VoERTP_RTCP> rtp_; |
113 scoped_voe_ptr<webrtc::VoEVolumeControl> volume_; | 112 scoped_voe_ptr<webrtc::VoEVolumeControl> volume_; |
114 }; | 113 }; |
115 } // namespace cricket | 114 } // namespace cricket |
116 | 115 |
117 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ | 116 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ |
OLD | NEW |