|
22 | 22 | #include "modules/audio_device/include/fake_audio_device.h" |
23 | 23 | #include "api/enable_media.h" |
24 | 24 | #include "api/audio/create_audio_device_module.h" |
| 25 | +#include "api/create_peerconnection_factory.h" |
25 | 26 |
|
26 | 27 | #include "PeerConnectionManager.h" |
27 | 28 | #include "V4l2AlsaMap.h" |
@@ -188,25 +189,6 @@ std::unique_ptr<webrtc::VideoDecoderFactory> CreateDecoderFactory(bool nullCodec |
188 | 189 | return factory; |
189 | 190 | } |
190 | 191 |
|
191 | | -webrtc::PeerConnectionFactoryDependencies CreatePeerConnectionFactoryDependencies(webrtc::Thread* signalingThread, webrtc::Thread* workerThread, webrtc::scoped_refptr<webrtc::AudioDeviceModule> audioDeviceModule, webrtc::scoped_refptr<webrtc::AudioDecoderFactory> audioDecoderfactory, bool useNullCodec) |
192 | | -{ |
193 | | - webrtc::PeerConnectionFactoryDependencies dependencies; |
194 | | - dependencies.network_thread = NULL; |
195 | | - dependencies.worker_thread = workerThread; |
196 | | - dependencies.signaling_thread = signalingThread; |
197 | | - dependencies.event_log_factory = absl::make_unique<webrtc::RtcEventLogFactory>(); |
198 | | - |
199 | | - dependencies.adm = std::move(audioDeviceModule); |
200 | | - dependencies.audio_encoder_factory = webrtc::CreateBuiltinAudioEncoderFactory(); |
201 | | - dependencies.audio_decoder_factory = std::move(audioDecoderfactory); |
202 | | - |
203 | | - dependencies.video_encoder_factory = CreateEncoderFactory(useNullCodec); |
204 | | - dependencies.video_decoder_factory = CreateDecoderFactory(useNullCodec); |
205 | | - |
206 | | - webrtc::EnableMedia(dependencies); |
207 | | - |
208 | | - return dependencies; |
209 | | -} |
210 | 192 |
|
211 | 193 |
|
212 | 194 | std::string getParam(const char *queryString, const char *paramName) { |
@@ -245,7 +227,10 @@ PeerConnectionManager::PeerConnectionManager(const std::list<std::string> &iceSe |
245 | 227 |
|
246 | 228 | m_signalingThread->SetName("signaling", NULL); |
247 | 229 | m_signalingThread->Start(); |
248 | | - m_peer_connection_factory = webrtc::CreateModularPeerConnectionFactory(CreatePeerConnectionFactoryDependencies(m_signalingThread.get(), m_workerThread.get(), m_audioDeviceModule, m_audioDecoderfactory, useNullCodec)); |
| 230 | + m_peer_connection_factory = webrtc::CreatePeerConnectionFactory(NULL, m_workerThread.get(), m_signalingThread.get(), |
| 231 | + m_audioDeviceModule, webrtc::CreateBuiltinAudioEncoderFactory(), m_audioDecoderfactory, |
| 232 | + CreateEncoderFactory(useNullCodec), CreateDecoderFactory(useNullCodec), |
| 233 | + NULL, NULL); |
249 | 234 |
|
250 | 235 | // build video audio map |
251 | 236 | m_videoaudiomap = getV4l2AlsaMap(); |
|
0 commit comments