Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2014 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 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 450 | 450 |
| 451 PeerConnection.RTCConfiguration rtcConfig = | 451 PeerConnection.RTCConfiguration rtcConfig = |
| 452 new PeerConnection.RTCConfiguration(signalingParameters.iceServers); | 452 new PeerConnection.RTCConfiguration(signalingParameters.iceServers); |
| 453 // TCP candidates are only useful when connecting to a server that supports | 453 // TCP candidates are only useful when connecting to a server that supports |
| 454 // ICE-TCP. | 454 // ICE-TCP. |
| 455 rtcConfig.tcpCandidatePolicy = PeerConnection.TcpCandidatePolicy.DISABLED; | 455 rtcConfig.tcpCandidatePolicy = PeerConnection.TcpCandidatePolicy.DISABLED; |
| 456 rtcConfig.bundlePolicy = PeerConnection.BundlePolicy.MAXBUNDLE; | 456 rtcConfig.bundlePolicy = PeerConnection.BundlePolicy.MAXBUNDLE; |
| 457 rtcConfig.rtcpMuxPolicy = PeerConnection.RtcpMuxPolicy.REQUIRE; | 457 rtcConfig.rtcpMuxPolicy = PeerConnection.RtcpMuxPolicy.REQUIRE; |
| 458 // Use ECDSA encryption. | 458 // Use ECDSA encryption. |
| 459 rtcConfig.keyType = PeerConnection.KeyType.ECDSA; | 459 rtcConfig.keyType = PeerConnection.KeyType.ECDSA; |
| 460 rtcConfig.continualGatheringPolicy = PeerConnection.ContinualGatheringPolicy .GATHER_CONTINUALLY; | |
|
pthatcher1
2016/01/15 19:56:11
Is this an intentional change? It doesn't seem re
| |
| 460 | 461 |
| 461 peerConnection = factory.createPeerConnection( | 462 peerConnection = factory.createPeerConnection( |
| 462 rtcConfig, pcConstraints, pcObserver); | 463 rtcConfig, pcConstraints, pcObserver); |
| 463 isInitiator = false; | 464 isInitiator = false; |
| 464 | 465 |
| 465 // Set default WebRTC tracing and INFO libjingle logging. | 466 // Set default WebRTC tracing and INFO libjingle logging. |
| 466 // NOTE: this _must_ happen while |factory| is alive! | 467 // NOTE: this _must_ happen while |factory| is alive! |
| 467 Logging.enableTracing( | 468 Logging.enableTracing( |
| 468 "logcat:", | 469 "logcat:", |
| 469 EnumSet.of(Logging.TraceLevel.TRACE_DEFAULT), | 470 EnumSet.of(Logging.TraceLevel.TRACE_DEFAULT), |
| (...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1077 public void onCreateFailure(final String error) { | 1078 public void onCreateFailure(final String error) { |
| 1078 reportError("createSDP error: " + error); | 1079 reportError("createSDP error: " + error); |
| 1079 } | 1080 } |
| 1080 | 1081 |
| 1081 @Override | 1082 @Override |
| 1082 public void onSetFailure(final String error) { | 1083 public void onSetFailure(final String error) { |
| 1083 reportError("setSDP error: " + error); | 1084 reportError("setSDP error: " + error); |
| 1084 } | 1085 } |
| 1085 } | 1086 } |
| 1086 } | 1087 } |
| OLD | NEW |