Merge pull request #629 from jitsi/lipsync

Lipsync

conference.js

@@ -557,6 +557,9 @@ export default {
                 this.useAudioStream(track);
             } else if (track.isVideoTrack()) {
                 this.useVideoStream(track);
+            } else {
+                console.error(
+                    "Ignored not an audio nor a video track: ", track);
             }
         });
         roomLocker = createRoomLocker(room);

modules/UI/videolayout/LargeVideo.js

@@ -446,7 +446,15 @@ export default class LargeVideoManager {
 
         let container = this.getContainer(this.state);
 
-        container.hide().then(() => {
+        // Include hide()/fadeOut only if we're switching between users
+        let preUpdate;
+        if (this.newStreamData.id != this.id) {
+            preUpdate = container.hide();
+        } else {
+            preUpdate = Promise.resolve();
+        }
+        
+        preUpdate.then(() => {
             let {id, stream, videoType, resolve} = this.newStreamData;
             this.newStreamData = null;
 

modules/UI/videolayout/VideoLayout.js

@@ -410,7 +410,11 @@ var VideoLayout = {
             this.isLargeContainerTypeVisible(VIDEO_CONTAINER_TYPE)) ||
             pinnedId === resourceJid ||
             (!pinnedId && resourceJid &&
-                currentDominantSpeaker === resourceJid)) {
+                currentDominantSpeaker === resourceJid) ||
+            /* Playback started while we're on the stage - may need to update
+               video source with the new stream */
+            this.isCurrentlyOnLarge(resourceJid)) {
+
             this.updateLargeVideo(resourceJid, true);
         }
     },