mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

sendrecv/js: Make error statuses more prominent

Browse source 
Colour errors in red, and ensure that later status updates don't
overwrite existing error statuses.
This commit is contained in:
Nirbheek Chauhan 2018-03-31 22:24:15 +05:30
parent bd6deaca46
commit 3eabe5cb0b
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
webrtc/sendrecv/js/index.html
View file

@ -11,6 +11,9 @@
--> -->
<html> <html>
<head> <head>
<style>
.error { color: red; }
</style>
<script src="https://webrtc.github.io/adapter/adapter-latest.js"></script> <script src="https://webrtc.github.io/adapter/adapter-latest.js"></script>
<script src="webrtc.js"></script> <script src="webrtc.js"></script>
<script> <script>

35
webrtc/sendrecv/js/webrtc.js
View file

@ -27,7 +27,7 @@ function resetState() {
} }
function handleIncomingError(error) { function handleIncomingError(error) {
setStatus("ERROR: " + error); setError("ERROR: " + error);
resetState(); resetState();
} }
@ -37,7 +37,17 @@ function getVideoElement() {
function setStatus(text) { function setStatus(text) {
console.log(text); console.log(text);
document.getElementById("status").textContent = text; span = document.getElementById("status")
// Don't set the status if it already contains an error
if (!span.classList.contains('error'))
span.textContent = text;
}
function setError(text) {
console.log(text);
span = document.getElementById("status")
span.textContent = text;
span.classList.add('error');
} }
function resetVideoElement() { function resetVideoElement() {
@ -54,12 +64,13 @@ function onIncomingSDP(sdp) {
setStatus("Remote SDP set"); setStatus("Remote SDP set");
if (sdp.type != "offer") if (sdp.type != "offer")
return; return;
setStatus("Got SDP offer, creating answer"); setStatus("Got SDP offer");
local_stream.then((stream) => { local_stream.then((stream) => {
setStatus("Got local stream, creating answer");
peer_connection.createAnswer() peer_connection.createAnswer()
.then(onLocalDescription).catch(setStatus); .then(onLocalDescription).catch(setError);
}).catch(errorUserMediaHandler); }).catch(setError);
}).catch(setStatus); }).catch(setError);
} }
// Local description was set, send it to peer // Local description was set, send it to peer
@ -76,7 +87,7 @@ function onLocalDescription(desc) {
function onIncomingICE(ice) { function onIncomingICE(ice) {
console.log("Incoming ICE: " + JSON.stringify(ice)); console.log("Incoming ICE: " + JSON.stringify(ice));
var candidate = new RTCIceCandidate(ice); var candidate = new RTCIceCandidate(ice);
peer_connection.addIceCandidate(candidate).catch(setStatus); peer_connection.addIceCandidate(candidate).catch(setError);
} }
function onServerMessage(event) { function onServerMessage(event) {
@ -129,7 +140,7 @@ function onServerClose(event) {
} }
function onServerError(event) { function onServerError(event) {
setStatus("Unable to connect to server, did you add an exception for the certificate?") setError("Unable to connect to server, did you add an exception for the certificate?")
// Retry after 3 seconds // Retry after 3 seconds
window.setTimeout(websocketServerConnect, 3000); window.setTimeout(websocketServerConnect, 3000);
} }
@ -148,7 +159,7 @@ function getLocalStream() {
function websocketServerConnect() { function websocketServerConnect() {
connect_attempts++; connect_attempts++;
if (connect_attempts > 3) { if (connect_attempts > 3) {
setStatus("Too many connection attempts, aborting. Refresh page to try again"); setError("Too many connection attempts, aborting. Refresh page to try again");
return; return;
} }
peer_id = getOurId(); peer_id = getOurId();
@ -186,20 +197,22 @@ function onRemoteStreamAdded(event) {
} }
function errorUserMediaHandler() { function errorUserMediaHandler() {
setStatus("Browser doesn't support getUserMedia!"); setError("Browser doesn't support getUserMedia!");
} }
function createCall(msg) { function createCall(msg) {
// Reset connection attempts because we connected successfully // Reset connection attempts because we connected successfully
connect_attempts = 0; connect_attempts = 0;
console.log('Creating RTCPeerConnection');
peer_connection = new RTCPeerConnection(rtc_configuration); peer_connection = new RTCPeerConnection(rtc_configuration);
peer_connection.onaddstream = onRemoteStreamAdded; peer_connection.onaddstream = onRemoteStreamAdded;
/* Send our video/audio to the other peer */ /* Send our video/audio to the other peer */
local_stream = getLocalStream().then((stream) => { local_stream = getLocalStream().then((stream) => {
console.log('Adding local stream'); console.log('Adding local stream');
peer_connection.addStream(stream); peer_connection.addStream(stream);
}).catch(errorUserMediaHandler); }).catch(setError);
if (!msg.sdp) { if (!msg.sdp) {
console.log("WARNING: First message wasn't an SDP message!?"); console.log("WARNING: First message wasn't an SDP message!?");