shaka-player 4.8.2 → 4.8.4

package/lib/transmuxer/ts_transmuxer.js

@@ -22,6 +22,7 @@ goog.require('shaka.util.Id3Utils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mp4Generator');
+goog.require('shaka.util.StreamUtils');
 goog.require('shaka.util.TsParser');
 goog.require('shaka.util.Uint8ArrayUtils');
 
@@ -149,7 +150,7 @@ shaka.transmuxer.TsTransmuxer = class {
       // MediaSource.isTypeSupported('audio/mp4; codecs="mp3"') -> true
       const codecs = shaka.util.MimeUtils.getCodecs(mimeType)
           .replace('mp4a.40.34', 'mp3').split(',')
-          .map(this.getCorrectVideoCodecs_).join(',');
+          .map(shaka.util.StreamUtils.getCorrectVideoCodecs).join(',');
       if (contentType == ContentType.AUDIO) {
         return `audio/mp4; codecs="${codecs}"`;
       }
@@ -159,29 +160,6 @@ shaka.transmuxer.TsTransmuxer = class {
   }
 
 
-  /**
-   * @param {string} codec
-   * @return {string}
-   * @private
-   */
-  getCorrectVideoCodecs_(codec) {
-    if (codec.includes('avc1')) {
-      // Convert avc1 codec string from RFC-4281 to RFC-6381 for
-      // MediaSource.isTypeSupported
-      // Example, convert avc1.66.30 to avc1.42001e (0x42 == 66 and 0x1e == 30)
-      const avcdata = codec.split('.');
-      if (avcdata.length == 3) {
-        let result = avcdata.shift() + '.';
-        result += parseInt(avcdata.shift(), 10).toString(16);
-        result +=
-            ('000' + parseInt(avcdata.shift(), 10).toString(16)).slice(-4);
-        return result;
-      }
-    }
-    return codec;
-  }
-
-
   /**
    * @override
    * @export

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 Android
+   * (i.e. Chromecast with GoogleTV).
+   *
+   * @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.
    *
@@ -611,19 +631,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;
@@ -684,8 +717,8 @@ shaka.util.Platform = class {
         /** @type {{screenWidth: number, screenHeight: number}} */(
             JSON.parse(window.PalmSystem.deviceInfo));
         // WebOS has always been able to do 1080p.  Assume a 1080p limit.
-        maxResolution.width = Math.max(1920, deviceInfo.screenWidth);
-        maxResolution.height = Math.max(1080, deviceInfo.screenHeight);
+        maxResolution.width = Math.max(1920, deviceInfo['screenWidth']);
+        maxResolution.height = Math.max(1080, deviceInfo['screenHeight']);
       } catch (e) {
         shaka.log.alwaysWarn('WebOS: Error detecting screen size, default ' +
             'screen size 1920x1080.');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.8.2",
+  "version": "4.8.4",
   "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": [