perelman/minimal-webrtc
1
0
Fork 0
Code Issues Pull Requests Activity

Compare commits

base: perelman:131c9b3bf180c9f0bd9550c484083a7cb2473278
Branches Tags
perelman:master
perelman:feature/serverless
perelman:feature/qrgen
perelman:feature/data-first
perelman:feature/single-offer
perelman:blog-initial
...
compare: perelman:bf4749499e3bd13d7d4ac2c50cd674875a2f0b79
Branches Tags
perelman:master
perelman:feature/serverless
perelman:feature/qrgen
perelman:feature/data-first
perelman:feature/single-offer
perelman:blog-initial

3 Commits
131c9b3bf1 ... bf4749499e

Author SHA1 Message Date
Daniel Perelman
bf4749499e Include videoConstraints in log. 2020-06-30 18:56:09 -07:00
Daniel Perelman
f025675b9b Catch more errors and output them to the log. 2020-06-29 14:33:08 -07:00
Daniel Perelman
614eb52224 Small change to support connecting to GStreamer WebRTC demo. 2020-06-29 14:32:48 -07:00
1 changed files with 34 additions and 15 deletions
Show Stats Expand all files Collapse all files

49
camera/templates/index.html
View File

@ -373,7 +373,10 @@ form label {
// ... but only once icegathering is complete. // ... but only once icegathering is complete.
pc.onnegotiationneeded = async function () { pc.onnegotiationneeded = async function () {
log("In pc.onnegotiationneeded..."); log("In pc.onnegotiationneeded...");
await pc.setLocalDescription(await pc.createOffer()); const useOffer = (!settings || !('separateIce' in settings)
|| !settings.separateIce);
await pc.setLocalDescription(
await (useOffer ? pc.createOffer() : pc.createAnswer()));
sendOffer(); sendOffer();
} }
@ -450,7 +453,7 @@ form label {
: videoSettings == 'true' : videoSettings == 'true'
? true ? true
: { advanced: [{facingMode: videoSettings}] }; : { advanced: [{facingMode: videoSettings}] };
log("Created videoConstraints."); log("Created videoConstraints: " + JSON.stringify(videoConstraints));
if (!videoConstraints && !audioSettings) return; if (!videoConstraints && !audioSettings) return;
const stream = videoSettings == 'screen' const stream = videoSettings == 'screen'
@ -471,15 +474,23 @@ form label {
log("Added track."); log("Added track.");
pc.addTrack(track, stream); pc.addTrack(track, stream);
} }
log('End of startStreaming(), creating answer...');
if (settings && 'separateIce' in settings && settings.separateIce) {
await pc.setLocalDescription(await pc.createAnswer());
}
} }
function startStreamingWithErorrHandling(fromButton) { function startStreamingWithErorrHandling(fromButton) {
startStreaming(fromButton) try {
.then(() => { startStreaming(fromButton)
log("startStreaming() finished."); .then(() => {
}) log("startStreaming() finished.");
.catch(e => { })
log("startStreaming() errored: " + e.message); .catch(e => {
}); log("startStreaming() errored: " + e.message);
});
} catch (e) {
log("Error in startStreaming(): " + e);
}
} }
start.addEventListener("click", _ => { start.addEventListener("click", _ => {
@ -498,12 +509,20 @@ form label {
settings = data.settings; settings = data.settings;
startStreamingWithErorrHandling(false); startStreamingWithErorrHandling(false);
} else if (data.description) { } else if (data.description) {
if (pc == undefined) pc = createRTCPeerConnection(); try {
await pc.setRemoteDescription(data.description); if (pc == undefined) pc = createRTCPeerConnection();
if (data.description.type == "offer") { await pc.setRemoteDescription(data.description);
log("Got an offer..."); if (data.description.type == "offer") {
await pc.setLocalDescription(await pc.createAnswer()); log("Got an offer...");
sendOffer(); if (!settings || !('separateIce' in settings) || !settings.separateIce) {
await pc.setLocalDescription(await pc.createAnswer());
sendOffer();
} else {
log("separateIce mode, so delaying answer.");
}
}
} catch (e) {
log("Error accepting remote offer/answer: " + e);
} }
} }
}; };