OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2011 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 |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 virtual cricket::TransportController* CreateTransportController( | 98 virtual cricket::TransportController* CreateTransportController( |
99 cricket::PortAllocator* port_allocator, | 99 cricket::PortAllocator* port_allocator, |
100 bool redetermine_role_on_ice_restart); | 100 bool redetermine_role_on_ice_restart); |
101 virtual cricket::ChannelManager* channel_manager(); | 101 virtual cricket::ChannelManager* channel_manager(); |
102 virtual rtc::Thread* signaling_thread(); | 102 virtual rtc::Thread* signaling_thread(); |
103 virtual rtc::Thread* worker_thread(); | 103 virtual rtc::Thread* worker_thread(); |
104 virtual rtc::Thread* network_thread(); | 104 virtual rtc::Thread* network_thread(); |
105 const Options& options() const { return options_; } | 105 const Options& options() const { return options_; } |
106 | 106 |
107 protected: | 107 protected: |
| 108 // Deprecated. Use the method with media_engine, call_factory_, and |
| 109 // event_log_factory instead. |
108 PeerConnectionFactory( | 110 PeerConnectionFactory( |
109 rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory, | 111 rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory, |
110 rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory); | 112 rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory); |
111 PeerConnectionFactory( | 113 PeerConnectionFactory( |
| 114 rtc::Thread* worker_thread, |
| 115 rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory, |
| 116 rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory, |
| 117 std::unique_ptr<cricket::MediaEngineInterface> media_engine, |
| 118 std::unique_ptr<webrtc::CallFactoryInterface> call_factory, |
| 119 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory); |
| 120 |
| 121 // Deprecated. Use the method with media_engine, call_factory_, and |
| 122 // event_log_factory instead. |
| 123 PeerConnectionFactory( |
112 rtc::Thread* network_thread, | 124 rtc::Thread* network_thread, |
113 rtc::Thread* worker_thread, | 125 rtc::Thread* worker_thread, |
114 rtc::Thread* signaling_thread, | 126 rtc::Thread* signaling_thread, |
115 AudioDeviceModule* default_adm, | 127 AudioDeviceModule* default_adm, |
116 rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory, | 128 rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory, |
117 rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory, | 129 rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory, |
118 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, | 130 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, |
119 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, | 131 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, |
120 rtc::scoped_refptr<AudioMixer> audio_mixer); | 132 rtc::scoped_refptr<AudioMixer> audio_mixer); |
| 133 PeerConnectionFactory( |
| 134 rtc::Thread* network_thread, |
| 135 rtc::Thread* worker_thread, |
| 136 rtc::Thread* signaling_thread, |
| 137 AudioDeviceModule* default_adm, |
| 138 rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory, |
| 139 rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory, |
| 140 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, |
| 141 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, |
| 142 rtc::scoped_refptr<AudioMixer> audio_mixer, |
| 143 std::unique_ptr<cricket::MediaEngineInterface> media_engine, |
| 144 std::unique_ptr<webrtc::CallFactoryInterface> call_factory, |
| 145 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory); |
121 virtual ~PeerConnectionFactory(); | 146 virtual ~PeerConnectionFactory(); |
122 | 147 |
123 private: | 148 private: |
124 std::unique_ptr<cricket::MediaEngineInterface> CreateMediaEngine_w(); | 149 Call* CreateCall_w(RtcEventLog* event_log); |
125 | 150 |
126 bool owns_ptrs_; | 151 bool owns_ptrs_; |
127 bool wraps_current_thread_; | 152 bool wraps_current_thread_; |
128 rtc::Thread* network_thread_; | 153 rtc::Thread* network_thread_; |
129 rtc::Thread* worker_thread_; | 154 rtc::Thread* worker_thread_; |
130 rtc::Thread* signaling_thread_; | 155 rtc::Thread* signaling_thread_; |
131 Options options_; | 156 Options options_; |
132 // External Audio device used for audio playback. | 157 // External Audio device used for audio playback. |
133 rtc::scoped_refptr<AudioDeviceModule> default_adm_; | 158 rtc::scoped_refptr<AudioDeviceModule> default_adm_; |
134 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory_; | 159 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory_; |
135 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_; | 160 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_; |
136 std::unique_ptr<cricket::ChannelManager> channel_manager_; | 161 std::unique_ptr<cricket::ChannelManager> channel_manager_; |
137 // External Video encoder factory. This can be NULL if the client has not | 162 // External Video encoder factory. This can be NULL if the client has not |
138 // injected any. In that case, video engine will use the internal SW encoder. | 163 // injected any. In that case, video engine will use the internal SW encoder. |
139 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; | 164 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; |
140 // External Video decoder factory. This can be NULL if the client has not | 165 // External Video decoder factory. This can be NULL if the client has not |
141 // injected any. In that case, video engine will use the internal SW decoder. | 166 // injected any. In that case, video engine will use the internal SW decoder. |
142 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; | 167 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; |
143 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; | 168 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; |
144 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; | 169 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; |
145 // External audio mixer. This can be NULL. In that case, internal audio mixer | 170 // External audio mixer. This can be NULL. In that case, internal audio mixer |
146 // will be created and used. | 171 // will be created and used. |
147 rtc::scoped_refptr<AudioMixer> external_audio_mixer_; | 172 rtc::scoped_refptr<AudioMixer> external_audio_mixer_; |
| 173 std::unique_ptr<cricket::MediaEngineInterface> media_engine_; |
| 174 std::unique_ptr<webrtc::CallFactoryInterface> call_factory_; |
| 175 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory_; |
148 }; | 176 }; |
149 | 177 |
150 } // namespace webrtc | 178 } // namespace webrtc |
151 | 179 |
152 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_ | 180 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_ |
OLD | NEW |