OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 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 |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 // wrapper object that can be deleted without deleting the underlying | 275 // wrapper object that can be deleted without deleting the underlying |
276 // |dtls_identity_store_|, protecting it from being deleted multiple times. | 276 // |dtls_identity_store_|, protecting it from being deleted multiple times. |
277 dtls_identity_store.reset( | 277 dtls_identity_store.reset( |
278 new DtlsIdentityStoreWrapper(dtls_identity_store_)); | 278 new DtlsIdentityStoreWrapper(dtls_identity_store_)); |
279 } | 279 } |
280 | 280 |
281 if (!allocator) { | 281 if (!allocator) { |
282 allocator.reset(new cricket::BasicPortAllocator( | 282 allocator.reset(new cricket::BasicPortAllocator( |
283 default_network_manager_.get(), default_socket_factory_.get())); | 283 default_network_manager_.get(), default_socket_factory_.get())); |
284 } | 284 } |
285 allocator->SetNetworkIgnoreMask(options_.network_ignore_mask); | 285 worker_thread_->Invoke<void>( |
| 286 rtc::Bind(&cricket::PortAllocator::SetNetworkIgnoreMask, allocator.get(), |
| 287 options_.network_ignore_mask)); |
286 | 288 |
287 rtc::scoped_refptr<PeerConnection> pc( | 289 rtc::scoped_refptr<PeerConnection> pc( |
288 new rtc::RefCountedObject<PeerConnection>(this)); | 290 new rtc::RefCountedObject<PeerConnection>(this)); |
289 | 291 |
290 if (!pc->Initialize(configuration, std::move(allocator), | 292 if (!pc->Initialize(configuration, std::move(allocator), |
291 std::move(dtls_identity_store), observer)) { | 293 std::move(dtls_identity_store), observer)) { |
292 return nullptr; | 294 return nullptr; |
293 } | 295 } |
294 return PeerConnectionProxy::Create(signaling_thread(), pc); | 296 return PeerConnectionProxy::Create(signaling_thread(), pc); |
295 } | 297 } |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 } | 339 } |
338 | 340 |
339 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 341 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
340 ASSERT(worker_thread_ == rtc::Thread::Current()); | 342 ASSERT(worker_thread_ == rtc::Thread::Current()); |
341 return cricket::WebRtcMediaEngineFactory::Create( | 343 return cricket::WebRtcMediaEngineFactory::Create( |
342 default_adm_.get(), video_encoder_factory_.get(), | 344 default_adm_.get(), video_encoder_factory_.get(), |
343 video_decoder_factory_.get()); | 345 video_decoder_factory_.get()); |
344 } | 346 } |
345 | 347 |
346 } // namespace webrtc | 348 } // namespace webrtc |
OLD | NEW |