Changeset 2321124

Timestamp:

06/09/2020 08:44:47 PM (6 years ago)

Author:

muvidental

Message:

Fix FB IAB bug

File:

• dental-education-videos/trunk/assets/muvi-fancy.js (modified) (9 diffs)

dental-education-videos/trunk/assets/muvi-fancy.js

@@ -24 +24 @@
 var i;
 for (i = 0; i < muviplayers.length; i++) {
-    
+
     var videotopic = muviplayers[i].dataset.topic;
     muviplayers[i].setAttribute("muted", "muted");
@@ -38 +38 @@
     muviplayers[i].setAttribute("poster", "https://assets.muvidental.com/img/posters/" + videotopic + ".jpg");     // Not protected, no token needed
     muviplayers[i].setAttribute("style", "max-width: 100%;");
-    
-    
-    
+
+
+
     var uAgent = navigator.userAgent;
     var isiOS = false;
     var isMac = false;
+    var isSafari = false;
+    var useHEVC = false;
+    var useHLSJS = true;
     var osVersion = "";
 
-    // Check if iOS
+    // Checks on iOS
     if (/iPad|iPhone|iPod/.test(uAgent) == true) {
         isiOS = true;
+        useHLSJS = false;
         osVersion = uAgent.match(/OS (\d+)/);
+        if (osVersion[1] >= 12) {
+          useHEVC = true;
+        }
     }
-    // Check if Mac OS
+
+    // Checks on Mac OS
     if (/OS X 10[_.](\d+)/.test(uAgent) == true) {
+        // We are on a Mac
         isMac = true;
         osVersion = uAgent.match(/OS X 10[_.](\d+)/);
+        if (navigator.userAgent.indexOf('Safari') != -1 && navigator.userAgent.indexOf('Chrome') == -1 && !window.MSStream) {
+          // Safari on Mac
+          isSafari = true;
+          useHLSJS = false;
+
+          if (osVersion[1] >= 12) {
+            // Newer Safari
+            useHEVC = true;
+          }
+
+
+        }
     }
-                
-    
-    
-    if (navigator.userAgent.indexOf('Safari') != -1 && navigator.userAgent.indexOf('Chrome') == -1 && !window.MSStream) {
-            // Safari specific code
-            if (isiOS == true && osVersion[1] >= 12) {
-                // Send H265 master playlist to iOS 11+ Safari
-                muviplayers[i].src = streamPHP + '?l=1&c=hevc&v=' + videotopic;
-                muviplayers[i].addEventListener('canplay', function() {
-                // muviplayers[i].play();
-                });
-            } else if (isMac == true && osVersion[1] >= 14) {
-                // Send H265 master playlist to Mac OS X 13+ Safari
-                muviplayers[i].src = streamPHP + '?l=1&c=hevc&v=' + videotopic;
-                muviplayers[i].addEventListener('canplay', function() {
-                    // muviplayers[i].play();
-                });
-            } else {
-                // Send H264 master playlist to older iDevices
-                muviplayers[i].src = streamPHP + '?l=1&v=' + videotopic;
-                muviplayers[i].addEventListener('canplay', function() {
-                    // muviplayers[i].play();
-                });
-            }
-            
-            // autoplay on mac 
-            if (isMac == true) {
-                muviplayers[i].muted = true;
-                muviplayers[i].volume = 0.0;
-                muviplayers[i].play();
-            }
-            
 
-    } else if (Hls.isSupported()) {
-        // Chrome, Firefox, IE, etc...
-        var hls = new Hls(config);
 
-        // Send H264 master playlist to everyone else
-        hls.loadSource(streamPHP + '?l=1&v=' + videotopic);
-        console.log('Break 7');
+    //** BUILD PLAYER **//
+    if (useHEVC == true) {
+      // Send H265 master playlist to all iOS Browsers and Safari on Mac
+      muviplayers[i].src = streamPHP + '?l=1&c=hevc&v=' + videotopic;
+      muviplayers[i].addEventListener('canplay', function() {
+        // muviplayers[i].play();
+      });
+    } else if (useHLSJS == false && useHEVC == false) {
+      // Send H264 master playlist to older Safari 
+      muviplayers[i].src = streamPHP + '?l=1&v=' + videotopic;
+      muviplayers[i].addEventListener('canplay', function() {
+          // muviplayers[i].play();
+      });
+    } else {
+      // Use HLSJS for everyone else
+      var hls = new Hls(config);
 
-        hls.attachMedia(muviplayers[i]);
-        hls.on(Hls.Events.MANIFEST_PARSED,function() {
-            // video.play();
-        });
-        
-        muviplayers[i].muted = true;
-        muviplayers[i].volume = 0.0;
-        muviplayers[i].play();
-        
+      // Send H264 playlist
+      hls.loadSource(streamPHP + '?l=1&v=' + videotopic);
+      console.log('Break 7');
+
+      hls.attachMedia(muviplayers[i]);
+      hls.on(Hls.Events.MANIFEST_PARSED,function() {
+          // video.play();
+      });
+
+      muviplayers[i].muted = true;
+      muviplayers[i].volume = 0.0;
+      muviplayers[i].play();
     }
-    
-    
-    
+
+
+
+
+    // autoplay on Mac Safari
+    if (isMac == true && isSafari == true) {
+      muviplayers[i].muted = true;
+      muviplayers[i].volume = 0.0;
+      muviplayers[i].play();
+    }
+
+
+
+
+
     // English Captions
     var enTrack = document.createElement("track");
@@ -118 +132 @@
     enTrack.src = "https://assets.muvidental.com/vtt/" + videotopic + "/en.vtt";   // Not protected, no token needed
     muviplayers[i].appendChild(enTrack);
-    
+
     // Spanish Subtitles (for future implementation)
     // var esTrack = document.createElement("track");
@@ -127 +141 @@
     // esTrack.src = "https://assets.muvidental.com/vtt/" + videotopic + "/es.vtt";   // Not protected, no token needed
     // muviplayers[i].appendChild(esTrack);
-    
+
     // French Subtitles (for future implementation)
     // var frTrack = document.createElement("track");
@@ -136 +150 @@
     // frTrack.src = "https://assets.muvidental.com/vtt/" + videotopic + "/fr.vtt";   // Not protected, no token needed
     // muviplayers[i].appendChild(frTrack);
-    
+
     // German Subtitles (for future implementation)
     // var deTrack = document.createElement("track");
@@ -145 +159 @@
     // deTrack.src = "https://assets.muvidental.com/vtt/" + videotopic + "/de.vtt";   // Not protected, no token needed
     // muviplayers[i].appendChild(deTrack);
-    
+
     // Portuguese Subtitles (for future implementation)
     // var ptTrack = document.createElement("track");
@@ -154 +168 @@
     // ptTrack.src = "https://assets.muvidental.com/vtt/" + videotopic + "/pt.vtt";   // Not protected, no token needed
     // muviplayers[i].appendChild(ptTrack);
-    
+
     // Hungarian Subtitles (for future implementation)
     // var huTrack = document.createElement("track");
@@ -163 +177 @@
     // huTrack.src = "https://assets.muvidental.com/vtt/" + videotopic + "/hu.vtt";   // Not protected, no token needed
     // muviplayers[i].appendChild(huTrack);
-    
+
     // Polish Subtitles (for future implementation)
     // var plTrack = document.createElement("track");
@@ -172 +186 @@
     // plTrack.src = "https://assets.muvidental.com/vtt/" + videotopic + "/pl.vtt";   // Not protected, no token needed
     // muviplayers[i].appendChild(plTrack);
-    
+
     // Russian Subtitles (for future implementation)
     // var ruTrack = document.createElement("track");