shaka-player 4.8.3 → 4.8.5

package/lib/util/platform.js

@@ -197,6 +197,17 @@ shaka.util.Platform = class {
     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.
    *
@@ -459,6 +470,15 @@ 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.
    *
@@ -574,7 +594,8 @@ shaka.util.Platform = class {
       return false;
     }
     // Older chromecasts without GoogleTV seem to not support SMOOTH properly.
-    if (Platform.isChromecast() && !Platform.isAndroidCastDevice()) {
+    if (Platform.isChromecast() && !Platform.isAndroidCastDevice() &&
+        !Platform.isFuchsiaCastDevice()) {
       return false;
     }
     // See: https://chromium-review.googlesource.com/c/chromium/src/+/4577759
@@ -611,19 +632,32 @@ shaka.util.Platform = class {
 
     if (Platform.isChromecast()) {
       // In our tests, the original Chromecast seems to have trouble decoding
-      // above 1080p.  It would be a waste to select a higher res anyway, given
+      // above 1080p. It would be a waste to select a higher res anyway, given
       // that the device only outputs 1080p to begin with.
       // Chromecast has an extension to query the device/display's resolution.
-      if (window.cast && cast.__platform__ &&
-          cast.__platform__.canDisplayType && cast.__platform__.canDisplayType(
-          'video/mp4; codecs="avc1.640028"; width=3840; height=2160')) {
-        // The device and display can both do 4k.  Assume a 4k limit.
-        maxResolution.width = 3840;
-        maxResolution.height = 2160;
-      } else {
-        // Chromecast has always been able to do 1080p.  Assume a 1080p limit.
-        maxResolution.width = 1920;
-        maxResolution.height = 1080;
+      const hasCanDisplayType = window.cast && cast.__platform__ &&
+          cast.__platform__.canDisplayType;
+
+      // Some hub devices can only do 720p. Default to that.
+      maxResolution.width = 1280;
+      maxResolution.height = 720;
+
+      try {
+        if (hasCanDisplayType && await cast.__platform__.canDisplayType(
+            'video/mp4; codecs="avc1.640028"; width=3840; height=2160')) {
+          // The device and display can both do 4k. Assume a 4k limit.
+          maxResolution.width = 3840;
+          maxResolution.height = 2160;
+        } else if (hasCanDisplayType && await cast.__platform__.canDisplayType(
+            'video/mp4; codecs="avc1.640028"; width=1920; height=1080')) {
+          // Most Chromecasts can do 1080p.
+          maxResolution.width = 1920;
+          maxResolution.height = 1080;
+        }
+      } catch (error) {
+        // This shouldn't generally happen. Log the error.
+        shaka.log.alwaysError('Failed to check canDisplayType:', error);
+        // Now ignore the error and let the 720p default stand.
       }
     } else if (Platform.isTizen()) {
       maxResolution.width = 1920;

package/lib/util/stream_utils.js

@@ -429,7 +429,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);
@@ -465,7 +466,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);
 
@@ -754,17 +756,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,
@@ -815,10 +818,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({
@@ -975,9 +979,10 @@ 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
@@ -992,8 +997,16 @@ shaka.util.StreamUtils = class {
     }
 
     // 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.8.3",
+  "version": "4.8.5",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -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": [