| 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 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 // wrapper object that can be deleted without deleting the underlying | 280 // wrapper object that can be deleted without deleting the underlying |
| 281 // |dtls_identity_store_|, protecting it from being deleted multiple times. | 281 // |dtls_identity_store_|, protecting it from being deleted multiple times. |
| 282 dtls_identity_store.reset( | 282 dtls_identity_store.reset( |
| 283 new DtlsIdentityStoreWrapper(dtls_identity_store_)); | 283 new DtlsIdentityStoreWrapper(dtls_identity_store_)); |
| 284 } | 284 } |
| 285 | 285 |
| 286 if (!allocator) { | 286 if (!allocator) { |
| 287 allocator.reset(new cricket::BasicPortAllocator( | 287 allocator.reset(new cricket::BasicPortAllocator( |
| 288 default_network_manager_.get(), default_socket_factory_.get())); | 288 default_network_manager_.get(), default_socket_factory_.get())); |
| 289 } | 289 } |
| 290 worker_thread_->Invoke<void>( | 290 network_thread_->Invoke<void>( |
| 291 rtc::Bind(&cricket::PortAllocator::SetNetworkIgnoreMask, allocator.get(), | 291 rtc::Bind(&cricket::PortAllocator::SetNetworkIgnoreMask, allocator.get(), |
| 292 options_.network_ignore_mask)); | 292 options_.network_ignore_mask)); |
| 293 | 293 |
| 294 rtc::scoped_refptr<PeerConnection> pc( | 294 rtc::scoped_refptr<PeerConnection> pc( |
| 295 new rtc::RefCountedObject<PeerConnection>(this)); | 295 new rtc::RefCountedObject<PeerConnection>(this)); |
| 296 | 296 |
| 297 if (!pc->Initialize(configuration, std::move(allocator), | 297 if (!pc->Initialize(configuration, std::move(allocator), |
| 298 std::move(dtls_identity_store), observer)) { | 298 std::move(dtls_identity_store), observer)) { |
| 299 return nullptr; | 299 return nullptr; |
| 300 } | 300 } |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 } | 348 } |
| 349 | 349 |
| 350 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 350 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
| 351 ASSERT(worker_thread_ == rtc::Thread::Current()); | 351 ASSERT(worker_thread_ == rtc::Thread::Current()); |
| 352 return cricket::WebRtcMediaEngineFactory::Create( | 352 return cricket::WebRtcMediaEngineFactory::Create( |
| 353 default_adm_.get(), video_encoder_factory_.get(), | 353 default_adm_.get(), video_encoder_factory_.get(), |
| 354 video_decoder_factory_.get()); | 354 video_decoder_factory_.get()); |
| 355 } | 355 } |
| 356 | 356 |
| 357 } // namespace webrtc | 357 } // namespace webrtc |
| OLD | NEW |