@flashphoner/websdk 2.0.229 → 2.0.231

package/docTemplate/README.md

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

package/examples/demo/dependencies/js/utils.js

@@ -206,28 +206,33 @@ function downScaleToFitSize(videoWidth, videoHeight, dstWidth, dstHeight) {
 function setWebkitFullscreenHandlers(video) {
     if (video) {
         let needRestart = false;
+        let wasFullscreen = false;
         // iOS hack when using standard controls to leave fullscreen mode
         video.addEventListener("pause", function () {
             if (needRestart) {
                 console.log("Video paused after fullscreen, continue...");
+                wasFullscreen = true;
                 video.play();
                 needRestart = false;
             }
         });
         video.addEventListener("webkitendfullscreen", function () {
+            wasFullscreen = true;
             video.play();
             needRestart = true;
         });                
         // Start playback in fullscreen if webkit-playsinline is set
         video.addEventListener("playing", function () {
-            if (canWebkitFullScreen(video)) {
-                // After pausing and resuming the video tag may be in invalid state
+            // Do not enter fullscreen again if we just left it #WCS-3860
+            if (canWebkitFullScreen(video) && !wasFullscreen) {
+                // We should catch if fullscreen mode is not available
                 try {
                     video.webkitEnterFullscreen();
                 } catch (e) {
                     console.log("Fullscreen is not allowed: " + e);
                 }
             }
+            wasFullscreen = false;
         });
     } else {
         console.log("No video tag is passed, skip webkit fullscreen handlers setup");
@@ -237,7 +242,7 @@ function setWebkitFullscreenHandlers(video) {
 function canWebkitFullScreen(video) {
     let canFullscreen = false;
     if (video) {
-        canFullscreen = video.webkitSupportsFullscreen && !video.webkitDisplayingFullscreen && !document.webkitFullscreenElement;
+        canFullscreen = video.webkitSupportsFullscreen && !video.webkitDisplayingFullscreen;
     }
     return canFullscreen;
 }

package/examples/demo/streaming/hls-js-player/hls-js-player.js

@@ -1,6 +1,6 @@
 var Browser = Flashphoner.Browser;
 var remoteVideo = null;
-var hlsPlayer = null
+var hlsPlayer = null;
 
 function loadPlayerPage() {
     $("#playerPage").load("../hls-player/player-page.html", initPage );
@@ -9,7 +9,13 @@ function loadPlayerPage() {
 function initPage() {
     $("#header").text("HLS.JS Player Minimal");
     $("#urlServer").val(getHLSUrl());
-    $("#applyBtn").prop('disabled', false).text("Play").off('click').click(playBtnClick);
+    $("#applyBtn").prop('disabled', true).text("Play").off('click').click(playBtnClick);
+    if (Hls.isSupported()) {
+        console.log("Using HLS.JS " + Hls.version);
+        $("#applyBtn").prop('disabled', false);
+    } else {
+        $("#notifyFlash").text("Your browser doesn't support MSE technology required to play video");
+    }
     remoteVideo = document.getElementById('remoteVideo');
     remoteVideo.style ="background-color: lightgrey;";
     $('#llHlsMode').show();
@@ -27,19 +33,13 @@ function playBtnClick() {
         if (key.length > 0 && token.length > 0) {
             videoSrc += "?" + key + "=" + token;
         }
-        if (Hls.isSupported()) {
-            console.log("Low Latency HLS: "+llHlsEnabled)
-            hlsPlayer = new Hls(getHlsConfig(llHlsEnabled));
-            hlsPlayer.on(Hls.Events.MANIFEST_PARSED, function() {
-                console.log("Play with HLS.js");
-                remoteVideo.play();
-            });
-            hlsPlayer.loadSource(videoSrc);
-            hlsPlayer.attachMedia(remoteVideo);
-        }
-        else {
-            $("#notifyFlash").text("Your browser doesn't support MSE technology required to play video");
-        }
+        hlsPlayer = new Hls(getHlsConfig(llHlsEnabled));
+        hlsPlayer.on(Hls.Events.MANIFEST_PARSED, function() {
+            console.log("Play with HLS.js");
+            remoteVideo.play();
+        });
+        hlsPlayer.loadSource(videoSrc);
+        hlsPlayer.attachMedia(remoteVideo);
         onStarted();            
     }
 }
@@ -52,6 +52,7 @@ function getHlsConfig(llHlsEnabled) {
         backBufferLength: 90,
         manifestLoadingTimeOut: 15000
     };
+    console.log("Low Latency HLS: "+llHlsEnabled)
     if(llHlsEnabled) {
         // Here we configure HLS.JS for lower latency
         config = {

package/examples/demo/streaming/hls-player/hls-player.js

@@ -126,6 +126,7 @@ function removeHighlight(input) {
 
 function initVideoJsPlayer(video) {
     var videoJsPlayer = videojs(video);
+    console.log("Using VideoJs " + videojs.VERSION);
     if (Browser.isSafariWebRTC() && Browser.isiOS()) {
         // iOS hack when using standard controls to leave fullscreen mode
         var videoTag = getActualVideoTag();