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

Attempts to prevent blackness when switching simulcast streams.

This commit is contained in:
George Politis 2014-10-20 11:50:15 +02:00
parent 76394c507e
commit 774785c648
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.html
View File

@ -47,7 +47,7 @@
<script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<script src="rtp_sts.js?v=3"></script><!-- RTP stats processing -->
<script src="local_sts.js?v=2"></script><!-- Local stats processing -->
<script src="videolayout.js?v=18"></script><!-- video ui -->
<script src="videolayout.js?v=19"></script><!-- video ui -->
<script src="connectionquality.js?v=1"></script>
<script src="toolbar.js?v=6"></script><!-- toolbar ui -->
<script src="toolbar_toggler.js?v=2"></script>
@ -249,6 +249,7 @@
<a target="_new"><div class="watermark leftwatermark"></div></a>
<a target="_new"><div class="watermark rightwatermark"></div></a>
<a class="poweredby" href="http://jitsi.org" target="_new" >powered by jitsi.org</a>
<video id="preload" style="display: none"></video>
<video id="largeVideo" autoplay oncontextmenu="return false;"></video>
</div>
<div id="remoteVideos">

8
videolayout.js
View File

@ -227,7 +227,13 @@ var VideoLayout = (function (my) {
if (fade) {
$('#largeVideo').fadeOut(300, doUpdate);
} else {
doUpdate();
$("#preload").attr("src", largeVideoState.newSrc);
// The 'canplay' event occurs when the browser can start
// playing the specified audio/video. See:
// http://www.w3schools.com/tags/av_event_canplay.asp
$("#preload").one("canplay",function(){
doUpdate();
});
}
}
}