Reverts 774785 "Attempts to prevent blackness when switching simulcast streams."

It seems to break things when testing with multiple tabs open.
This commit is contained in:
George Politis 2014-10-21 10:07:49 +02:00
parent a4c8c8b95c
commit 117d6c513c
2 changed files with 2 additions and 8 deletions

View File

@ -47,7 +47,7 @@
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<script src="rtp_sts.js?v=3"></script><!-- RTP stats processing --> <script src="rtp_sts.js?v=3"></script><!-- RTP stats processing -->
<script src="local_sts.js?v=2"></script><!-- Local stats processing --> <script src="local_sts.js?v=2"></script><!-- Local stats processing -->
<script src="videolayout.js?v=19"></script><!-- video ui --> <script src="videolayout.js?v=20"></script><!-- video ui -->
<script src="connectionquality.js?v=1"></script> <script src="connectionquality.js?v=1"></script>
<script src="toolbar.js?v=6"></script><!-- toolbar ui --> <script src="toolbar.js?v=6"></script><!-- toolbar ui -->
<script src="toolbar_toggler.js?v=2"></script> <script src="toolbar_toggler.js?v=2"></script>

View File

@ -227,13 +227,7 @@ var VideoLayout = (function (my) {
if (fade) { if (fade) {
$('#largeVideo').fadeOut(300, doUpdate); $('#largeVideo').fadeOut(300, doUpdate);
} else { } else {
$("#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(); doUpdate();
});
} }
} }
} }