haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes 'wait for remote video' hack

This commit is contained in:
paweldomas 2015-07-01 14:20:08 +02:00
parent 3fc6da1ed5
commit 9268da65c2
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/UI/videolayout/RemoteVideo.js
View File

@ -163,10 +163,11 @@ RemoteVideo.prototype.removeRemoteStreamElement = function (stream, isVideo, id)
}; };
RemoteVideo.prototype.addRemoteStreamElement = function (sid, stream, thessrc) { RemoteVideo.prototype.addRemoteStreamElement = function (sid, stream, thessrc) {
var isVideo = stream.getVideoTracks().length > 0; if (!this.container)
if(!this.container)
return; return;
var self = this;
var isVideo = stream.getVideoTracks().length > 0;
var streamElement = SmallVideo.createStreamElement(sid, stream); var streamElement = SmallVideo.createStreamElement(sid, stream);
var newElementId = streamElement.id; var newElementId = streamElement.id;
@ -178,10 +179,20 @@ RemoteVideo.prototype.addRemoteStreamElement = function (sid, stream, thessrc) {
// If the container is currently visible we attach the stream. // If the container is currently visible we attach the stream.
if (!isVideo if (!isVideo
|| (this.container.offsetParent !== null && isVideo)) { || (this.container.offsetParent !== null && isVideo)) {
APP.RTC.attachMediaStream(sel, stream);
if (isVideo) // Register 'onplaying' listener to trigger 'videoactive' on VideoLayout
this.waitForRemoteVideo(sel, thessrc, stream); // when video playback starts
if (isVideo && stream.id !== 'mixedmslabel') {
var onPlayingHandler = function () {
// FIXME: why do i have to do this for FF?
APP.RTC.attachMediaStream(sel, stream);
self.VideoLayout.videoactive(sel, self.resourceJid);
sel.off("playing", onPlayingHandler);
};
sel.on("playing", onPlayingHandler);
}
APP.RTC.attachMediaStream(sel, stream);
} }
var self = this; var self = this;
@ -232,26 +243,6 @@ RemoteVideo.prototype.addRemoteStreamElement = function (sid, stream, thessrc) {
); );
} }
RemoteVideo.prototype.waitForRemoteVideo = function(selector, ssrc, stream) {
if (selector.removed || !selector.parent().is(":visible")) {
console.warn("Media removed before had started", selector);
return;
}
if (stream.id === 'mixedmslabel') return;
if (selector[0].currentTime > 0) {
APP.RTC.attachMediaStream(selector, stream); // FIXME: why do i have to do this for FF?
this.VideoLayout.videoactive(selector, this.resourceJid);
} else {
var self = this;
setTimeout(function () {
self.waitForRemoteVideo(selector, ssrc, stream);
}, 250);
}
}
/** /**
* Show/hide peer container for the given resourceJid. * Show/hide peer container for the given resourceJid.
*/ */