diff --git a/samples/js/apprtc/js/main.js b/samples/js/apprtc/js/main.js index f96446bbc0..89ccffc987 100644 --- a/samples/js/apprtc/js/main.js +++ b/samples/js/apprtc/js/main.js @@ -275,12 +275,21 @@ function processSignalingMessage(message) { var candidate = new RTCIceCandidate({sdpMLineIndex: message.label, candidate: message.candidate}); noteIceCandidate("Remote", iceCandidateType(message.candidate)); - pc.addIceCandidate(candidate); + pc.addIceCandidate(candidate, + onAddIceCandidateSuccess, onAddIceCandidateError); } else if (message.type === 'bye') { onRemoteHangup(); } } +function onAddIceCandidateSuccess() { + console.log('AddIceCandidate success.'); +} + +function onAddIceCandidateError(error) { + messageError('Failed to add Ice Candidate: ' + error.toString()); +} + function onChannelOpened() { console.log('Channel opened.'); channelReady = true; diff --git a/samples/js/demos/html/constraints-and-stats.html b/samples/js/demos/html/constraints-and-stats.html index f74bda943c..509776b4cc 100644 --- a/samples/js/demos/html/constraints-and-stats.html +++ b/samples/js/demos/html/constraints-and-stats.html @@ -86,13 +86,15 @@ function connect() { pc1.onicecandidate = function(e) { log('Candidate PC1'); if (e.candidate) { - pc2.addIceCandidate(new RTCIceCandidate(e.candidate)); + pc2.addIceCandidate(new RTCIceCandidate(e.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); } } pc2.onicecandidate = function(e) { log('Candidate PC2'); if (e.candidate) { - pc1.addIceCandidate(new RTCIceCandidate(e.candidate)); + pc1.addIceCandidate(new RTCIceCandidate(e.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); } } pc2.onaddstream = function(e) { @@ -112,6 +114,14 @@ function connect() { }); } +function onAddIceCandidateSuccess() { + trace("AddIceCandidate success."); +} + +function onAddIceCandidateError(error) { + trace("Failed to add Ice Candidate: " + error.toString()); +} + // Augumentation of stats entries with utility functions. // The augumented entry does what the stats entry does, but adds // utility functions. diff --git a/samples/js/demos/html/dc1.html b/samples/js/demos/html/dc1.html index 0dc9a4431e..694ca5df04 100644 --- a/samples/js/demos/html/dc1.html +++ b/samples/js/demos/html/dc1.html @@ -175,7 +175,8 @@ function gotDescription2(desc) { function iceCallback1(event) { trace('local ice callback'); if (event.candidate) { - pc2.addIceCandidate(event.candidate); + pc2.addIceCandidate(event.candidate, + onAddIceCandidateSuccess, onAddIceCandidateError); trace('Local ICE candidate: \n' + event.candidate.candidate); } } @@ -183,11 +184,20 @@ function iceCallback1(event) { function iceCallback2(event) { trace('remote ice callback'); if (event.candidate) { - pc1.addIceCandidate(event.candidate); + pc1.addIceCandidate(event.candidate, + onAddIceCandidateSuccess, onAddIceCandidateError); trace('Remote ICE candidate: \n ' + event.candidate.candidate); } } +function onAddIceCandidateSuccess() { + trace('AddIceCandidate success.'); +} + +function onAddIceCandidateError(error) { + trace('Failed to add Ice Candidate: ' + error.toString()); +} + function receiveChannelCallback(event) { trace('Receive Channel Callback'); receiveChannel = event.channel; diff --git a/samples/js/demos/html/device-switch.html b/samples/js/demos/html/device-switch.html index e291fa9b02..ea6c36854f 100644 --- a/samples/js/demos/html/device-switch.html +++ b/samples/js/demos/html/device-switch.html @@ -185,17 +185,27 @@ function gotRemoteStream(e) { function iceCallback1(event) { if (event.candidate) { - pc2.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc2.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Local ICE candidate: \n" + event.candidate.candidate); } } function iceCallback2(event) { if (event.candidate) { - pc1.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc1.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Remote ICE candidate: \n " + event.candidate.candidate); } } + +function onAddIceCandidateSuccess() { + trace("AddIceCandidate success."); +} + +function onAddIceCandidateError(error) { + trace("Failed to add Ice Candidate: " + error.toString()); +} diff --git a/samples/js/demos/html/dtmf1.html b/samples/js/demos/html/dtmf1.html index de5c22a5cc..1e2abbe852 100644 --- a/samples/js/demos/html/dtmf1.html +++ b/samples/js/demos/html/dtmf1.html @@ -130,18 +130,28 @@ function gotRemoteStream(e){ function iceCallback1(event){ if (event.candidate) { - pc2.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc2.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Local ICE candidate: \n" + event.candidate.candidate); } } function iceCallback2(event){ if (event.candidate) { - pc1.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc1.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Remote ICE candidate: \n " + event.candidate.candidate); } } +function onAddIceCandidateSuccess() { + trace("AddIceCandidate success."); +} + +function onAddIceCandidateError(error) { + trace("Failed to add Ice Candidate: " + error.toString()); +} + function enableDtmfSender(){ document.getElementById("dtmfTonesSent").value = "Dtmf activated\n"; if (localstream != null) { diff --git a/samples/js/demos/html/multiple.html b/samples/js/demos/html/multiple.html index 2800d178a7..a4caf4832e 100644 --- a/samples/js/demos/html/multiple.html +++ b/samples/js/demos/html/multiple.html @@ -170,10 +170,19 @@ function iceCallback2Remote(event) { function handleCandidate(candidate, dest, prefix, type) { if (candidate) { - dest.addIceCandidate(new RTCIceCandidate(candidate)); + dest.addIceCandidate(new RTCIceCandidate(candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace(prefix + "New " + type + " ICE candidate: " + candidate.candidate); } } + +function onAddIceCandidateSuccess() { + trace("AddIceCandidate success."); +} + +function onAddIceCandidateError(error) { + trace("Failed to add Ice Candidate: " + error.toString()); +} diff --git a/samples/js/demos/html/pc1-audio.html b/samples/js/demos/html/pc1-audio.html index 4273b62694..38c06676a6 100644 --- a/samples/js/demos/html/pc1-audio.html +++ b/samples/js/demos/html/pc1-audio.html @@ -95,17 +95,27 @@ function gotRemoteStream(e){ function iceCallback1(event){ if (event.candidate) { - pc2.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc2.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Local ICE candidate: \n" + event.candidate.candidate); } } function iceCallback2(event){ if (event.candidate) { - pc1.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc1.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Remote ICE candidate: \n " + event.candidate.candidate); } } + +function onAddIceCandidateSuccess() { + trace("AddIceCandidate success."); +} + +function onAddIceCandidateError(error) { + trace("Failed to add Ice Candidate: " + error.toString()); +} diff --git a/samples/js/demos/html/pc1.html b/samples/js/demos/html/pc1.html index c3f3ced4b6..b82938d9f6 100644 --- a/samples/js/demos/html/pc1.html +++ b/samples/js/demos/html/pc1.html @@ -119,17 +119,27 @@ function gotRemoteStream(e){ function iceCallback1(event){ if (event.candidate) { - pc2.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc2.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Local ICE candidate: \n" + event.candidate.candidate); } } function iceCallback2(event){ if (event.candidate) { - pc1.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc1.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Remote ICE candidate: \n " + event.candidate.candidate); } } + +function onAddIceCandidateSuccess() { + trace("AddIceCandidate success."); +} + +function onAddIceCandidateError(error) { + trace("Failed to add Ice Candidate: " + error.toString()); +} diff --git a/samples/js/demos/html/pc1_sdp_munge.html b/samples/js/demos/html/pc1_sdp_munge.html index 2c57ceeb5f..330e1ab19b 100644 --- a/samples/js/demos/html/pc1_sdp_munge.html +++ b/samples/js/demos/html/pc1_sdp_munge.html @@ -289,17 +289,27 @@ function gotRemoteStream(e) { function iceCallback1(event) { if (event.candidate) { - pc2.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc2.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Local ICE candidate: \n" + event.candidate.candidate); } } function iceCallback2(event) { if (event.candidate) { - pc1.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc1.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Remote ICE candidate: \n " + event.candidate.candidate); } } + +function onAddIceCandidateSuccess() { + trace("AddIceCandidate success."); +} + +function onAddIceCandidateError(error) { + trace("Failed to add Ice Candidate: " + error.toString()); +} diff --git a/samples/js/demos/html/pranswer.html b/samples/js/demos/html/pranswer.html index ed389da72f..be4d2da80d 100644 --- a/samples/js/demos/html/pranswer.html +++ b/samples/js/demos/html/pranswer.html @@ -122,17 +122,27 @@ function gotRemoteStream(e) { function iceCallback1(event) { if (event.candidate) { - pc2.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc2.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Local ICE candidate: \n" + event.candidate.candidate); } } function iceCallback2(event) { if (event.candidate) { - pc1.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc1.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Remote ICE candidate: \n " + event.candidate.candidate); } } + +function onAddIceCandidateSuccess() { + trace("AddIceCandidate success."); +} + +function onAddIceCandidateError(error) { + trace("Failed to add Ice Candidate: " + error.toString()); +} diff --git a/samples/js/demos/html/states.html b/samples/js/demos/html/states.html index 4a1c28ddf5..a89db07b2b 100644 --- a/samples/js/demos/html/states.html +++ b/samples/js/demos/html/states.html @@ -210,7 +210,8 @@ function iceStateCallback2() { function iceCallback1(event){ if (event.candidate) { - pc2.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc2.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Local ICE candidate: \n" + event.candidate.candidate); } else { trace("end of candidates1"); @@ -219,12 +220,21 @@ function iceCallback1(event){ function iceCallback2(event){ if (event.candidate) { - pc1.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc1.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); trace("Remote ICE candidate: \n " + event.candidate.candidate); } else { trace("end of candidates2"); } } + +function onAddIceCandidateSuccess() { + trace("AddIceCandidate success."); +} + +function onAddIceCandidateError(error) { + trace("Failed to add Ice Candidate: " + error.toString()); +} diff --git a/samples/js/demos/html/webaudio-and-webrtc.html b/samples/js/demos/html/webaudio-and-webrtc.html index 173a30845c..0438bcc313 100644 --- a/samples/js/demos/html/webaudio-and-webrtc.html +++ b/samples/js/demos/html/webaudio-and-webrtc.html @@ -174,18 +174,28 @@ function iceCallback1(event){ if (event.candidate) { - pc2.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc2.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); console.log('Local ICE candidate: \n' + event.candidate.candidate); } } function iceCallback2(event){ if (event.candidate) { - pc1.addIceCandidate(new RTCIceCandidate(event.candidate)); + pc1.addIceCandidate(new RTCIceCandidate(event.candidate), + onAddIceCandidateSuccess, onAddIceCandidateError); console.log('Remote ICE candidate: \n ' + event.candidate.candidate); } } - + + function onAddIceCandidateSuccess() { + trace("AddIceCandidate success."); + } + + function onAddIceCandidateError(error) { + trace("Failed to add Ice Candidate: " + error.toString()); + } + function handleKeyDown(event) { var keyCode = event.keyCode; webAudio.addEffect();