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

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

Issue 1972043004: Revert of Implement RTCConfiguration.iceCandidatePoolSize. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebasing 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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 // wrapper object that can be deleted without deleting the underlying 276 // wrapper object that can be deleted without deleting the underlying
277 // |dtls_identity_store_|, protecting it from being deleted multiple times. 277 // |dtls_identity_store_|, protecting it from being deleted multiple times.
278 dtls_identity_store.reset( 278 dtls_identity_store.reset(
279 new DtlsIdentityStoreWrapper(dtls_identity_store_)); 279 new DtlsIdentityStoreWrapper(dtls_identity_store_));
280 } 280 }
281 281
282 if (!allocator) { 282 if (!allocator) {
283 allocator.reset(new cricket::BasicPortAllocator( 283 allocator.reset(new cricket::BasicPortAllocator(
284 default_network_manager_.get(), default_socket_factory_.get())); 284 default_network_manager_.get(), default_socket_factory_.get()));
285 } 285 }
286 worker_thread_->Invoke<void>( 286 allocator->SetNetworkIgnoreMask(options_.network_ignore_mask);
287 rtc::Bind(&cricket::PortAllocator::SetNetworkIgnoreMask, allocator.get(),
288 options_.network_ignore_mask));
289 287
290 rtc::scoped_refptr<PeerConnection> pc( 288 rtc::scoped_refptr<PeerConnection> pc(
291 new rtc::RefCountedObject<PeerConnection>(this)); 289 new rtc::RefCountedObject<PeerConnection>(this));
292 290
293 if (!pc->Initialize(configuration, std::move(allocator), 291 if (!pc->Initialize(configuration, std::move(allocator),
294 std::move(dtls_identity_store), observer)) { 292 std::move(dtls_identity_store), observer)) {
295 return nullptr; 293 return nullptr;
296 } 294 }
297 return PeerConnectionProxy::Create(signaling_thread(), pc); 295 return PeerConnectionProxy::Create(signaling_thread(), pc);
298 } 296 }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 } 338 }
341 339
342 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 340 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
343 ASSERT(worker_thread_ == rtc::Thread::Current()); 341 ASSERT(worker_thread_ == rtc::Thread::Current());
344 return cricket::WebRtcMediaEngineFactory::Create( 342 return cricket::WebRtcMediaEngineFactory::Create(
345 default_adm_.get(), video_encoder_factory_.get(), 343 default_adm_.get(), video_encoder_factory_.get(),
346 video_decoder_factory_.get()); 344 video_decoder_factory_.get());
347 } 345 }
348 346
349 } // namespace webrtc 347 } // 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