@flashphoner/websdk 2.0.207 → 2.0.211

package/docTemplate/README.md

@@ -1,4 +1,4 @@
-Web SDK - 2.0.207
+Web SDK - 2.0.211
 
 [Download builds](https://docs.flashphoner.com/display/WEBSDK2EN/Web+SDK+release+notes)
 

package/examples/demo/streaming/2players/2players.js

@@ -112,11 +112,6 @@ function playBtnClick(index) {
 
         if (Flashphoner.getMediaProviders()[0] === "WSPlayer") {
             Flashphoner.playFirstSound();
-        } else if (Browser.isSafariWebRTC()) {
-            Flashphoner.playFirstVideo(display, false, PRELOADER_URL).then(function () {
-                playStream(index, display);
-            });
-            return;
         }
         playStream(index, display);
     }

package/examples/demo/streaming/canvas_streaming/canvas_streaming.js

@@ -39,12 +39,6 @@ function connect() {
     console.log("Create new session with url " + url);
     Flashphoner.createSession({urlServer: url}).on(SESSION_STATUS.ESTABLISHED, function (session) {
         setStatus("#connectStatus", session.status());
-        if (Browser.isSafariWebRTC()) {
-            Flashphoner.playFirstVideo(localVideo, true, PRELOADER_URL).then(function() {
-                startStreaming();
-            });
-            return;
-        }
         startStreaming();
     }).on(SESSION_STATUS.DISCONNECTED, function () {
         setStatus("#connectStatus", SESSION_STATUS.DISCONNECTED);
@@ -107,12 +101,6 @@ function startStreaming() {
         setStatus("#publishStatus", STREAM_STATUS.PUBLISHING);
         if (Flashphoner.getMediaProviders()[0] === "WSPlayer") {
             Flashphoner.playFirstSound();
-        } else if (Browser.isSafariWebRTC() || Flashphoner.getMediaProviders()[0] === "MSE") {
-            Flashphoner.playFirstVideo(remoteVideo, false, PRELOADER_URL).then(function() {
-                playStream();
-                onPublishing(stream);
-            });
-            return;
         }
         playStream();
         onPublishing(stream);

package/examples/demo/streaming/conference/conference.html

@@ -66,6 +66,9 @@
                 <div class="text-center" style="margin-top: 20px">
                     <div id="participant1Status"></div>
                 </div>
+                <div class="input-group text-center" style="margin: 5px auto 0 auto;">
+                    <button id="participant1Btn" type="button" class="btn btn-default">Play</button>
+                </div>
             </div>
 
             <div class="col-sm-6">
@@ -76,6 +79,9 @@
                 <div class="text-center" style="margin-top: 20px">
                     <div id="participant2Status"></div>
                 </div>
+                <div class="input-group text-center" style="margin: 5px auto 0 auto;">
+                    <button id="participant2Btn" type="button" class="btn btn-default">Play</button>
+                </div>
             </div>
 
         </div>

package/examples/demo/streaming/conference/conference.js

@@ -47,6 +47,9 @@ function onLeft() {
     $("[id$=Name]").not(":contains('NONE')").each(function(index,value) {
         $(value).text('NONE');
     });
+    for (var i = 0; i < _participants; i++) {
+        $("#participant" + i + "Btn").text("Play").off('click').prop('disabled', true);
+    };
     $("#joinBtn").text("Join").off('click').click(function(){
         if (validateForm()) {
             $(this).prop('disabled', true);
@@ -75,14 +78,6 @@ function start() {
             return;
         }
     }
-    if (Browser.isSafariWebRTC()) {
-        for (var i = 1; i < _participants; i++){
-            Flashphoner.playFirstVideo(document.getElementById("participant" + i + "Display"), false, PRELOADER_URL).then(function() {
-                createConnection(url, username);
-            });
-            return;
-        }
-    }
     createConnection(url, username);
 }
 
@@ -123,14 +118,7 @@ function joinRoom() {
         } else {
             addMessage("chat", " room is empty");
         }
-        if (Browser.isSafariWebRTC()) {
-            Flashphoner.playFirstVideo(document.getElementById("localDisplay"), true, PRELOADER_URL).then(function() {
-                publishLocalMedia(room);
-                onJoined(room);
-            });
-            return;
-        }
-        publishLocalMedia(room);
+        publishLocalStream(room);
         onJoined(room);
     }).on(ROOM_EVENT.JOINED, function(participant){
         installParticipant(participant);
@@ -164,7 +152,6 @@ function installParticipant(participant) {
     } else {
         var p = $("[id$=Name]:contains('NONE')")[0].id.replace('Name','');
         var pName = '#' + p + 'Name';
-        var pDisplay = p + 'Display';
         $(pName).text(participant.name());
         playParticipantsStream(participant);
     }
@@ -174,6 +161,8 @@ function removeParticipant(participant) {
     $("[id$=Name]").each(function(index,value) {
        if ($(value).text() == participant.name()) {
            $(value).text('NONE');
+           var pButtonId = value.id.replace('Name', '') + 'Btn';
+           $("#" + pButtonId).text("Play").off('click').prop('disabled', true);
        }
     });
 }
@@ -183,17 +172,68 @@ function playParticipantsStream(participant) {
         $("[id$=Name]").each(function (index, value) {
             if ($(value).text() == participant.name()) {
                 var p = value.id.replace('Name', '');
-                var pDisplay = p + 'Display';
-                participant.getStreams()[0].play(document.getElementById(pDisplay)).on(STREAM_STATUS.PLAYING, function (playingStream) {
-                    document.getElementById(playingStream.id()).addEventListener('resize', function (event) {
-                        resizeVideo(event.target);
+                var pDisplay = document.getElementById(p + 'Display');
+                if (Browser.isSafariWebRTC()) {
+                    Flashphoner.playFirstVideo(pDisplay, false, PRELOADER_URL).then(function() {
+                        playStream(participant, pDisplay);
+                    }).catch(function (error) {
+                        // Low Power Mode detected, user action is needed to start playback in this mode #WCS-2639
+                        console.log("Can't atomatically play participant" + participant.name() + " stream, use Play button");
+                        for (var i = 0; i < pDisplay.children.length; i++) {
+                            if (pDisplay.children[i]) {
+                                console.log("remove cached instance id " + pDisplay.children[i].id);
+                                pDisplay.removeChild(pDisplay.children[i]);
+                            }
+                        }
+                        onParticipantStopped(participant);
                     });
-                });
+                } else {
+                    playStream(participant, pDisplay);
+                }
             }
         });
     }
 }
 
+function playStream(participant, display) {
+    var button = getParticipantButton(participant);
+    participant.getStreams()[0].play(display).on(STREAM_STATUS.PLAYING, function (playingStream) {
+        document.getElementById(playingStream.id()).addEventListener('resize', function (event) {
+            resizeVideo(event.target);
+        });
+        if (button) {
+            $(button).text("Stop").off('click').click(function(){
+                $(this).prop('disabled', true);
+                playingStream.stop();
+            }).prop('disabled', false);
+        }
+    }).on(STREAM_STATUS.STOPPED, function () {
+        onParticipantStopped(participant);
+    }).on(STREAM_STATUS.FAILED, function () {
+        onParticipantStopped(participant);
+    });
+}
+
+function onParticipantStopped(participant) {
+    var button = getParticipantButton(participant);
+    if (button) {
+        $(button).text("Play").off('click').click(function() {
+            playParticipantsStream(participant);
+        }).prop('disabled', false);
+    }
+}
+
+function getParticipantButton(participant) {
+    var button = null;
+    $("[id$=Name]").each(function (index, value) {
+        if ($(value).text() == participant.name()) {
+            button = document.getElementById(value.id.replace('Name', '') + 'Btn');
+            return(button);
+        }
+    });
+    return(button);
+}
+
 function getRoomName() {
     var name = getUrlParam("roomName");
     if (name && name !== '') {
@@ -239,7 +279,7 @@ function onMediaPublished(stream) {
 function onMediaStopped(room) {
     $("#localStopBtn").text("Publish").off('click').click(function(){
         $(this).prop('disabled', true);
-        publishLocalMedia(room);
+        publishLocalStream(room);
     }).prop('disabled', (connection.getRooms().length == 0));
     $("#localAudioToggle").prop("disabled", true);
     $("#localVideoToggle").prop("disabled", true);
@@ -274,6 +314,26 @@ function publishLocalMedia(room) {
     });
 }
 
+function publishLocalStream(room) {
+    if (Browser.isSafariWebRTC()) {
+        var display = document.getElementById("localDisplay");
+        Flashphoner.playFirstVideo(display, true, PRELOADER_URL).then(function() {
+            publishLocalMedia(room);
+        }).catch(function (error) {
+            console.log("Can't atomatically publish local stream, use Publish button");
+            for (var i = 0; i < display.children.length; i++) {
+                if (display.children[i]) {
+                    console.log("remove cached instance id " + display.children[i].id);
+                    display.removeChild(display.children[i]);
+                }
+            }
+            onMediaStopped(room);
+        });
+        return;
+    }
+    publishLocalMedia(room);
+}
+
 function muteConnectInputs() {
     $(':text').each(function(){
         $(this).prop('disabled', true);