OLD | NEW |
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 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
620 } | 620 } |
621 | 621 |
622 media_controller_.reset( | 622 media_controller_.reset( |
623 factory_->CreateMediaController(configuration.media_config)); | 623 factory_->CreateMediaController(configuration.media_config)); |
624 | 624 |
625 session_.reset(new WebRtcSession( | 625 session_.reset(new WebRtcSession( |
626 media_controller_.get(), factory_->network_thread(), | 626 media_controller_.get(), factory_->network_thread(), |
627 factory_->worker_thread(), factory_->signaling_thread(), | 627 factory_->worker_thread(), factory_->signaling_thread(), |
628 port_allocator_.get(), | 628 port_allocator_.get(), |
629 std::unique_ptr<cricket::TransportController>( | 629 std::unique_ptr<cricket::TransportController>( |
630 factory_->CreateTransportController(port_allocator_.get())))); | 630 factory_->CreateTransportController( |
| 631 port_allocator_.get(), |
| 632 configuration.redetermine_role_on_ice_restart)))); |
631 | 633 |
632 stats_.reset(new StatsCollector(this)); | 634 stats_.reset(new StatsCollector(this)); |
633 | 635 |
634 // Initialize the WebRtcSession. It creates transport channels etc. | 636 // Initialize the WebRtcSession. It creates transport channels etc. |
635 if (!session_->Initialize(factory_->options(), std::move(cert_generator), | 637 if (!session_->Initialize(factory_->options(), std::move(cert_generator), |
636 configuration)) { | 638 configuration)) { |
637 return false; | 639 return false; |
638 } | 640 } |
639 | 641 |
640 // Register PeerConnection as receiver of local ice candidates. | 642 // Register PeerConnection as receiver of local ice candidates. |
(...skipping 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2323 | 2325 |
2324 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, | 2326 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, |
2325 int64_t max_size_bytes) { | 2327 int64_t max_size_bytes) { |
2326 return media_controller_->call_w()->StartEventLog(file, max_size_bytes); | 2328 return media_controller_->call_w()->StartEventLog(file, max_size_bytes); |
2327 } | 2329 } |
2328 | 2330 |
2329 void PeerConnection::StopRtcEventLog_w() { | 2331 void PeerConnection::StopRtcEventLog_w() { |
2330 media_controller_->call_w()->StopEventLog(); | 2332 media_controller_->call_w()->StopEventLog(); |
2331 } | 2333 } |
2332 } // namespace webrtc | 2334 } // namespace webrtc |
OLD | NEW |