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

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

Issue 1888903003: Network thread (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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/mediacontroller.cc ('k') | webrtc/api/peerconnection_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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 566
567 port_allocator_->set_flags(portallocator_flags); 567 port_allocator_->set_flags(portallocator_flags);
568 // No step delay is used while allocating ports. 568 // No step delay is used while allocating ports.
569 port_allocator_->set_step_delay(cricket::kMinimumStepDelay); 569 port_allocator_->set_step_delay(cricket::kMinimumStepDelay);
570 570
571 media_controller_.reset( 571 media_controller_.reset(
572 factory_->CreateMediaController(configuration.media_config)); 572 factory_->CreateMediaController(configuration.media_config));
573 573
574 session_.reset( 574 session_.reset(
575 new WebRtcSession(media_controller_.get(), factory_->signaling_thread(), 575 new WebRtcSession(media_controller_.get(), factory_->signaling_thread(),
576 factory_->worker_thread(), port_allocator_.get())); 576 factory_->worker_thread(), factory_->network_thread(),
577 port_allocator_.get()));
577 stats_.reset(new StatsCollector(this)); 578 stats_.reset(new StatsCollector(this));
578 579
579 // Initialize the WebRtcSession. It creates transport channels etc. 580 // Initialize the WebRtcSession. It creates transport channels etc.
580 if (!session_->Initialize(factory_->options(), std::move(dtls_identity_store), 581 if (!session_->Initialize(factory_->options(), std::move(dtls_identity_store),
581 configuration)) { 582 configuration)) {
582 return false; 583 return false;
583 } 584 }
584 585
585 // Register PeerConnection as receiver of local ice candidates. 586 // Register PeerConnection as receiver of local ice candidates.
586 // All the callbacks will be posted to the application from PeerConnection. 587 // All the callbacks will be posted to the application from PeerConnection.
(...skipping 1471 matching lines...) Expand 10 before | Expand all | Expand 10 after
2058 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const { 2059 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const {
2059 for (const auto& channel : sctp_data_channels_) { 2060 for (const auto& channel : sctp_data_channels_) {
2060 if (channel->id() == sid) { 2061 if (channel->id() == sid) {
2061 return channel; 2062 return channel;
2062 } 2063 }
2063 } 2064 }
2064 return nullptr; 2065 return nullptr;
2065 } 2066 }
2066 2067
2067 } // namespace webrtc 2068 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/mediacontroller.cc ('k') | webrtc/api/peerconnection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698