| 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 | 115 |
| 116 webrtc::PeerConnectionInterface::IceServers servers; | 116 webrtc::PeerConnectionInterface::IceServers servers; |
| 117 webrtc::PeerConnectionInterface::IceServer server; | 117 webrtc::PeerConnectionInterface::IceServer server; |
| 118 server.uri = GetPeerConnectionString(); | 118 server.uri = GetPeerConnectionString(); |
| 119 servers.push_back(server); | 119 servers.push_back(server); |
| 120 | 120 |
| 121 webrtc::FakeConstraints constraints; | 121 webrtc::FakeConstraints constraints; |
| 122 if (dtls) { | 122 if (dtls) { |
| 123 constraints.AddOptional(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, | 123 constraints.AddOptional(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, |
| 124 "true"); | 124 "true"); |
| 125 } | 125 } else { |
| 126 else | |
| 127 { | |
| 128 constraints.AddOptional(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, | 126 constraints.AddOptional(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, |
| 129 "false"); | 127 "false"); |
| 130 } | 128 } |
| 131 | 129 |
| 132 peer_connection_ = | 130 peer_connection_ = |
| 133 peer_connection_factory_->CreatePeerConnection(servers, | 131 peer_connection_factory_->CreatePeerConnection(servers, |
| 134 &constraints, | 132 &constraints, |
| 135 NULL, | 133 NULL, |
| 136 NULL, | 134 NULL, |
| 137 this); | 135 this); |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 } | 535 } |
| 538 | 536 |
| 539 void Conductor::OnFailure(const std::string& error) { | 537 void Conductor::OnFailure(const std::string& error) { |
| 540 LOG(LERROR) << error; | 538 LOG(LERROR) << error; |
| 541 } | 539 } |
| 542 | 540 |
| 543 void Conductor::SendMessage(const std::string& json_object) { | 541 void Conductor::SendMessage(const std::string& json_object) { |
| 544 std::string* msg = new std::string(json_object); | 542 std::string* msg = new std::string(json_object); |
| 545 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg); | 543 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg); |
| 546 } | 544 } |
| OLD | NEW |