generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check pcConfig (which can be null) before use.

Browse Source 
BUG=

TEST=manully with pc1.html
R=juberti@google.com

Review URL: https://webrtc-codereview.appspot.com/9079004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5603 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2014-02-24 21:51:58 +00:00
parent 91cbaa477c
commit 78ea3d50e0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/js/base/adapter.js
View File

@ -13,13 +13,15 @@ function trace(text) {
console.log((performance.now() / 1000).toFixed(3) + ": " + text); console.log((performance.now() / 1000).toFixed(3) + ": " + text);
} }
function maybeFixConfiguration(pcConfig) { function maybeFixConfiguration(pcConfig) {
if (pcConfig == null) {
return;
}
for (var i = 0; i < pcConfig.iceServers.length; i++) { for (var i = 0; i < pcConfig.iceServers.length; i++) {
if (pcConfig.iceServers[i].hasOwnProperty('urls')){ if (pcConfig.iceServers[i].hasOwnProperty('urls')){
pcConfig.iceServers[i]['url'] = pcConfig.iceServers[i]['urls']; pcConfig.iceServers[i]['url'] = pcConfig.iceServers[i]['urls'];
delete pcConfig.iceServers[i]['urls']; delete pcConfig.iceServers[i]['urls'];
} }
} }
return pcConfig;
} }
if (navigator.mozGetUserMedia) { if (navigator.mozGetUserMedia) {
@ -33,7 +35,7 @@ if (navigator.mozGetUserMedia) {
// The RTCPeerConnection object. // The RTCPeerConnection object.
var RTCPeerConnection = function(pcConfig, pcConstraints) { var RTCPeerConnection = function(pcConfig, pcConstraints) {
// .urls is not supported in FF yet. // .urls is not supported in FF yet.
pcConfig = maybeFixConfiguration(pcConfig); maybeFixConfiguration(pcConfig);
return new mozRTCPeerConnection(pcConfig, pcConstraints); return new mozRTCPeerConnection(pcConfig, pcConstraints);
} }
@ -165,7 +167,7 @@ if (navigator.mozGetUserMedia) {
var RTCPeerConnection = function(pcConfig, pcConstraints) { var RTCPeerConnection = function(pcConfig, pcConstraints) {
// .urls is supported since Chrome M34. // .urls is supported since Chrome M34.
if (webrtcDetectedVersion < 34) { if (webrtcDetectedVersion < 34) {
pcConfig = maybeFixConfiguration(pcConfig); maybeFixConfiguration(pcConfig);
} }
return new webkitRTCPeerConnection(pcConfig, pcConstraints); return new webkitRTCPeerConnection(pcConfig, pcConstraints);
} }