shaka-player 4.2.9 → 4.2.10

package/docs/tutorials/a11y.md

@@ -56,10 +56,6 @@ this.eventManager.listen(this.button_, 'click', () => {
 });
 ```
 
-#### Continue the Tutorials
-
-Next, check out {@tutorial ad_monetization}.
-
 
 
 [Web Accessibility Standards]: https://www.w3.org/WAI/standards-guidelines/wcag/

package/docs/tutorials/ad_monetization.md

@@ -222,7 +222,3 @@ before instantiating the player.
 // myapp.CustomAdManager is a placeholder name for your ad manager implementation.
 shaka.Player.setAdManagerFactory(() => new myapp.CustomAdManager());
 ```
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial plugins}.

package/docs/tutorials/basic-usage.md

@@ -86,8 +86,3 @@ document.addEventListener('DOMContentLoaded', initApp);
 ```
 
 That's it!
-
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial debugging}.

package/docs/tutorials/config.md

@@ -142,8 +142,3 @@ player.configure({
 
 For more detail on individual configuration options, please see the API docs for
 {@link shaka.extern.PlayerConfiguration} and {@link shaka.Player#configure}.
-
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial network-and-buffering-config}.

package/docs/tutorials/debugging.md

@@ -187,8 +187,3 @@ To sum up, remember these points when debugging your application:
  - Use the debug version of Shaka Player for debugging and integration work
  - Refer to the docs for error codes
  - Increase the log level when you need more detail
-
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial config}.

package/docs/tutorials/drm-config.md

@@ -208,8 +208,3 @@ you should provide an empty string as robustness
 ##### Other key-systems
 
 Values for other key systems are not known to us at this time.
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial license-server-auth}.
-Or check out {@tutorial fairplay}.

package/docs/tutorials/fairplay.md

@@ -65,13 +65,13 @@ is used by the browser to generate the license request.  If you don't use the
 default content ID derivation, you need to specify a custom init data transform:
 
 ```js
-player.configure('drm.initDataTransform', (initData, initDataType) => {
+player.configure('drm.initDataTransform', (initData, initDataType, drmInfo) => {
   if (initDataType != 'skd')
     return initData;
   // 'initData' is a buffer containing an 'skd://' URL as a UTF-8 string.
   const skdUri = shaka.util.StringUtils.fromBytesAutoDetect(initData);
   const contentId = getMyContentId(skdUri);
-  const cert = player.drmInfo().serverCertificate;
+  const cert = drmInfo.serverCertificate;
   return shaka.util.FairPlayUtils.initDataTransform(initData, contentId, cert);
 });
 ```

package/docs/tutorials/license-server-auth.md

@@ -246,8 +246,3 @@ License request can now continue.
 
 If you need them, you can also create asynchronous response filters in the same
 way.
-
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial license-wrapping}.

package/docs/tutorials/license-wrapping.md

@@ -166,8 +166,3 @@ using a request filter:
 
 Load the page again, and the license response will be accepted by the Widevine
 CDM.  Open the JavaScript console to see what the server sent back.
-
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial ui}.

package/docs/tutorials/network-and-buffering-config.md

@@ -117,8 +117,3 @@ URLs in your manifests always use `https:`, or by having it not include the
 scheme (e.g., `//example.com/file.mp4`).
 
 [CORS]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
-
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial drm-config}.

package/docs/tutorials/ui-customization.md

@@ -265,8 +265,3 @@ PR contributions to [the gallery repo][] are welcome.
 [@lucksy]: https://github.com/lucksy
 [pre-packaged Shaka UI themes]: https://lucksy.github.io/shaka-player-themes/
 [the gallery repo]: https://github.com/lucksy/shaka-player-themes
-
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial a11y} to make your custom buttons accessible to screen readers.

package/docs/tutorials/ui.md

@@ -227,10 +227,3 @@ ui.configure({
   'castAndroidReceiverCompatible': true,
 });
 ```
-
-
-
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial ui-customization}.

package/docs/tutorials/welcome.md

@@ -106,8 +106,3 @@ To subscribe to new releases on GitHub, you can follow
 To receive infrequent announcements and surveys from us, you can join our
 [mailing list](https://groups.google.com/forum/#!forum/shaka-player-users).
 The list is very low volume, and can only be written to by us.
-
-
-#### Continue the Tutorials
-
-Next, check out {@tutorial basic-usage}.

package/externs/network_information.js

@@ -19,5 +19,10 @@ NetworkInformation.prototype.saveData;
  * @param {string} type
  * @param {Function} listener
  */
-NetworkInformation.prototype.addEventListener =
-    function(type, listener) {};
+NetworkInformation.prototype.addEventListener = function(type, listener) {};
+
+/**
+ * @param {string} type
+ * @param {Function} listener
+ */
+NetworkInformation.prototype.removeEventListener = function(type, listener) {};

package/externs/shaka/abr_manager.js

@@ -44,6 +44,12 @@ shaka.extern.AbrManager = class {
    */
   stop() {}
 
+  /**
+   * Request that this object release all internal references.
+   * @exportDoc
+   */
+  release() {}
+
   /**
    * Updates manager's variants collection.
    *

package/externs/shaka/net.js

@@ -112,6 +112,7 @@ shaka.extern.Request;
 /**
  * @typedef {{
  *   uri: string,
+ *   originalUri: string,
  *   data: BufferSource,
  *   status: (number|undefined),
  *   headers: !Object.<string, string>,

package/externs/shaka/player.js

@@ -627,9 +627,7 @@ shaka.extern.AdvancedDrmConfiguration;
  *   clearKeys: !Object.<string, string>,
  *   delayLicenseRequestUntilPlayed: boolean,
  *   advanced: Object.<string, shaka.extern.AdvancedDrmConfiguration>,
- *   initDataTransform:
- *       ((function(!Uint8Array, string, ?shaka.extern.DrmInfo):!Uint8Array)|
- *         undefined),
+ *   initDataTransform:(shaka.extern.InitDataTransform|undefined),
  *   logLicenseExchange: boolean,
  *   updateExpirationTime: number,
  *   preferredKeySystems: !Array.<string>,
@@ -655,10 +653,7 @@ shaka.extern.AdvancedDrmConfiguration;
  *   <i>Optional.</i> <br>
  *   A dictionary which maps key system IDs to advanced DRM configuration for
  *   those key systems.
- * @property
- *     {((function(!Uint8Array, string, ?shaka.extern.DrmInfo):!Uint8Array)|
- *        undefined)}
- *   initDataTransform
+ * @property {shaka.extern.InitDataTransform|undefined} initDataTransform
  *   <i>Optional.</i><br>
  *   If given, this function is called with the init data from the
  *   manifest/media and should return the (possibly transformed) init data to
@@ -687,6 +682,17 @@ shaka.extern.AdvancedDrmConfiguration;
  */
 shaka.extern.DrmConfiguration;
 
+/**
+ * @typedef {function(!Uint8Array, string, ?shaka.extern.DrmInfo):!Uint8Array}
+ *
+ * @description
+ * A callback function to handle custom content ID signaling for FairPlay
+ * content.
+ *
+ * @exportDoc
+ */
+shaka.extern.InitDataTransform;
+
 
 /**
  * @typedef {{

package/lib/abr/simple_abr_manager.js

@@ -6,6 +6,7 @@
 
 goog.provide('shaka.abr.SimpleAbrManager');
 
+goog.require('shaka.util.IReleasable');
 goog.require('goog.asserts');
 goog.require('shaka.abr.EwmaBandwidthEstimator');
 goog.require('shaka.log');
@@ -32,6 +33,7 @@ goog.require('shaka.util.Timer');
  * </p>
  *
  * @implements {shaka.extern.AbrManager}
+ * @implements {shaka.util.IReleasable}
  * @export
  */
 shaka.abr.SimpleAbrManager = class {
@@ -50,8 +52,8 @@ shaka.abr.SimpleAbrManager = class {
     // retrieving information about a user's network connection. We listen
     // to the change event to be able to make quick changes in case the type
     // of connectivity changes.
-    if (navigator.connection) {
-      navigator.connection.addEventListener('change', () => {
+    if (navigator.connection && navigator.connection.addEventListener) {
+      this.onNetworkInformationChange_ = () => {
         if (this.config_.useNetworkInformation && this.enabled_) {
           this.bandwidthEstimator_ = new shaka.abr.EwmaBandwidthEstimator();
           if (this.config_) {
@@ -62,7 +64,10 @@ shaka.abr.SimpleAbrManager = class {
             this.switch_(chosenVariant);
           }
         }
-      });
+      };
+
+      navigator.connection.addEventListener(
+          'change', this.onNetworkInformationChange_);
     }
 
     /**
@@ -93,6 +98,9 @@ shaka.abr.SimpleAbrManager = class {
     /** @private {ResizeObserver} */
     this.resizeObserver_ = null;
 
+    /** @private {?function():void} */
+    this.onNetworkInformationChange_ = null;
+
     /** @private {shaka.util.Timer} */
     this.resizeObserverTimer_ = new shaka.util.Timer(() => {
       if (this.config_.restrictToElementSize) {
@@ -128,6 +136,22 @@ shaka.abr.SimpleAbrManager = class {
     // can start using bandwidth estimates right away after init() is called.
   }
 
+  /**
+   * @override
+   * @export
+   */
+  release() {
+    // stop() should already have been called for unload
+
+    if (navigator.connection && navigator.connection.removeEventListener) {
+      navigator.connection.removeEventListener(
+          'change', this.onNetworkInformationChange_);
+      this.onNetworkInformationChange_ = null;
+    }
+
+    this.resizeObserverTimer_ = null;
+  }
+
 
   /**
    * @override

package/lib/ads/client_side_ad_manager.js

@@ -219,9 +219,9 @@ shaka.ads.ClientSideAdManager = class {
       // seen the ads actually play until requestAds() is called.
       // Note: We listen for a play event to avoid autoplay issues that might
       // crash IMA.
-      this.video_.addEventListener('play', () => {
+      this.eventManager_.listenOnce(this.video_, 'play', () => {
         this.imaAdsManager_.start();
-      }, {once: true});
+      });
     } catch (adError) {
       // If there was a problem with the VAST response,
       // we we won't be getting an ad. Hide ad UI if we showed it already
@@ -427,7 +427,10 @@ shaka.ads.ClientSideAdManager = class {
     if (this.ad_.isLinear()) {
       this.adContainer_.setAttribute('ad-active', 'true');
       this.video_.pause();
-      this.ad_.setVolume(this.video_.muted ? 0 : this.video_.volume);
+      this.ad_.setVolume(this.video_.volume);
+      if (this.video_.muted) {
+        this.ad_.setMuted(true);
+      }
     }
   }
 

package/lib/dash/dash_parser.js

@@ -1279,55 +1279,56 @@ shaka.dash.DashParser = class {
         context.period.id + ',' + context.representation.id : '';
 
     /** @type {shaka.extern.Stream} */
-    const stream = {
-      id: this.globalId_++,
-      originalId: context.representation.id,
-      createSegmentIndex: async () => {
-        // If we have a stream with the same context id stored in the map
-        // that has no segmentIndex, we should set the segmentIndex for it.
-        const storedInMap = contextId && context.dynamic &&
-              this.streamMap_[contextId];
-
-        const currentStream = storedInMap ? this.streamMap_[contextId] : stream;
-        if (!currentStream.segmentIndex) {
-          currentStream.segmentIndex = await streamInfo.generateSegmentIndex();
-        }
-      },
+    let stream;
 
-      closeSegmentIndex: () => {
-        if (stream.segmentIndex) {
-          stream.segmentIndex.release();
-          stream.segmentIndex = null;
-        }
-      },
-      segmentIndex: null,
-      mimeType: context.representation.mimeType,
-      codecs: context.representation.codecs,
-      frameRate: context.representation.frameRate,
-      pixelAspectRatio: context.representation.pixelAspectRatio,
-      bandwidth: context.bandwidth,
-      width: context.representation.width,
-      height: context.representation.height,
-      kind,
-      encrypted: contentProtection.drmInfos.length > 0,
-      drmInfos: contentProtection.drmInfos,
-      keyIds,
-      language,
-      label,
-      type: context.adaptationSet.contentType,
-      primary: isPrimary,
-      trickModeVideo: null,
-      emsgSchemeIdUris:
-          context.representation.emsgSchemeIdUris,
-      roles,
-      forced: forced,
-      channelsCount: context.representation.numChannels,
-      audioSamplingRate: context.representation.audioSamplingRate,
-      spatialAudio: spatialAudio,
-      closedCaptions,
-      hdr,
-      tilesLayout,
-      matchedStreams: [],
+    if (contextId && this.streamMap_[contextId]) {
+      stream = this.streamMap_[contextId];
+    } else {
+      stream = {
+        id: this.globalId_++,
+        originalId: context.representation.id,
+        createSegmentIndex: () => Promise.resolve(),
+        closeSegmentIndex: () => {
+          if (stream.segmentIndex) {
+            stream.segmentIndex.release();
+            stream.segmentIndex = null;
+          }
+        },
+        segmentIndex: null,
+        mimeType: context.representation.mimeType,
+        codecs: context.representation.codecs,
+        frameRate: context.representation.frameRate,
+        pixelAspectRatio: context.representation.pixelAspectRatio,
+        bandwidth: context.bandwidth,
+        width: context.representation.width,
+        height: context.representation.height,
+        kind,
+        encrypted: contentProtection.drmInfos.length > 0,
+        drmInfos: contentProtection.drmInfos,
+        keyIds,
+        language,
+        label,
+        type: context.adaptationSet.contentType,
+        primary: isPrimary,
+        trickModeVideo: null,
+        emsgSchemeIdUris:
+            context.representation.emsgSchemeIdUris,
+        roles,
+        forced,
+        channelsCount: context.representation.numChannels,
+        audioSamplingRate: context.representation.audioSamplingRate,
+        spatialAudio,
+        closedCaptions,
+        hdr,
+        tilesLayout,
+        matchedStreams: [],
+      };
+    }
+
+    stream.createSegmentIndex = async () => {
+      if (!stream.segmentIndex) {
+        stream.segmentIndex = await streamInfo.generateSegmentIndex();
+      }
     };
 
     if (contextId && context.dynamic && !this.streamMap_[contextId]) {

package/lib/debug/log.js

@@ -134,23 +134,19 @@ shaka.log.MAX_LOG_LEVEL = 3;
 shaka.log.oneTimeWarningIssued_ = new Set();
 
 
-// IE8 has no console unless it is opened in advance.
-// IE9 console methods are not Functions and have no bind.
-if (window.console && window.console.log.bind) {
+if (window.console) {
   /** @private {!Object.<shaka.log.Level, function(...*)>} */
   shaka.log.logMap_ = {
-    /* eslint-disable no-restricted-syntax */
-    [shaka.log.Level.ERROR]: console.error.bind(console),
-    [shaka.log.Level.WARNING]: console.warn.bind(console),
-    [shaka.log.Level.INFO]: console.info.bind(console),
-    [shaka.log.Level.DEBUG]: console.log.bind(console),
-    [shaka.log.Level.V1]: console.debug.bind(console),
-    [shaka.log.Level.V2]: console.debug.bind(console),
-    /* eslint-enable no-restricted-syntax */
+    [shaka.log.Level.ERROR]: (...args) => console.error(...args),
+    [shaka.log.Level.WARNING]: (...args) => console.warn(...args),
+    [shaka.log.Level.INFO]: (...args) => console.info(...args),
+    [shaka.log.Level.DEBUG]: (...args) => console.log(...args),
+    [shaka.log.Level.V1]: (...args) => console.debug(...args),
+    [shaka.log.Level.V2]: (...args) => console.debug(...args),
   };
 
-  shaka.log.alwaysWarn = shaka.log.logMap_[shaka.log.Level.WARNING];
-  shaka.log.alwaysError = shaka.log.logMap_[shaka.log.Level.ERROR];
+  shaka.log.alwaysWarn = (...args) => console.warn(...args);
+  shaka.log.alwaysError = (...args) => console.error(...args);
 
   if (goog.DEBUG) {
     // Since we don't want to export shaka.log in production builds, we don't

package/lib/media/media_source_engine.js

@@ -192,6 +192,9 @@ shaka.media.MediaSourceEngine = class {
       'audio/mp4; codecs="ec-3"',
       'audio/mp4; codecs="opus"',
       'audio/mp4; codecs="flac"',
+      'audio/mp4; codecs="dtsc"', // DTS Digital Surround
+      'audio/mp4; codecs="dtse"', // DTS Express
+      'audio/mp4; codecs="dtsx"', // DTS:X
       // WebM types
       'video/webm; codecs="vp8"',
       'video/webm; codecs="vp9"',
@@ -556,7 +559,8 @@ shaka.media.MediaSourceEngine = class {
       // For HLS CEA-608/708 CLOSED-CAPTIONS, text data is embedded in
       // the video stream, so textEngine may not have been initialized.
       if (!this.textEngine_) {
-        this.reinitText('text/vtt', this.sequenceMode_);
+        this.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,
+            this.sequenceMode_);
       }
 
       if (transmuxedData.metadata) {
@@ -584,7 +588,8 @@ shaka.media.MediaSourceEngine = class {
       data = transmuxedData.data;
     } else if (hasClosedCaptions) {
       if (!this.textEngine_) {
-        this.reinitText('text/vtt', this.sequenceMode_);
+        this.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,
+            this.sequenceMode_);
       }
       // If it is the init segment for closed captions, initialize the closed
       // caption parser.
@@ -910,8 +915,10 @@ shaka.media.MediaSourceEngine = class {
   async endOfStream(reason) {
     await this.enqueueBlockingOperation_(() => {
       // If endOfStream() has already been called on the media source,
-      // don't call it again.
-      if (this.ended()) {
+      // don't call it again. Also do not call if readyState is
+      // 'closed' (not attached to video element) since it is not a
+      // valid operation.
+      if (this.ended() || this.mediaSource_.readyState === 'closed') {
         return;
       }
       // Tizen won't let us pass undefined, but it will let us omit the

package/lib/media/segment_index.js

@@ -363,6 +363,8 @@ shaka.media.SegmentIndex = class {
             lastReference.status,
             lastReference.hlsAes128Key,
         );
+    this.references[this.references.length - 1].discontinuitySequence =
+        lastReference.discontinuitySequence;
   }
 
 

package/lib/media/streaming_engine.js

@@ -77,6 +77,9 @@ shaka.media.StreamingEngine = class {
     /** @private {?shaka.extern.Stream} */
     this.currentTextStream_ = null;
 
+    /** @private {number} */
+    this.textStreamSequenceId_ = 0;
+
     /**
      * Maps a content type, e.g., 'audio', 'video', or 'text', to a MediaState.
      *
@@ -220,6 +223,8 @@ shaka.media.StreamingEngine = class {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     goog.asserts.assert(!this.mediaStates_.has(ContentType.TEXT),
         'Should not call loadNewTextStream_ while streaming text!');
+    this.textStreamSequenceId_++;
+    const currentSequenceId = this.textStreamSequenceId_;
 
     try {
       // Clear MediaSource's buffered text, so that the new text stream will
@@ -242,7 +247,7 @@ shaka.media.StreamingEngine = class {
     const streamText =
         textDisplayer.isTextVisible() || this.config_.alwaysStreamText;
 
-    if (streamText) {
+    if (streamText && (this.textStreamSequenceId_ == currentSequenceId)) {
       const state = this.createMediaState_(stream);
       this.mediaStates_.set(ContentType.TEXT, state);
       this.scheduleUpdate_(state, 0);
@@ -1559,10 +1564,10 @@ shaka.media.StreamingEngine = class {
           'waiting for another stream to recover...');
     }
 
-    // QuotaExceededError gets thrown if evication didn't help to make room
+    // QuotaExceededError gets thrown if eviction didn't help to make room
     // for a segment. We want to wait for a while (4 seconds is just an
     // arbitrary number) before updating to give the playhead a chance to
-    // advance, so we don't immidiately throw again.
+    // advance, so we don't immediately throw again.
     this.scheduleUpdate_(mediaState, 4);
   }