shaka-player 4.7.13 → 4.7.15

package/lib/util/platform.js

@@ -107,6 +107,33 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('Tizen');
   }
 
+  /**
+   * Check if the current platform is a Tizen 6 TV.
+   *
+   * @return {boolean}
+   */
+  static isTizen6() {
+    return shaka.util.Platform.userAgentContains_('Tizen 6');
+  }
+
+  /**
+   * Check if the current platform is a Tizen 5.0 TV.
+   *
+   * @return {boolean}
+   */
+  static isTizen5_0() {
+    return shaka.util.Platform.userAgentContains_('Tizen 5.0');
+  }
+
+  /**
+   * Check if the current platform is a Tizen 5 TV.
+   *
+   * @return {boolean}
+   */
+  static isTizen5() {
+    return shaka.util.Platform.userAgentContains_('Tizen 5');
+  }
+
   /**
    * Check if the current platform is a Tizen 4 TV.
    *
@@ -149,10 +176,9 @@ shaka.util.Platform = class {
    * @return {boolean}
    */
   static isWebOS3() {
-    // See: http://webostv.developer.lge.com/discover/specifications/web-engine/
-    return shaka.util.Platform.userAgentContains_('Web0S') &&
-        shaka.util.Platform.userAgentContains_(
-            'Chrome/38.0.2125.122 Safari/537.36');
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 38;
   }
 
   /**
@@ -161,18 +187,20 @@ shaka.util.Platform = class {
    * @return {boolean}
    */
   static isWebOS4() {
-    // See: http://webostv.developer.lge.com/discover/specifications/web-engine/
-    return !!navigator.userAgent.match(/webOS\/4/i);
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 53;
   }
 
   /**
-   * Check if the current platform is a WebOS 4.
+   * Check if the current platform is a WebOS 5.
    *
    * @return {boolean}
    */
   static isWebOS5() {
-    // See: http://webostv.developer.lge.com/discover/specifications/web-engine/
-    return !!navigator.userAgent.match(/webOS\/5/i);
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 68;
   }
 
   /**
@@ -184,6 +212,28 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('CrKey');
   }
 
+  /**
+   * Check if the current platform is a Google Chromecast with Android
+   * (i.e. Chromecast with GoogleTV).
+   *
+   * @return {boolean}
+   */
+  static isAndroidCastDevice() {
+    const Platform = shaka.util.Platform;
+    return Platform.isChromecast() && Platform.isAndroid();
+  }
+
+  /**
+   * Check if the current platform is a Google Chromecast with Fuchsia
+   * (i.e. Google Nest Hub).
+   *
+   * @return {boolean}
+   */
+  static isFuchsiaCastDevice() {
+    const Platform = shaka.util.Platform;
+    return Platform.isChromecast() && Platform.isFuchsia();
+  }
+
   /**
    * Returns a major version number for Chrome, or Chromium-based browsers.
    *
@@ -414,6 +464,9 @@ shaka.util.Platform = class {
       return navigator.userAgentData.platform.toLowerCase() == 'macos';
     }
     // Fall back to the old API, with less strict matching.
+    if (!navigator.platform) {
+      return false;
+    }
     return navigator.platform.toLowerCase().includes('mac');
   }
 
@@ -428,6 +481,9 @@ shaka.util.Platform = class {
       return navigator.userAgentData.platform.toLowerCase() == 'windows';
     }
     // Fall back to the old API, with less strict matching.
+    if (!navigator.platform) {
+      return false;
+    }
     return navigator.platform.toLowerCase().includes('windows');
   }
 
@@ -440,6 +496,34 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('Android');
   }
 
+  /**
+   * Return true if the platform is a Fuchsia, regardless of the browser.
+   *
+   * @return {boolean}
+   */
+  static isFuchsia() {
+    return shaka.util.Platform.userAgentContains_('Fuchsia');
+  }
+
+  /**
+   * Return true if the platform is controlled by a remote control.
+   *
+   * @return {boolean}
+   */
+  static isSmartTV() {
+    const Platform = shaka.util.Platform;
+    if (Platform.isTizen() || Platform.isWebOS() ||
+        Platform.isXboxOne() || Platform.isPS4() ||
+        Platform.isPS5() || Platform.isAmazonFireTV() ||
+        Platform.isEOS() || Platform.isAPL() ||
+        Platform.isVirginMedia() || Platform.isOrange() ||
+        Platform.isWPE() || Platform.isChromecast() ||
+        Platform.isHisense()) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * Check if the user agent contains a key. This is the best way we know of
    * right now to detect platforms. If there is a better way, please send a
@@ -530,11 +614,16 @@ shaka.util.Platform = class {
    */
   static supportsSmoothCodecSwitching() {
     const Platform = shaka.util.Platform;
-    if (Platform.isTizen2() || Platform.isTizen3() ||
-        Platform.isTizen4() || Platform.isWebOS3() ||
+    if (Platform.isTizen2() || Platform.isTizen3() || Platform.isTizen4() ||
+        Platform.isTizen5() || Platform.isTizen6() || Platform.isWebOS3() ||
         Platform.isWebOS4() || Platform.isWebOS5()) {
       return false;
     }
+    // Older chromecasts without GoogleTV seem to not support SMOOTH properly.
+    if (Platform.isChromecast() && !Platform.isAndroidCastDevice() &&
+        !Platform.isFuchsiaCastDevice()) {
+      return false;
+    }
     // See: https://chromium-review.googlesource.com/c/chromium/src/+/4577759
     if (Platform.isWindows() && Platform.isEdge()) {
       return false;

package/lib/util/stream_utils.js

@@ -419,7 +419,8 @@ shaka.util.StreamUtils = class {
         videoCodecs = StreamUtils.getCorrectVideoCodecs(videoCodecs);
         let audioCodecs = ManifestParserUtils.guessCodecs(
             ContentType.AUDIO, allCodecs);
-        audioCodecs = StreamUtils.getCorrectAudioCodecs(audioCodecs);
+        audioCodecs = StreamUtils.getCorrectAudioCodecs(
+            audioCodecs, video.mimeType);
 
         const audioFullType = MimeUtils.getFullOrConvertedType(
             video.mimeType, audioCodecs, ContentType.AUDIO);
@@ -455,7 +456,8 @@ shaka.util.StreamUtils = class {
     }
 
     if (audio) {
-      const codecs = StreamUtils.getCorrectAudioCodecs(audio.codecs);
+      const codecs = StreamUtils.getCorrectAudioCodecs(
+          audio.codecs, audio.mimeType);
       const fullType = MimeUtils.getFullOrConvertedType(
           audio.mimeType, codecs, ContentType.AUDIO);
 
@@ -536,7 +538,7 @@ shaka.util.StreamUtils = class {
       if (!a) {
         return b;
       } else {
-        const res = shaka.util.ObjectUtils.cloneObject(a);
+        const res = shaka.util.ObjectUtils.shallowCloneObject(a);
         res.supported = a.supported && b.supported;
         res.powerEfficient = a.powerEfficient && b.powerEfficient;
         res.smooth = a.smooth && b.smooth;
@@ -744,17 +746,18 @@ shaka.util.StreamUtils = class {
         // We ignore the multiplexed audio when there is normal audio also.
         if (videoCodecs.includes(',') && !audio) {
           const allCodecs = videoCodecs.split(',');
+          const baseMimeType = MimeUtils.getBasicType(fullMimeType);
 
           videoCodecs = ManifestParserUtils.guessCodecs(
               ContentType.VIDEO, allCodecs);
 
           let audioCodecs = ManifestParserUtils.guessCodecs(
               ContentType.AUDIO, allCodecs);
-          audioCodecs = StreamUtils.getCorrectAudioCodecs(audioCodecs);
+          audioCodecs = StreamUtils.getCorrectAudioCodecs(
+              audioCodecs, baseMimeType);
 
           const audioFullType = MimeUtils.getFullOrConvertedType(
-              MimeUtils.getBasicType(fullMimeType), audioCodecs,
-              ContentType.AUDIO);
+              baseMimeType, audioCodecs, ContentType.AUDIO);
 
           audioConfigs.push({
             contentType: audioFullType,
@@ -805,10 +808,11 @@ shaka.util.StreamUtils = class {
     }
     if (audio) {
       for (const fullMimeType of audio.fullMimeTypes) {
-        const codecs = StreamUtils.getCorrectAudioCodecs(MimeUtils.getCodecs(
-            fullMimeType));
+        const baseMimeType = MimeUtils.getBasicType(fullMimeType);
+        const codecs = StreamUtils.getCorrectAudioCodecs(
+            MimeUtils.getCodecs(fullMimeType), baseMimeType);
         const fullType = MimeUtils.getFullOrConvertedType(
-            MimeUtils.getBasicType(fullMimeType), codecs, ContentType.AUDIO);
+            baseMimeType, codecs, ContentType.AUDIO);
 
         // AudioConfiguration
         audioConfigs.push({
@@ -965,21 +969,34 @@ shaka.util.StreamUtils = class {
    * Generates the correct audio codec for MediaDecodingConfiguration and
    * for MediaSource.isTypeSupported.
    * @param {string} codecs
+   * @param {string} mimeType
    * @return {string}
    */
-  static getCorrectAudioCodecs(codecs) {
+  static getCorrectAudioCodecs(codecs, mimeType) {
     // According to RFC 6381 section 3.3, 'fLaC' is actually the correct
     // codec string. We still need to map it to 'flac', as some browsers
     // currently don't support 'fLaC', while 'flac' is supported by most
     // major browsers.
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
-    if (codecs === 'fLaC' && !shaka.util.Platform.isSafari()) {
-      return 'flac';
+    if (codecs.toLowerCase() == 'flac') {
+      if (!shaka.util.Platform.isSafari()) {
+        return 'flac';
+      } else {
+        return 'fLaC';
+      }
     }
 
     // The same is true for 'Opus'.
-    if (codecs === 'Opus') {
-      return 'opus';
+    if (codecs.toLowerCase() === 'opus') {
+      if (!shaka.util.Platform.isSafari()) {
+        return 'opus';
+      } else {
+        if (shaka.util.MimeUtils.getContainerType(mimeType) == 'mp4') {
+          return 'Opus';
+        } else {
+          return 'opus';
+        }
+      }
     }
 
     return codecs;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.7.13",
+  "version": "4.7.15",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -39,7 +39,7 @@
     "jimp": "^0.16.1",
     "js-yaml": "^4.1.0",
     "jsdoc": "github:joeyparrish/jsdoc#2ca85bb6",
-    "karma": "^6.3.16",
+    "karma": "github:joeyparrish/karma#shaka-fixes",
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",
@@ -63,6 +63,11 @@
     "tippy.js": "^4.3.5",
     "which": "^2.0.2"
   },
+  "overrides": {
+    "karma": {
+      "ua-parser-js": "github:joeyparrish/ua-parser-js#preview"
+    }
+  },
   "shakaCustom": {
     "purposeOfDemoDeps": "These are the files from node_modules that need to be deployed with the demo app.",
     "demoDeps": [

package/support.html

@@ -38,8 +38,10 @@
 }
 
     </style>
+    <script src="dist/cast-boot.js"></script>
     <script src="dist/shaka-player.compiled.js"></script>
     <script>
+
       function whenLoaded(fn) {
         // IE 9 fires DOMContentLoaded, and enters the "interactive"
         // readyState, before document.body has been initialized, so wait

package/ui/audio_language_selection.js

@@ -46,6 +46,10 @@ shaka.ui.AudioLanguageSelection = class extends shaka.ui.SettingsMenu {
         });
 
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      this.onTracksChanged_();
+    });
+
     this.eventManager.listen(this.player, 'trackschanged', () => {
       this.onTracksChanged_();
     });

package/ui/range_element.js

@@ -70,11 +70,12 @@ shaka.ui.RangeElement = class extends shaka.ui.Element {
     this.container.appendChild(this.bar);
     this.parent.appendChild(this.container);
 
-    this.eventManager.listen(this.bar, 'mousedown', () => {
+    this.eventManager.listen(this.bar, 'mousedown', (e) => {
       if (this.controls.isOpaque()) {
         this.isChanging_ = true;
         this.onChangeStart();
       }
+      e.stopPropagation();
     });
 
     this.eventManager.listen(this.bar, 'touchstart', (e) => {
@@ -83,6 +84,7 @@ shaka.ui.RangeElement = class extends shaka.ui.Element {
         this.setBarValueForTouch_(e);
         this.onChangeStart();
       }
+      e.stopPropagation();
     });
 
     this.eventManager.listen(this.bar, 'input', () => {
@@ -94,6 +96,7 @@ shaka.ui.RangeElement = class extends shaka.ui.Element {
         this.setBarValueForTouch_(e);
         this.onChange();
       }
+      e.stopPropagation();
     });
 
     this.eventManager.listen(this.bar, 'touchend', (e) => {
@@ -102,6 +105,7 @@ shaka.ui.RangeElement = class extends shaka.ui.Element {
         this.setBarValueForTouch_(e);
         this.onChangeEnd();
       }
+      e.stopPropagation();
     });
 
     this.eventManager.listen(this.bar, 'touchcancel', (e) => {
@@ -110,13 +114,15 @@ shaka.ui.RangeElement = class extends shaka.ui.Element {
         this.setBarValueForTouch_(e);
         this.onChangeEnd();
       }
+      e.stopPropagation();
     });
 
-    this.eventManager.listen(this.bar, 'mouseup', () => {
+    this.eventManager.listen(this.bar, 'mouseup', (e) => {
       if (this.isChanging_) {
         this.isChanging_ = false;
         this.onChangeEnd();
       }
+      e.stopPropagation();
     });
 
     this.eventManager.listen(this.bar, 'blur', () => {

package/ui/resolution_selection.js

@@ -49,6 +49,10 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
         });
 
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      this.updateResolutionSelection_();
+    });
+
     this.eventManager.listen(this.player, 'variantchanged', () => {
       this.updateResolutionSelection_();
     });
@@ -96,6 +100,7 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
       } else {
         otherIdx = tracks.findIndex((t) => {
           return t.height == track.height &&
+              t.videoBandwidth == track.videoBandwidth &&
               t.frameRate == track.frameRate &&
               t.hdr == track.hdr &&
               t.videoLayout == track.videoLayout;

package/ui/text_selection.js

@@ -64,6 +64,10 @@ shaka.ui.TextSelection = class extends shaka.ui.SettingsMenu {
           this.updateTextLanguages_();
         });
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      this.onTracksChanged_();
+    });
+
     this.eventManager.listen(this.player, 'texttrackvisibility', () => {
       this.onCaptionStateChange_();
       this.updateTextLanguages_();