Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: webrtc/api/peerconnectionfactory.cc

Issue 1982513002: Revert of Relanding: Implement RTCConfiguration.iceCandidatePoolSize. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/api/peerconnection_unittest.cc ('k') | webrtc/api/peerconnectionfactory_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 worker_thread_->Invoke<void>( 285 allocator->SetNetworkIgnoreMask(options_.network_ignore_mask);
286 rtc::Bind(&cricket::PortAllocator::SetNetworkIgnoreMask, allocator.get(),
287 options_.network_ignore_mask));
288 286
289 rtc::scoped_refptr<PeerConnection> pc( 287 rtc::scoped_refptr<PeerConnection> pc(
290 new rtc::RefCountedObject<PeerConnection>(this)); 288 new rtc::RefCountedObject<PeerConnection>(this));
291 289
292 if (!pc->Initialize(configuration, std::move(allocator), 290 if (!pc->Initialize(configuration, std::move(allocator),
293 std::move(dtls_identity_store), observer)) { 291 std::move(dtls_identity_store), observer)) {
294 return nullptr; 292 return nullptr;
295 } 293 }
296 return PeerConnectionProxy::Create(signaling_thread(), pc); 294 return PeerConnectionProxy::Create(signaling_thread(), pc);
297 } 295 }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 } 337 }
340 338
341 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 339 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
342 ASSERT(worker_thread_ == rtc::Thread::Current()); 340 ASSERT(worker_thread_ == rtc::Thread::Current());
343 return cricket::WebRtcMediaEngineFactory::Create( 341 return cricket::WebRtcMediaEngineFactory::Create(
344 default_adm_.get(), video_encoder_factory_.get(), 342 default_adm_.get(), video_encoder_factory_.get(),
345 video_decoder_factory_.get()); 343 video_decoder_factory_.get());
346 } 344 }
347 345
348 } // namespace webrtc 346 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection_unittest.cc ('k') | webrtc/api/peerconnectionfactory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698