shaka-player 4.7.6 → 4.7.7

package/lib/media/drm_engine.js

@@ -542,6 +542,15 @@ shaka.media.DrmEngine = class {
     }
   }
 
+  /**
+   * Returns true if the manifest has init data.
+   *
+   * @return {boolean}
+   */
+  hasManifestInitData() {
+    return !!this.manifestInitData_;
+  }
+
   /**
    * Sets the server certificate based on the current DrmInfo.
    *

package/lib/offline/storage.js

@@ -400,6 +400,10 @@ shaka.offline.Storage = class {
           downloader, config, activeHandle.cell, manifest, drmEngine);
       this.ensureNotDestroyed_();
 
+      this.setManifestDrmFields_(manifest, manifestDB, drmEngine, config);
+      await activeHandle.cell.updateManifest(manifestId, manifestDB);
+      this.ensureNotDestroyed_();
+
       const offlineUri = shaka.offline.OfflineUri.manifest(
           activeHandle.path.mechanism, activeHandle.path.cell, manifestId);
 

package/lib/player.js

@@ -4691,6 +4691,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           shaka.util.Error.Code.CONTENT_NOT_LOADED);
     }
 
+    if (kind != 'subtitles' && kind != 'captions') {
+      shaka.log.alwaysWarn(
+          'Using a kind value different of `subtitles` or `captions` can ' +
+          'cause unwanted issues.');
+    }
+
     if (!mimeType) {
       mimeType = await this.getTextMimetype_(uri);
     }
@@ -6494,6 +6500,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const restrictedStatuses = shaka.Player.restrictedStatuses_;
     let tracksChanged = false;
 
+    goog.asserts.assert(this.drmEngine_, 'drmEngine should be non-null here.');
+
     // Only filter tracks for keys if we have some key statuses to look at.
     if (keyIds.length) {
       for (const variant of this.manifest_.variants) {
@@ -6509,8 +6517,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
             for (const keyId of stream.keyIds) {
               const keyStatus = keyStatusMap[isGlobalStatus ? '00' : keyId];
-              variant.allowedByKeySystem = variant.allowedByKeySystem &&
-                  !!keyStatus && !restrictedStatuses.includes(keyStatus);
+              if (keyStatus || this.drmEngine_.hasManifestInitData()) {
+                variant.allowedByKeySystem = variant.allowedByKeySystem &&
+                    !!keyStatus && !restrictedStatuses.includes(keyStatus);
+              }
             }
           }
 
@@ -6914,7 +6924,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.7.6' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.7.7' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -141,8 +141,15 @@ shaka.polyfill.MediaCapabilities = class {
       }
 
       if (audioConfig) {
-        const contentType = audioConfig.contentType;
-        const isSupported = Capabilities.isTypeSupported(contentType);
+        let isSupported;
+        if (shaka.util.Platform.isChromecast() &&
+            audioConfig.spatialRendering) {
+          const extendedType =
+              audioConfig.contentType + '; spatialRendering=true';
+          isSupported = Capabilities.isTypeSupported(extendedType);
+        } else {
+          isSupported = Capabilities.isTypeSupported(audioConfig.contentType);
+        }
         if (!isSupported) {
           return res;
         }

package/lib/util/ts_parser.js

@@ -446,10 +446,11 @@ shaka.util.TsParser = class {
    *
    * @param {shaka.extern.MPEG_PES} pes
    * @param {?shaka.extern.VideoNalu=} lastNalu
+   * @param {?number=} lastState
    * @return {!Array.<shaka.extern.VideoNalu>}
    * @export
    */
-  parseNalus(pes, lastNalu) {
+  parseNalus(pes, lastNalu, lastState) {
     const timescale = shaka.util.TsParser.Timescale;
     const time = pes.pts ? pes.pts / timescale : null;
     const data = pes.data;
@@ -465,7 +466,7 @@ shaka.util.TsParser = class {
     // precede each NALU. A start code is 2 or 3 0x00 bytes followed with a
     // 0x01 byte. e.g. 0x000001 or 0x00000001.
     // More info in: https://stackoverflow.com/questions/24884827/possible-locations-for-sequence-picture-parameter-sets-for-h-264-stream/24890903#24890903
-    let numZeros = 0;
+    let numZeros = lastState || 0;
 
     /** @type {!Array.<shaka.extern.VideoNalu>} */
     const nalus = [];
@@ -490,7 +491,7 @@ shaka.util.TsParser = class {
           const startCodeSize = numZeros > 3 ? 3 : numZeros;
           const lastByteToKeep = i - startCodeSize;
           // Optimization
-          if (lastByteToKeep != 0) {
+          if (lastState && lastByteToKeep != 0) {
             const prevData = data.subarray(0, lastByteToKeep);
             lastNalu.data = shaka.util.Uint8ArrayUtils.concat(
                 lastNalu.data, prevData);
@@ -572,6 +573,7 @@ shaka.util.TsParser = class {
       lastNalu.fullData = shaka.util.Uint8ArrayUtils.concat(
           lastNalu.fullData, data);
     }
+    lastState = Math.min(3, numZeros);
     return nalus;
   }
 
@@ -676,8 +678,9 @@ shaka.util.TsParser = class {
       }
       if (naluProcessing) {
         let lastNalu;
+        let lastState;
         for (const pes of this.videoPes_) {
-          pes.nalus = this.parseNalus(pes, lastNalu);
+          pes.nalus = this.parseNalus(pes, lastNalu, lastState);
           if (pes.nalus.length) {
             lastNalu = pes.nalus[pes.nalus.length - 1];
           }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.7.6",
+  "version": "4.7.7",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/ui/externs/ui.js

@@ -486,3 +486,27 @@ shaka.extern.IUISeekBar.Factory = class {
    */
   create(rootElement, controls) {}
 };
+
+/**
+ * @interface
+ * @exportDoc
+ */
+shaka.extern.IUIPlayButton = class {
+  /**
+   * @param {!HTMLElement} parent
+   * @param {!shaka.ui.Controls} controls
+   */
+  constructor(parent, controls) {
+    /**
+     * @protected {!HTMLButtonElement}
+     * @exportDoc
+     */
+    this.button;
+  }
+
+  /** @return {boolean} */
+  isPaused() {}
+
+  /** @return {boolean} */
+  isEnded() {}
+};

package/ui/play_button.js

@@ -16,6 +16,7 @@ goog.requireType('shaka.ui.Controls');
 
 /**
  * @extends {shaka.ui.Element}
+ * @implements {shaka.extern.IUIPlayButton}
  * @export
  */
 shaka.ui.PlayButton = class extends shaka.ui.Element {
@@ -95,6 +96,7 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
   /**
    * @return {boolean}
    * @protected
+   * @override
    */
   isPaused() {
     if (this.ad && this.ad.isLinear()) {
@@ -107,6 +109,7 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
   /**
    * @return {boolean}
    * @protected
+   * @override
    */
   isEnded() {
     if (this.ad && this.ad.isLinear()) {