| 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 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 rtc::scoped_refptr<webrtc::PeerConnectionInterface> CreatePeerConnection( | 846 rtc::scoped_refptr<webrtc::PeerConnectionInterface> CreatePeerConnection( |
| 847 std::unique_ptr<cricket::PortAllocator> port_allocator, | 847 std::unique_ptr<cricket::PortAllocator> port_allocator, |
| 848 const MediaConstraintsInterface* constraints, | 848 const MediaConstraintsInterface* constraints, |
| 849 std::unique_ptr<webrtc::DtlsIdentityStoreInterface> dtls_identity_store) { | 849 std::unique_ptr<webrtc::DtlsIdentityStoreInterface> dtls_identity_store) { |
| 850 // CreatePeerConnection with RTCConfiguration. | 850 // CreatePeerConnection with RTCConfiguration. |
| 851 webrtc::PeerConnectionInterface::RTCConfiguration config; | 851 webrtc::PeerConnectionInterface::RTCConfiguration config; |
| 852 webrtc::PeerConnectionInterface::IceServer ice_server; | 852 webrtc::PeerConnectionInterface::IceServer ice_server; |
| 853 ice_server.uri = "stun:stun.l.google.com:19302"; | 853 ice_server.uri = "stun:stun.l.google.com:19302"; |
| 854 config.servers.push_back(ice_server); | 854 config.servers.push_back(ice_server); |
| 855 | 855 |
| 856 return peer_connection_factory_->CreatePeerConnection( | 856 return peer_connection_factory_->CreatePeerConnectionWithStore( |
| 857 config, constraints, std::move(port_allocator), | 857 config, constraints, std::move(port_allocator), |
| 858 std::move(dtls_identity_store), this); | 858 std::move(dtls_identity_store), this); |
| 859 } | 859 } |
| 860 | 860 |
| 861 void HandleIncomingOffer(const std::string& msg) { | 861 void HandleIncomingOffer(const std::string& msg) { |
| 862 LOG(INFO) << id_ << "HandleIncomingOffer "; | 862 LOG(INFO) << id_ << "HandleIncomingOffer "; |
| 863 if (NumberOfLocalMediaStreams() == 0 && auto_add_stream_) { | 863 if (NumberOfLocalMediaStreams() == 0 && auto_add_stream_) { |
| 864 // If we are not sending any streams ourselves it is time to add some. | 864 // If we are not sending any streams ourselves it is time to add some. |
| 865 AddMediaStream(true, true); | 865 AddMediaStream(true, true); |
| 866 } | 866 } |
| (...skipping 1344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2211 server.urls.push_back("turn:hostname2"); | 2211 server.urls.push_back("turn:hostname2"); |
| 2212 servers.push_back(server); | 2212 servers.push_back(server); |
| 2213 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); | 2213 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); |
| 2214 EXPECT_EQ(2U, turn_servers_.size()); | 2214 EXPECT_EQ(2U, turn_servers_.size()); |
| 2215 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); | 2215 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); |
| 2216 } | 2216 } |
| 2217 | 2217 |
| 2218 #endif // if !defined(THREAD_SANITIZER) | 2218 #endif // if !defined(THREAD_SANITIZER) |
| 2219 | 2219 |
| 2220 } // namespace | 2220 } // namespace |
| OLD | NEW |