pimhwang
/
spreed-webrtc
mirror of https://github.com/strukturag/spreed-webrtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Implemented offer/answer creation on renegotiationneeded event.

pull/112/head
Simon Eisenmann 11 years ago
parent
30888a5ce8
commit
76e562f31d
7 changed files with 207 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 106
      static/js/directives/audiovideo.js
  2. 15
      static/js/mediastream/peercall.js
  3. 11
      static/js/mediastream/peerconnection.js
  4. 120
      static/js/mediastream/usermedia.js
  5. 58
      static/js/mediastream/webrtc.js
  6. 28
      static/js/services/videolayout.js
  7. 2
      static/partials/audiovideopeer.html

106
static/js/directives/audiovideo.js
Unescape View File

@ -26,8 +26,7 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
var controller = ['$scope', '$element', '$attrs', function($scope, $element, $attrs) { var controller = ['$scope', '$element', '$attrs', function($scope, $element, $attrs) {
var peers = {}; var streams = {};
var events = $({});
$scope.container = $element.get(0); $scope.container = $element.get(0);
$scope.layoutparent = $element.parent(); $scope.layoutparent = $element.parent();
@ -39,6 +38,9 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
$scope.hasUsermedia = false; $scope.hasUsermedia = false;
$scope.isActive = false; $scope.isActive = false;
$scope.haveStreams = false;
$scope.peersTalking = {};
$scope.rendererName = $scope.defaultRendererName = "democrazy"; $scope.rendererName = $scope.defaultRendererName = "democrazy";
@ -46,31 +48,30 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
$scope.addRemoteStream = function(stream, currentcall) { $scope.addRemoteStream = function(stream, currentcall) {
//console.log("Add remote stream to scope", pc.id, stream); if (streams.hasOwnProperty(stream.id)) {
console.warn("Cowardly refusing to add stream id twice", stream.id, currentcall);
return;
}
//console.log("Add remote stream to scope", stream.id, stream, currentcall);
// Create scope. // Create scope.
var subscope = $scope.$new(true); var subscope = $scope.$new();
var peerid = subscope.peerid = currentcall.id; var peerid = subscope.peerid = currentcall.id;
buddyData.push(peerid); buddyData.push(peerid);
subscope.withvideo = false; subscope.withvideo = false;
subscope.onlyaudio = false; subscope.onlyaudio = false;
subscope.talking = false;
subscope.destroyed = false; subscope.destroyed = false;
subscope.applyTalking = function(talking) {
subscope.talking = !! talking;
safeApply(subscope);
};
subscope.$on("active", function() { subscope.$on("active", function() {
console.log("Stream scope is now active", peerid); console.log("Stream scope is now active", stream.id, peerid);
events.triggerHandler("active." + peerid, [subscope, currentcall, stream]);
}); });
subscope.$on("$destroy", function() { subscope.$on("$destroy", function() {
console.log("Destroyed scope for audiovideo", subscope); console.log("Destroyed scope for stream", stream.id, peerid);
subscope.destroyed = true; subscope.destroyed = true;
}); });
console.log("Created stream scope", peerid); console.log("Created stream scope", stream.id, peerid);
// Add created scope. // Add created scope.
peers[peerid] = subscope; streams[stream.id] = subscope;
// Render template. // Render template.
peerTemplate(subscope, function(clonedElement, scope) { peerTemplate(subscope, function(clonedElement, scope) {
@ -118,10 +119,11 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
$scope.removeRemoteStream = function(stream, currentcall) { $scope.removeRemoteStream = function(stream, currentcall) {
var subscope = peers[currentcall.id]; //console.log("remove stream", stream, stream.id, currentcall);
var subscope = streams[stream.id];
if (subscope) { if (subscope) {
buddyData.pop(currentcall.id); buddyData.pop(currentcall.id);
delete peers[currentcall.id]; delete streams[stream.id];
//console.log("remove scope", subscope); //console.log("remove scope", subscope);
if (subscope.element) { if (subscope.element) {
subscope.element.remove(); subscope.element.remove();
@ -134,17 +136,9 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
// Talking updates receiver. // Talking updates receiver.
mediaStream.api.e.on("received.talking", function(event, id, from, talking) { mediaStream.api.e.on("received.talking", function(event, id, from, talking) {
var scope = peers[from]; $scope.$apply(function(scope) {
//console.log("received.talking", talking, scope); scope.peersTalking[from] = !!talking;
if (scope) { });
scope.applyTalking(talking);
} else {
console.log("Received talking state without scope -> adding event.", from, talking);
events.one("active." + from, function(event, scope) {
console.log("Applying previously received talking state", from, talking);
scope.applyTalking(talking);
});
}
}); });
$scope.$on("active", function(currentcall) { $scope.$on("active", function(currentcall) {
@ -177,27 +171,36 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
mediaStream.webrtc.e.on("usermedia", function(event, usermedia) { mediaStream.webrtc.e.on("usermedia", function(event, usermedia) {
//console.log("XXXXXXXXXXXXXXXXXXXXXXXXX usermedia event", usermedia); //console.log("XXXX XXXXXXXXXXXXXXXXXXXXX usermedia event", usermedia);
$scope.hasUsermedia = true; if ($scope.haveStreams) {
usermedia.attachMediaStream($scope.localVideo);
var count = 0; usermedia.attachMediaStream($scope.miniVideo);
var waitForLocalVideo = function() { $scope.redraw();
if (!$scope.hasUsermedia) {
return; } else {
}
if ($scope.localVideo.videoWidth > 0) { $scope.hasUsermedia = true;
$scope.localVideo.style.opacity = 1; usermedia.attachMediaStream($scope.localVideo);
$scope.redraw(); var count = 0;
} else { var waitForLocalVideo = function() {
count++; if (!$scope.hasUsermedia) {
if (count < 100) { return;
setTimeout(waitForLocalVideo, 100); }
if ($scope.localVideo.videoWidth > 0) {
$scope.localVideo.style.opacity = 1;
$scope.redraw();
} else { } else {
console.warn("Timeout while waiting for local video.") count++;
if (count < 100) {
setTimeout(waitForLocalVideo, 100);
} else {
console.warn("Timeout while waiting for local video.")
}
} }
} };
}; waitForLocalVideo();
waitForLocalVideo();
}
}); });
@ -205,6 +208,7 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
$scope.hasUsermedia = false; $scope.hasUsermedia = false;
$scope.isActive = false; $scope.isActive = false;
$scope.peersTalking = {};
if (BigScreen.enabled) { if (BigScreen.enabled) {
BigScreen.exit(); BigScreen.exit();
} }
@ -220,20 +224,22 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
$scope.localVideo.style.opacity = 0; $scope.localVideo.style.opacity = 0;
$scope.remoteVideos.style.opacity = 0; $scope.remoteVideos.style.opacity = 0;
$element.removeClass('active'); $element.removeClass('active');
_.each(peers, function(scope, k) { _.each(streams, function(scope, k) {
scope.$destroy(); scope.$destroy();
delete peers[k]; delete streams[k];
}); });
$scope.rendererName = $scope.defaultRendererName; $scope.rendererName = $scope.defaultRendererName;
$scope.haveStreams = false;
}); });
mediaStream.webrtc.e.on("streamadded", function(event, stream, currentcall) { mediaStream.webrtc.e.on("streamadded", function(event, stream, currentcall) {
console.log("Remote stream added.", stream, currentcall); console.log("Remote stream added.", stream, currentcall);
if (_.isEmpty(peers)) { if (!$scope.haveStreams) {
//console.log("First stream"); //console.log("First stream");
$window.reattachMediaStream($scope.miniVideo, $scope.localVideo); $window.reattachMediaStream($scope.miniVideo, $scope.localVideo);
$scope.haveStreams = true;
} }
$scope.addRemoteStream(stream, currentcall); $scope.addRemoteStream(stream, currentcall);
@ -247,7 +253,7 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
}); });
return { return {
peers: peers streams: streams
}; };
}]; }];

15
static/js/mediastream/peercall.js
Unescape View File

@ -182,7 +182,11 @@ define(['jquery', 'underscore', 'mediastream/utils', 'mediastream/peerconnection
PeerCall.prototype.onRemoteStreamAdded = function(stream) { PeerCall.prototype.onRemoteStreamAdded = function(stream) {
this.streams[stream] = true; var id = stream.id;
if (this.streams.hasOwnProperty(id)) {
return;
}
this.streams[id] = stream;
this.e.triggerHandler("remoteStreamAdded", [stream, this]); this.e.triggerHandler("remoteStreamAdded", [stream, this]);
}; };
@ -191,7 +195,7 @@ define(['jquery', 'underscore', 'mediastream/utils', 'mediastream/peerconnection
this.e.triggerHandler("remoteStreamRemoved", [stream, this]); this.e.triggerHandler("remoteStreamRemoved", [stream, this]);
if (stream) { if (stream) {
delete this.streams[stream]; delete this.streams[stream.id];
} }
}; };
@ -299,13 +303,18 @@ define(['jquery', 'underscore', 'mediastream/utils', 'mediastream/peerconnection
datachannel.close(); datachannel.close();
}); });
this.datachannels = {}; this.datachannels = {};
this.streams = {};
if (this.peerconnection) { if (this.peerconnection) {
this.peerconnection.close(); this.peerconnection.close();
this.peerconnection = null; this.peerconnection = null;
} }
// Trigger event for all previously added streams.
_.each(this.streams, _.bind(function(stream, id) {
this.e.triggerHandler("remoteStreamRemoved", [stream, this]);
}, this));
this.streams = {};
console.log("Peercall close", this); console.log("Peercall close", this);
this.e.triggerHandler("closed", [this]); this.e.triggerHandler("closed", [this]);

11
static/js/mediastream/peerconnection.js
Unescape View File

@ -72,14 +72,7 @@ define(['jquery', 'underscore', 'webrtc.adapter'], function($, _) {
pc.onremovestream = _.bind(this.onRemoteStreamRemoved, this); pc.onremovestream = _.bind(this.onRemoteStreamRemoved, this);
// NOTE(longsleep): onnegotiationneeded is not supported by Firefox // NOTE(longsleep): onnegotiationneeded is not supported by Firefox
// https://bugzilla.mozilla.org/show_bug.cgi?id=840728 // https://bugzilla.mozilla.org/show_bug.cgi?id=840728
if (webrtcDetectedBrowser === "firefox") { pc.onnegotiationneeded = _.bind(this.onNegotiationNeeded, this);
window.setTimeout(_.bind(function() {
// Trigger onNegotiationNeeded once for Firefox.
this.onNegotiationNeeded({target: pc});
}, this), 0);
} else {
pc.onnegotiationneeded = _.bind(this.onNegotiationNeeded, this);
}
pc.ondatachannel = _.bind(this.onDatachannel, this); pc.ondatachannel = _.bind(this.onDatachannel, this);
pc.onsignalingstatechange = function(event) { pc.onsignalingstatechange = function(event) {
// XXX(longsleep): Remove this or handle it in a real function. // XXX(longsleep): Remove this or handle it in a real function.
@ -253,8 +246,6 @@ define(['jquery', 'underscore', 'webrtc.adapter'], function($, _) {
this.pc.close(); this.pc.close();
} }
this.currentcall.onRemoteStreamRemoved(null);
this.datachannel = null; this.datachannel = null;
this.pc = null; this.pc = null;

120
static/js/mediastream/usermedia.js
Unescape View File

@ -32,9 +32,14 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
this.started = false; this.started = false;
this.delay = 0; this.delay = 0;
this.audioMute = false;
this.videoMute = false;
this.mediaConstraints = null;
// Audio level. // Audio level.
this.audioLevel = 0; this.audioLevel = 0;
if (!this.options.noaudio && context && context.createScriptProcessor) { if (!this.options.noaudio && context && context.createScriptProcessor) {
this.audioSource = null; this.audioSource = null;
this.audioProcessor = context.createScriptProcessor(2048, 1, 1); this.audioProcessor = context.createScriptProcessor(2048, 1, 1);
this.audioProcessor.onaudioprocess = _.bind(function(event) { this.audioProcessor.onaudioprocess = _.bind(function(event) {
@ -54,6 +59,21 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
this.audioLevel = rms; this.audioLevel = rms;
//console.log("this.audioLevel", this.audioLevel); //console.log("this.audioLevel", this.audioLevel);
}, this); }, this);
// Connect stream to audio processor if supported.
if (context.createMediaStreamSource) {
this.e.bind("localstream", _.bind(function(event, stream) {
if (this.audioSource) {
this.audioSource.disconnect();
}
// Connect to audioProcessor.
this.audioSource = context.createMediaStreamSource(stream);
//console.log("got source", this.audioSource);
this.audioSource.connect(this.audioProcessor);
this.audioProcessor.connect(context.destination);
}, this));
}
} }
}; };
@ -112,11 +132,30 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
if (!mediaConstraints) { if (!mediaConstraints) {
mediaConstraints = currentcall.mediaConstraints; mediaConstraints = currentcall.mediaConstraints;
} }
this.mediaConstraints = mediaConstraints;
return this.doGetUserMediaWithConstraints(mediaConstraints);
};
UserMedia.prototype.doGetUserMediaWithConstraints = function(mediaConstraints) {
if (!mediaConstraints) {
mediaConstraints = this.mediaConstraints;
}
var constraints = $.extend(true, {}, mediaConstraints);
if (this.audioMute) {
constraints.audio = false;
}
if (this.videoMute) {
constraints.video = false;
}
try { try {
console.log('Requesting access to local media with mediaConstraints:\n' + console.log('Requesting access to local media with mediaConstraints:\n' +
' \'' + JSON.stringify(mediaConstraints) + '\'', mediaConstraints); ' \'' + JSON.stringify(constraints) + '\'', constraints);
getUserMedia(mediaConstraints, _.bind(this.onUserMediaSuccess, this), _.bind(this.onUserMediaError, this)); getUserMedia(constraints, _.bind(this.onUserMediaSuccess, this), _.bind(this.onUserMediaError, this));
this.started = true; this.started = true;
return true; return true;
} catch (e) { } catch (e) {
@ -134,27 +173,7 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
return; return;
} }
// Get notified of end events. this.onLocalStream(stream);
stream.onended = _.bind(function(event) {
console.log("User media stream ended.");
if (this.started) {
this.stop();
}
}, this);
if (this.audioProcessor && context.createMediaStreamSource) {
// Connect to audioProcessor.
this.audioSource = context.createMediaStreamSource(stream);
//console.log("got source", this.audioSource);
this.audioSource.connect(this.audioProcessor);
this.audioProcessor.connect(context.destination);
}
this.localStream = stream;
// Let webrtc handle the rest.
setTimeout(_.bind(function() {
this.e.triggerHandler("mediasuccess", [this]);
}, this), this.delay);
}; };
@ -170,6 +189,36 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
}; };
UserMedia.prototype.onLocalStream = function(stream) {
var oldStream = this.localStream;
if (oldStream) {
oldStream.onended = function() {};
oldStream.stop();
setTimeout(_.bind(function() {
this.e.triggerHandler("mediachanged", [this]);
}, this), 0);
} else {
// Let webrtc handle the rest.
setTimeout(_.bind(function() {
this.e.triggerHandler("mediasuccess", [this]);
}, this), this.delay);
}
// Get notified of end events.
stream.onended = _.bind(function(event) {
console.log("User media stream ended.");
if (this.started) {
this.stop();
}
}, this);
// Set new stream.
this.localStream = stream;
this.e.triggerHandler("localstream", [stream, oldStream, this]);
};
UserMedia.prototype.stop = function() { UserMedia.prototype.stop = function() {
this.started = false; this.started = false;
@ -186,6 +235,9 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
this.audioProcessor.disconnect() this.audioProcessor.disconnect()
} }
this.audioLevel = 0; this.audioLevel = 0;
this.audioMute = false;
this.videoMute = false;
this.mediaConstraints = null;
console.log("Stopped user media."); console.log("Stopped user media.");
this.e.triggerHandler("stopped", [this]); this.e.triggerHandler("stopped", [this]);
@ -198,6 +250,8 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
UserMedia.prototype.applyAudioMute = function(mute) { UserMedia.prototype.applyAudioMute = function(mute) {
this.audioMute = !!mute;
if (this.localStream) { if (this.localStream) {
var audioTracks = this.localStream.getAudioTracks(); var audioTracks = this.localStream.getAudioTracks();
@ -224,9 +278,11 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
UserMedia.prototype.applyVideoMute = function(mute) { UserMedia.prototype.applyVideoMute = function(mute) {
var m = !!mute;
if (this.localStream) { if (this.localStream) {
var videoTracks = this.localStream.getVideoTracks(); /*var videoTracks = this.localStream.getVideoTracks();
if (videoTracks.length === 0) { if (videoTracks.length === 0) {
//console.log('No local video available.'); //console.log('No local video available.');
return; return;
@ -240,8 +296,15 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
console.log("Local video muted.") console.log("Local video muted.")
} else { } else {
console.log("Local video unmuted.") console.log("Local video unmuted.")
}*/
if (this.videoMute !== m) {
this.videoMute = m;
this.doGetUserMediaWithConstraints();
} }
} else {
this.videoMute = m;
} }
return mute; return mute;
@ -253,6 +316,14 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
console.log("Add usermedia stream to peer connection", pc, this.localStream); console.log("Add usermedia stream to peer connection", pc, this.localStream);
if (this.localStream) { if (this.localStream) {
pc.addStream(this.localStream); pc.addStream(this.localStream);
this.e.on("localstream", _.bind(function(event, stream, oldstream) {
// Update stream support.
if (oldstream) {
pc.removeStream(oldstream);
pc.addStream(stream);
console.log("Updated usermedia stream at peer connection", pc, stream);
}
}, this))
} }
}; };
@ -268,7 +339,6 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _
UserMedia.prototype.attachMediaStream = function(video) { UserMedia.prototype.attachMediaStream = function(video) {
//console.log("attach", video, this.localStream);
attachMediaStream(video, this.localStream); attachMediaStream(video, this.localStream);
}; };

58
static/js/mediastream/webrtc.js
Unescape View File

@ -117,6 +117,10 @@ function($, _, PeerCall, PeerConference, PeerXfer, PeerScreenshare, UserMedia, u
// Start always, no matter what. // Start always, no matter what.
this.maybeStart(); this.maybeStart();
}, this)); }, this));
this.usermedia.e.on("mediachanged", _.bind(function() {
// Propagate media change events.
this.e.triggerHandler("usermedia", [this.usermedia]);
}, this));
}; };
@ -226,32 +230,36 @@ function($, _, PeerCall, PeerConference, PeerXfer, PeerScreenshare, UserMedia, u
switch (type) { switch (type) {
case "Offer": case "Offer":
var busy = false; console.log("Offer process.");
var conference = null; if (this.settings.stereo) {
if (this.currentcall.from !== from) { data.sdp = utils.addStereo(data.sdp);
}
targetcall = this.findTargetCall(from);
if (targetcall) {
// Hey we know this call.
targetcall.setRemoteDescription(new RTCSessionDescription(data), _.bind(function(sessionDescription, currentcall) {
if (currentcall === this.currentcall) {
// Main call.
this.e.triggerHandler("peercall", [this.currentcall]);
}
currentcall.createAnswer(_.bind(function(sessionDescription, currentcall) {
console.log("Sending answer", sessionDescription, currentcall.id);
this.api.sendAnswer(currentcall.id, sessionDescription);
}, this));
}, this));
} else {
// No target call. Check conference auto answer support.
if (this.currentconference && this.currentconference.id === data._conference) { if (this.currentconference && this.currentconference.id === data._conference) {
console.log("Received conference Offer -> auto.", from, data._conference); console.log("Received conference Offer -> auto.", from, data._conference);
conference = data._conference; // Clean own internal data before feeding into browser.
// clean own internal data before feeding into browser.
delete data._conference; delete data._conference;
} else { this.currentconference.autoAnswer(from, new RTCSessionDescription(data));
console.log("Received Offer from unknown id -> busy.", from, this.currentconference); break;
busy = true;
} }
} // Cannot do anything with this offer, reply with busy.
if (busy) { console.log("Received Offer from unknown id -> busy.", from);
this.api.sendBye(from, "busy"); this.api.sendBye(from, "busy");
this.e.triggerHandler("busy", [from, to2, to]); this.e.triggerHandler("busy", [from, to2, to]);
return;
}
console.log("Offer process.");
if (this.settings.stereo) {
data.sdp = utils.addStereo(data.sdp);
}
if (conference) {
this.currentconference.autoAnswer(from, new RTCSessionDescription(data));
} else {
this.currentcall.setRemoteDescription(new RTCSessionDescription(data), _.bind(this.doAnswer, this));
} }
break; break;
case "Candidate": case "Candidate":
@ -428,16 +436,6 @@ function($, _, PeerCall, PeerConference, PeerXfer, PeerScreenshare, UserMedia, u
}; };
WebRTC.prototype.doAnswer = function() {
this.e.triggerHandler("peercall", [this.currentcall]);
this.currentcall.createAnswer(_.bind(function(sessionDescription, currentcall) {
console.log("Sending answer", sessionDescription, currentcall.id);
this.api.sendAnswer(currentcall.id, sessionDescription);
}, this));
};
WebRTC.prototype.doXfer = function(id, token, options) { WebRTC.prototype.doXfer = function(id, token, options) {
var registeredToken = tokens.get(token); var registeredToken = tokens.get(token);

28
static/js/services/videolayout.js
Unescape View File

@ -23,14 +23,14 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
var dynamicCSSContainer = "audiovideo-dynamic"; var dynamicCSSContainer = "audiovideo-dynamic";
var renderers = {}; var renderers = {};
var getRemoteVideoSize = function(videos, peers) { var getRemoteVideoSize = function(videos, streams) {
var size = { var size = {
width: 1920, width: 1920,
height: 1080 height: 1080
} }
if (videos.length) { if (videos.length) {
if (videos.length === 1) { if (videos.length === 1) {
var remoteVideo = peers[videos[0]].element.find("video").get(0); var remoteVideo = streams[videos[0]].element.find("video").get(0);
if (remoteVideo) { if (remoteVideo) {
size.width = remoteVideo.videoWidth; size.width = remoteVideo.videoWidth;
size.height = remoteVideo.videoHeight; size.height = remoteVideo.videoHeight;
@ -51,7 +51,7 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
OnePeople.prototype.name = "onepeople"; OnePeople.prototype.name = "onepeople";
OnePeople.prototype.render = function(container, size, scope, videos, peers) { OnePeople.prototype.render = function(container, size, scope, videos, streams) {
if (this.closed) { if (this.closed) {
return; return;
@ -61,7 +61,7 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
var videoHeight; var videoHeight;
if (videos.length) { if (videos.length) {
var remoteSize = getRemoteVideoSize(videos, peers); var remoteSize = getRemoteVideoSize(videos, streams);
videoWidth = remoteSize.width; videoWidth = remoteSize.width;
videoHeight = remoteSize.height; videoHeight = remoteSize.height;
} }
@ -235,25 +235,25 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
}; };
ConferenceKiosk.prototype.render = function(container, size, scope, videos, peers) { ConferenceKiosk.prototype.render = function(container, size, scope, videos, streams) {
var big = this.big; var big = this.big;
if (big) { if (big) {
var currentbigpeerid = this.big.data("peerid"); var currentbigpeerid = this.big.data("peerid");
if (!peers[currentbigpeerid]) { if (!streams[currentbigpeerid]) {
console.log("Current big peer is no longer there", currentbigpeerid); console.log("Current big peer is no longer there", currentbigpeerid);
this.big = big = null; this.big = big = null;
} }
} }
if (!big) { if (!big) {
if (videos.length) { if (videos.length) {
this.makeBig(peers[videos[0]].element); this.makeBig(streams[videos[0]].element);
this.bigVideo.style.opacity = 1; this.bigVideo.style.opacity = 1;
} }
} }
var remoteSize = getRemoteVideoSize(videos, peers); var remoteSize = getRemoteVideoSize(videos, streams);
var aspectRatio = remoteSize.width / remoteSize.height; var aspectRatio = remoteSize.width / remoteSize.height;
var innerHeight = size.height - 110; var innerHeight = size.height - 110;
var innerWidth = size.width; var innerWidth = size.width;
@ -304,18 +304,18 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
Classroom.prototype = Object.create(ConferenceKiosk.prototype); Classroom.prototype = Object.create(ConferenceKiosk.prototype);
Classroom.prototype.constructor = Classroom; Classroom.prototype.constructor = Classroom;
Classroom.prototype.name = "classroom"; Classroom.prototype.name = "classroom";
Classroom.prototype.render = function(container, size, scope, videos, peers) { Classroom.prototype.render = function(container, size, scope, videos, streams) {
var big = this.big; var big = this.big;
if (big) { if (big) {
var currentbigpeerid = this.big.data("peerid"); var currentbigpeerid = this.big.data("peerid");
if (!peers[currentbigpeerid]) { if (!streams[currentbigpeerid]) {
console.log("Current big peer is no longer there", currentbigpeerid); console.log("Current big peer is no longer there", currentbigpeerid);
this.big = big = null; this.big = big = null;
} }
} }
if (!big) { if (!big) {
if (videos.length) { if (videos.length) {
this.makeBig(peers[videos[0]].element); this.makeBig(streams[videos[0]].element);
this.bigVideo.style.opacity = 1; this.bigVideo.style.opacity = 1;
} }
@ -345,8 +345,8 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
return r; return r;
}; };
var videos = _.keys(controller.peers); var videos = _.keys(controller.streams);
var peers = controller.peers; var streams = controller.streams;
var container = scope.container; var container = scope.container;
var layoutparent = scope.layoutparent; var layoutparent = scope.layoutparent;
@ -370,7 +370,7 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
} }
} }
return current.render(container, size, scope, videos, peers); return current.render(container, size, scope, videos, streams);
}, },
register: function(name, impl) { register: function(name, impl) {

2
static/partials/audiovideopeer.html
Unescape View File

@ -1,4 +1,4 @@
<div class="remoteVideo" ng-class="{'withvideo': withvideo, 'onlyaudio': onlyaudio, 'talking': talking}"> <div class="remoteVideo" ng-class="{'withvideo': withvideo, 'onlyaudio': onlyaudio, 'talking': peersTalking[peerid]}">
<video autoplay="autoplay"></video> <video autoplay="autoplay"></video>
<div class="peerLabel">{{peerid|displayName}}</div> <div class="peerLabel">{{peerid|displayName}}</div>
<div class="peerActions"> <div class="peerActions">

Write Preview
Loading…
Cancel
Save