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

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

Issue 1968393002: Propogate network-worker thread split to api (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
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 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 } 579 }
580 580
581 port_allocator_->set_flags(portallocator_flags); 581 port_allocator_->set_flags(portallocator_flags);
582 // No step delay is used while allocating ports. 582 // No step delay is used while allocating ports.
583 port_allocator_->set_step_delay(cricket::kMinimumStepDelay); 583 port_allocator_->set_step_delay(cricket::kMinimumStepDelay);
584 584
585 media_controller_.reset( 585 media_controller_.reset(
586 factory_->CreateMediaController(configuration.media_config)); 586 factory_->CreateMediaController(configuration.media_config));
587 587
588 session_.reset( 588 session_.reset(
589 new WebRtcSession(media_controller_.get(), factory_->signaling_thread(), 589 new WebRtcSession(media_controller_.get(), factory_->network_thread(),
590 factory_->worker_thread(), port_allocator_.get())); 590 factory_->worker_thread(), factory_->signaling_thread(),
591 port_allocator_.get()));
591 stats_.reset(new StatsCollector(this)); 592 stats_.reset(new StatsCollector(this));
592 593
593 // Initialize the WebRtcSession. It creates transport channels etc. 594 // Initialize the WebRtcSession. It creates transport channels etc.
594 if (!session_->Initialize(factory_->options(), std::move(dtls_identity_store), 595 if (!session_->Initialize(factory_->options(), std::move(dtls_identity_store),
595 configuration)) { 596 configuration)) {
596 return false; 597 return false;
597 } 598 }
598 599
599 // Register PeerConnection as receiver of local ice candidates. 600 // Register PeerConnection as receiver of local ice candidates.
600 // All the callbacks will be posted to the application from PeerConnection. 601 // All the callbacks will be posted to the application from PeerConnection.
(...skipping 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after
2078 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const { 2079 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const {
2079 for (const auto& channel : sctp_data_channels_) { 2080 for (const auto& channel : sctp_data_channels_) {
2080 if (channel->id() == sid) { 2081 if (channel->id() == sid) {
2081 return channel; 2082 return channel;
2082 } 2083 }
2083 } 2084 }
2084 return nullptr; 2085 return nullptr;
2085 } 2086 }
2086 2087
2087 } // namespace webrtc 2088 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698