shaka-player 4.12.8 → 4.13.0

package/lib/util/multi_map.js

@@ -14,7 +14,7 @@ goog.provide('shaka.util.MultiMap');
 shaka.util.MultiMap = class {
   /** */
   constructor() {
-    /** @private {!Object.<string, !Array.<T>>} */
+    /** @private {!Object<string, !Array<T>>} */
     this.map_ = {};
   }
 
@@ -37,7 +37,7 @@ shaka.util.MultiMap = class {
   /**
    * Get a list of values by key.
    * @param {string} key
-   * @return {Array.<T>} or null if no such key exists.
+   * @return {Array<T>} or null if no such key exists.
    */
   get(key) {
     const list = this.map_[key];
@@ -49,7 +49,7 @@ shaka.util.MultiMap = class {
 
   /**
    * Get a list of all values.
-   * @return {!Array.<T>}
+   * @return {!Array<T>}
    */
   getAll() {
     const list = [];
@@ -87,7 +87,7 @@ shaka.util.MultiMap = class {
 
 
   /**
-   * @param {function(string, !Array.<T>)} callback
+   * @param {function(string, !Array<T>)} callback
    */
   forEach(callback) {
     for (const key in this.map_) {
@@ -105,7 +105,7 @@ shaka.util.MultiMap = class {
 
   /**
    * Get a list of all the keys.
-   * @return {!Array.<string>}
+   * @return {!Array<string>}
    */
   keys() {
     return Object.keys(this.map_);

package/lib/util/mutex.js

@@ -18,7 +18,7 @@ shaka.util.Mutex = class {
     /** @private {?string} */
     this.acquiredIdentifier = null;
 
-    /** @private {!Array.<function()>} */
+    /** @private {!Array<function()>} */
     this.unlockQueue = [];
   }
 

package/lib/util/networking.js

@@ -22,7 +22,7 @@ shaka.util.Networking = class {
    * will set the byte range. A non-zero start must be provided for |end| to
    * be used.
    *
-   * @param {!Array.<string>} uris
+   * @param {!Array<string>} uris
    * @param {?number} start
    * @param {?number} end
    * @param {shaka.extern.RetryParameters} retryParameters

package/lib/util/object_utils.js

@@ -22,7 +22,11 @@ shaka.util.ObjectUtils = class {
     const seenObjects = new WeakSet();
     // This recursively clones the value |val|, using the captured variable
     // |seenObjects| to track the objects we have already cloned.
-    /** @suppress {strictMissingProperties} */
+    /**
+     * @param {*} val
+     * @return {*}
+     * @suppress {strictMissingProperties}
+     */
     const clone = (val) => {
       switch (typeof val) {
         case 'undefined':

package/lib/util/operation_manager.js

@@ -18,7 +18,7 @@ goog.require('shaka.util.IDestroyable');
 shaka.util.OperationManager = class {
   /** */
   constructor() {
-    /** @private {!Array.<!shaka.extern.IAbortableOperation>} */
+    /** @private {!Array<!shaka.extern.IAbortableOperation>} */
     this.operations_ = [];
   }
 

package/lib/util/periods.js

@@ -7,10 +7,10 @@
 goog.provide('shaka.util.PeriodCombiner');
 
 goog.require('goog.asserts');
+goog.require('shaka.drm.DrmUtils');
 goog.require('shaka.log');
 goog.require('shaka.media.MetaSegmentIndex');
 goog.require('shaka.media.SegmentIndex');
-goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.IReleasable');
 goog.require('shaka.util.LanguageUtils');
@@ -27,19 +27,19 @@ goog.require('shaka.util.MimeUtils');
 shaka.util.PeriodCombiner = class {
   /** */
   constructor() {
-    /** @private {!Array.<shaka.extern.Variant>} */
+    /** @private {!Array<shaka.extern.Variant>} */
     this.variants_ = [];
 
-    /** @private {!Array.<shaka.extern.Stream>} */
+    /** @private {!Array<shaka.extern.Stream>} */
     this.audioStreams_ = [];
 
-    /** @private {!Array.<shaka.extern.Stream>} */
+    /** @private {!Array<shaka.extern.Stream>} */
     this.videoStreams_ = [];
 
-    /** @private {!Array.<shaka.extern.Stream>} */
+    /** @private {!Array<shaka.extern.Stream>} */
     this.textStreams_ = [];
 
-    /** @private {!Array.<shaka.extern.Stream>} */
+    /** @private {!Array<shaka.extern.Stream>} */
     this.imageStreams_ = [];
 
     /** @private {boolean} */
@@ -53,7 +53,7 @@ shaka.util.PeriodCombiner = class {
      * This helps us identify the periods which have been added when a live
      * stream is updated.
      *
-     * @private {!Set.<string>}
+     * @private {!Set<string>}
      */
     this.usedPeriodIds_ = new Set();
   }
@@ -81,7 +81,7 @@ shaka.util.PeriodCombiner = class {
   }
 
   /**
-   * @return {!Array.<shaka.extern.Variant>}
+   * @return {!Array<shaka.extern.Variant>}
    *
    * @export
    */
@@ -90,10 +90,10 @@ shaka.util.PeriodCombiner = class {
   }
 
   /**
-   * @return {!Array.<shaka.extern.Stream>}
+   * @return {!Array<shaka.extern.Stream>}
    *
    * @export
-  */
+   */
   getTextStreams() {
     // Return a copy of the array because makeTextStreamsForClosedCaptions
     // may make changes to the contents of the array. Those changes should not
@@ -102,7 +102,7 @@ shaka.util.PeriodCombiner = class {
   }
 
   /**
-   * @return {!Array.<shaka.extern.Stream>}
+   * @return {!Array<shaka.extern.Stream>}
    *
    * @export
    */
@@ -217,7 +217,7 @@ shaka.util.PeriodCombiner = class {
   }
 
   /**
-   * @param {!Array.<shaka.extern.Period>} periods
+   * @param {!Array<shaka.extern.Period>} periods
    * @param {boolean} isDynamic
    * @param {boolean=} isPatchUpdate
    * @return {!Promise}
@@ -335,7 +335,7 @@ shaka.util.PeriodCombiner = class {
     } else {
       for (const audio of this.audioStreams_) {
         for (const video of this.videoStreams_) {
-          const commonDrmInfos = shaka.util.DrmUtils.getCommonDrmInfos(
+          const commonDrmInfos = shaka.drm.DrmUtils.getCommonDrmInfos(
               audio.drmInfos, video.drmInfos);
 
           if (audio.drmInfos.length && video.drmInfos.length &&
@@ -375,8 +375,8 @@ shaka.util.PeriodCombiner = class {
    * Unlike the DASH case, this does not need to maintain any state for manifest
    * updates.
    *
-   * @param {!Array.<!Array.<shaka.extern.StreamDB>>} streamDbsPerPeriod
-   * @return {!Promise.<!Array.<shaka.extern.StreamDB>>}
+   * @param {!Array<!Array<shaka.extern.StreamDB>>} streamDbsPerPeriod
+   * @return {!Promise<!Array<shaka.extern.StreamDB>>}
    */
   static async combineDbStreams(streamDbsPerPeriod) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
@@ -490,7 +490,7 @@ shaka.util.PeriodCombiner = class {
    * Combine input Streams per period into flat output Streams.
    * Templatized to handle both DASH Streams and offline StreamDBs.
    *
-   * @param {!Array.<T>} outputStreams A list of existing output streams, to
+   * @param {!Array<T>} outputStreams A list of existing output streams, to
    *   facilitate updates for live DASH content.  Will be modified and returned.
    * @param {!Array<!Map<string, T>>} streamsPerPeriod A list of maps of Streams
    *   from each period.
@@ -501,7 +501,7 @@ shaka.util.PeriodCombiner = class {
    *   of the first.
    * @param {number} periodsMissing The number of periods missing
    *
-   * @return {!Promise.<!Array.<T>>} The same array passed to outputStreams,
+   * @return {!Promise<!Array<T>>} The same array passed to outputStreams,
    *   modified to include any newly-created streams.
    *
    * @template T
@@ -598,11 +598,11 @@ shaka.util.PeriodCombiner = class {
    *   represents the first new period that hasn't been processed yet.
    * @param {function(T, T)} concat Concatenate the second stream onto the end
    *   of the first.
-   * @param {!Array.<!Set.<T>>} unusedStreamsPerPeriod An array of sets of
+   * @param {!Array<!Set<T>>} unusedStreamsPerPeriod An array of sets of
    *   unused streams from each period.
    * @param {number} periodsMissing How many periods are missing in this update.
    *
-   * @return {!Promise.<boolean>}
+   * @return {!Promise<boolean>}
    *
    * @template T
    * Should only be called with a Stream type in practice, but has call sites
@@ -691,7 +691,7 @@ shaka.util.PeriodCombiner = class {
    * @param {function(T):T} clone Make a clone of an input stream.
    * @param {function(T, T)} concat Concatenate the second stream onto the end
    *   of the first.
-   * @param {!Array.<!Set.<T>>} unusedStreamsPerPeriod An array of sets of
+   * @param {!Array<!Set<T>>} unusedStreamsPerPeriod An array of sets of
    *   unused streams from each period.
    *
    * @return {?T} A newly-created output Stream, or null if matches
@@ -748,7 +748,7 @@ shaka.util.PeriodCombiner = class {
    *   represents the first new period that hasn't been processed yet.
    * @param {function(T, T)} concat Concatenate the second stream onto the end
    *   of the first.
-   * @param {!Array.<!Set.<T>>} unusedStreamsPerPeriod An array of sets of
+   * @param {!Array<!Set<T>>} unusedStreamsPerPeriod An array of sets of
    *   unused streams from each period.
    * @param {number} periodsMissing How many periods are missing in this update
    *
@@ -914,7 +914,7 @@ shaka.util.PeriodCombiner = class {
       }
     }
 
-    const commonDrmInfos = shaka.util.DrmUtils.getCommonDrmInfos(
+    const commonDrmInfos = shaka.drm.DrmUtils.getCommonDrmInfos(
         output.drmInfos, input.drmInfos);
     if (input.drmInfos.length && output.drmInfos.length &&
         !commonDrmInfos.length) {
@@ -1143,7 +1143,7 @@ shaka.util.PeriodCombiner = class {
 
   /**
    * @param {boolean} useOnce if true, stream will be used only once in period
-   *   flattening algoritnm.
+   *   flattening algorithm.
    * @export
    */
   setUseStreamOnce(useOnce) {
@@ -1176,7 +1176,7 @@ shaka.util.PeriodCombiner = class {
     if (outputStream.drmInfos) {
       // Check for compatible DRM systems.  Note that clear streams are
       // implicitly compatible with any DRM and with each other.
-      if (!shaka.util.DrmUtils.areDrmCompatible(outputStream.drmInfos,
+      if (!shaka.drm.DrmUtils.areDrmCompatible(outputStream.drmInfos,
           candidate.drmInfos)) {
         return false;
       }

package/lib/util/platform.js

@@ -6,8 +6,8 @@
 
 goog.provide('shaka.util.Platform');
 
+goog.require('shaka.drm.DrmUtils');
 goog.require('shaka.log');
-goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.Timer');
 
 
@@ -331,6 +331,7 @@ shaka.util.Platform = class {
 
   /**
    * Check if the current platform is Playstation 4.
+   * @return {boolean}
    */
   static isPS4() {
     return shaka.util.Platform.userAgentContains_('PlayStation 4');
@@ -338,6 +339,7 @@ shaka.util.Platform = class {
 
   /**
    * Check if the current platform is Hisense.
+   * @return {boolean}
    */
   static isHisense() {
     return shaka.util.Platform.userAgentContains_('Hisense') ||
@@ -346,6 +348,7 @@ shaka.util.Platform = class {
 
   /**
    * Check if the current platform is Virgin Media device.
+   * @return {boolean}
    */
   static isVirginMedia() {
     return shaka.util.Platform.userAgentContains_('VirginMedia');
@@ -353,6 +356,7 @@ shaka.util.Platform = class {
 
   /**
    * Check if the current platform is Orange.
+   * @return {boolean}
    */
   static isOrange() {
     return shaka.util.Platform.userAgentContains_('SOPOpenBrowser');
@@ -360,6 +364,7 @@ shaka.util.Platform = class {
 
   /**
    * Check if the current platform is SkyQ STB.
+   * @return {boolean}
    */
   static isSkyQ() {
     return shaka.util.Platform.userAgentContains_('Sky_STB');
@@ -631,7 +636,7 @@ shaka.util.Platform = class {
    */
   static requiresEncryptionInfoInAllInitSegments(keySystem) {
     const Platform = shaka.util.Platform;
-    const isPlayReady = shaka.util.DrmUtils.isPlayReadyKeySystem(keySystem);
+    const isPlayReady = shaka.drm.DrmUtils.isPlayReadyKeySystem(keySystem);
     return Platform.isTizen() || Platform.isXboxOne() || Platform.isOrange() ||
       (Platform.isEdge() && Platform.isWindows() && isPlayReady);
   }
@@ -716,7 +721,7 @@ shaka.util.Platform = class {
   /**
    * Detect the maximum resolution that the platform's hardware can handle.
    *
-   * @return {!Promise.<shaka.extern.Resolution>}
+   * @return {!Promise<shaka.extern.Resolution>}
    */
   static async detectMaxHardwareResolution() {
     const Platform = shaka.util.Platform;
@@ -795,7 +800,6 @@ shaka.util.Platform = class {
         maxResolution.height = 1080;
       }
     } else if (Platform.isHisense()) {
-      // eslint-disable-next-line new-cap
       if (window.Hisense_Get4KSupportState &&
           // eslint-disable-next-line new-cap
           window.Hisense_Get4KSupportState()) {

package/lib/util/player_configuration.js

@@ -12,6 +12,7 @@ goog.require('shaka.config.AutoShowText');
 goog.require('shaka.config.CodecSwitchingStrategy');
 goog.require('shaka.log');
 goog.require('shaka.media.Capabilities');
+goog.require('shaka.media.PreferenceBasedCriteria');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ConfigUtils');
 goog.require('shaka.util.FairPlayUtils');
@@ -94,6 +95,8 @@ shaka.util.PlayerConfiguration = class {
       parseInbandPsshEnabled: shaka.util.Platform.isXboxOne(),
       minHdcpVersion: '',
       ignoreDuplicateInitData: !shaka.util.Platform.isTizen2(),
+      defaultAudioRobustnessForWidevine: 'SW_SECURE_CRYPTO',
+      defaultVideoRobustnessForWidevine: 'SW_SECURE_DECODE',
     };
 
     // The Xbox One and PS4 only support the Playready DRM, so they should
@@ -147,6 +150,8 @@ shaka.util.PlayerConfiguration = class {
             'com.microsoft.playready',
           'urn:uuid:94ce86fb-07ff-4f43-adb8-93d2fa968ca2':
             'com.apple.fps',
+          'urn:uuid:3d5e6d35-9b9a-41e8-b843-dd3c6e72c42c':
+            'com.huawei.wiseplay',
         },
         manifestPreprocessor:
             shaka.util.PlayerConfiguration.defaultManifestPreprocessor,
@@ -157,6 +162,7 @@ shaka.util.PlayerConfiguration = class {
         useStreamOnceInPeriodFlattening: false,
         updatePeriod: -1,
         enableFastSwitching: true,
+        ignoreSupplementalCodecs: false,
       },
       hls: {
         ignoreTextStreamFailures: false,
@@ -174,6 +180,7 @@ shaka.util.PlayerConfiguration = class {
         disableClosedCaptionsDetection: false,
         updatePeriod: -1,
         allowLowLatencyByteRangeOptimization: true,
+        ignoreSupplementalCodecs: false,
       },
       mss: {
         manifestPreprocessor:
@@ -201,9 +208,7 @@ shaka.util.PlayerConfiguration = class {
             [error],
             undefined);
       },
-      // When low latency streaming is enabled, rebufferingGoal will default to
-      // 0.01 if not specified.
-      rebufferingGoal: 2,
+      rebufferingGoal: 0,
       bufferingGoal: 10,
       bufferBehind: 30,
       evictionGoal: 1,
@@ -229,10 +234,10 @@ shaka.util.PlayerConfiguration = class {
       // will default to 0 if not specified.
       inaccurateManifestTolerance: 2,
       lowLatencyMode: false,
-      autoLowLatencyMode: false,
       forceHTTP: false,
       forceHTTPS: false,
       minBytesForProgressEvents: minBytes,
+      preferNativeDash: false,
       preferNativeHls: false,
       updateIntervalSeconds: 1,
       observeQualityChanges: false,
@@ -266,7 +271,6 @@ shaka.util.PlayerConfiguration = class {
       vodDynamicPlaybackRate: false,
       vodDynamicPlaybackRateLowBufferRate: 0.95,
       vodDynamicPlaybackRateBufferRatio: 0.5,
-      infiniteLiveStreamDuration: false,
       preloadNextUrlWindow: 30,
       loadTimeout: 30,
       clearDecodingCache: shaka.util.Platform.isPS4() ||
@@ -276,11 +280,6 @@ shaka.util.PlayerConfiguration = class {
         shaka.util.Platform.isTizen(),
     };
 
-    const safariVersion = shaka.util.Platform.safariVersion();
-    if (safariVersion && safariVersion >= 17) {
-      streaming.infiniteLiveStreamDuration = true;
-    }
-
     // WebOS, Tizen, Chromecast and Hisense have long hardware pipelines
     // that respond slowly to seeking.
     // Therefore we should not seek when we detect a stall
@@ -377,6 +376,7 @@ shaka.util.PlayerConfiguration = class {
       rtpSafetyFactor: 5,
       useHeaders: false,
       includeKeys: [],
+      version: 1,
     };
 
     const cmsd = {
@@ -440,6 +440,8 @@ shaka.util.PlayerConfiguration = class {
       mediaSource: mediaSource,
       offline: offline,
       abrFactory: () => new shaka.abr.SimpleAbrManager(),
+      adaptationSetCriteriaFactory:
+          (...args) => new shaka.media.PreferenceBasedCriteria(...args),
       abr: abr,
       autoShowText: AutoShowText.IF_SUBTITLES_MAY_BE_NEEDED,
       preferredAudioLanguage: '',
@@ -495,6 +497,37 @@ shaka.util.PlayerConfiguration = class {
     return config;
   }
 
+  /**
+   * @return {!Object}
+   * @export
+   */
+  static createDefaultForLL() {
+    return {
+      streaming: {
+        inaccurateManifestTolerance: 0,
+        segmentPrefetchLimit: 2,
+        updateIntervalSeconds: 0.1,
+        maxDisabledTime: 1,
+        retryParameters: {
+          baseDelay: 100,
+        },
+      },
+      manifest: {
+        dash: {
+          autoCorrectDrift: false,
+        },
+        retryParameters: {
+          baseDelay: 100,
+        },
+      },
+      drm: {
+        retryParameters: {
+          baseDelay: 100,
+        },
+      },
+    };
+  }
+
   /**
    * Merges the given configuration changes into the given destination.  This
    * uses the default Player configurations as the template.
@@ -513,8 +546,8 @@ shaka.util.PlayerConfiguration = class {
       '.drm.advanced': {
         distinctiveIdentifierRequired: false,
         persistentStateRequired: false,
-        videoRobustness: '',
-        audioRobustness: '',
+        videoRobustness: [],
+        audioRobustness: [],
         sessionType: '',
         serverCertificate: new Uint8Array(0),
         serverCertificateUri: '',
@@ -529,10 +562,10 @@ shaka.util.PlayerConfiguration = class {
   }
 
   /**
-   * @param {!Array.<shaka.extern.Track>} tracks
+   * @param {!Array<shaka.extern.Track>} tracks
    * @param {string} preferredAudioLanguage
    * @param {string} preferredVideoHdrLevel
-   * @return {!Array.<shaka.extern.Track>}
+   * @return {!Array<shaka.extern.Track>}
    */
   static defaultTrackSelect(
       tracks, preferredAudioLanguage, preferredVideoHdrLevel) {
@@ -555,7 +588,7 @@ shaka.util.PlayerConfiguration = class {
       }
     }
 
-    /** @type {!Array.<shaka.extern.Track>} */
+    /** @type {!Array<shaka.extern.Track>} */
     const allVariants = tracks.filter((track) => {
       if (track.type != 'variant') {
         return false;
@@ -566,7 +599,7 @@ shaka.util.PlayerConfiguration = class {
       return true;
     });
 
-    /** @type {!Array.<shaka.extern.Track>} */
+    /** @type {!Array<shaka.extern.Track>} */
     let selectedVariants = [];
 
     // Find the locale that best matches our preferred audio locale.
@@ -632,7 +665,7 @@ shaka.util.PlayerConfiguration = class {
       });
     }
 
-    /** @type {!Array.<shaka.extern.Track>} */
+    /** @type {!Array<shaka.extern.Track>} */
     const selectedTracks = [];
 
     // If there are multiple matches at different audio bitrates, select the

package/lib/util/pssh.js

@@ -24,19 +24,19 @@ shaka.util.Pssh = class {
   constructor(psshBox) {
     /**
      * In hex.
-     * @type {!Array.<string>}
+     * @type {!Array<string>}
      */
     this.systemIds = [];
 
     /**
      * In hex.
-     * @type {!Array.<string>}
+     * @type {!Array<string>}
      */
     this.cencKeyIds = [];
 
     /**
      * Array with the pssh boxes found.
-     * @type {!Array.<!Uint8Array>}
+     * @type {!Array<!Uint8Array>}
      */
     this.data = [];
 
@@ -95,7 +95,7 @@ shaka.util.Pssh = class {
    *
    * @param {!Uint8Array} data
    * @param {!Uint8Array} systemId
-   * @param {!Set.<string>} keyIds
+   * @param {!Set<string>} keyIds
    * @param {number} version
    * @return {!Uint8Array}
    */
@@ -144,10 +144,38 @@ shaka.util.Pssh = class {
     return psshBox;
   }
 
+  /**
+   * Returns just the data portion of a single PSSH
+   *
+   * @param {!Uint8Array} pssh
+   * @return {!Uint8Array}
+   */
+  static getPsshData(pssh) {
+    let offset = 8; // Box size and type fields
+
+    /** @type {!DataView} */
+    const view = shaka.util.BufferUtils.toDataView(pssh);
+
+    // Read version
+    const version = view.getUint8(offset);
+
+    // Version (1), flags (3), system ID (16)
+    offset += 20;
+
+    if (version > 0) {
+      // Key ID count (4) and All key IDs (16*count)
+      offset += 4 + (16 * view.getUint32(offset));
+    }
+
+    // Data size
+    offset += 4;
+
+    return shaka.util.BufferUtils.toUint8(view, offset);
+  }
 
   /**
    * Normalise the initData array. This is to apply browser specific
-   * work-arounds, e.g. removing duplicates which appears to occur
+   * workarounds, e.g. removing duplicates which appears to occur
    * intermittently when the native msneedkey event fires (i.e. event.initData
    * contains dupes).
    *
@@ -167,7 +195,7 @@ shaka.util.Pssh = class {
     }
 
     // Dedupe psshData.
-    /** @type {!Array.<!Uint8Array>} */
+    /** @type {!Array<!Uint8Array>} */
     const dedupedInitDatas = [];
     for (const initData of pssh.data) {
       const found = dedupedInitDatas.some((x) => {

package/lib/util/public_promise.js

@@ -12,12 +12,12 @@ goog.provide('shaka.util.PublicPromise');
  * A utility to create Promises with convenient public resolve and reject
  * methods.
  *
- * @extends {Promise.<T>}
+ * @extends {Promise<T>}
  * @template T
  */
 shaka.util.PublicPromise = class {
   /**
-   * @return {!Promise.<T>}
+   * @return {!Promise<T>}
    */
   constructor() {
     let resolvePromise;

package/lib/util/state_history.js

@@ -33,7 +33,7 @@ shaka.util.StateHistory = class {
      * The stats that are "closed" for updating. The "open" state becomes closed
      * once we move to a new state.
      *
-     * @private {!Array.<shaka.extern.StateChange>}
+     * @private {!Array<shaka.extern.StateChange>}
      */
     this.closed_ = [];
   }
@@ -77,7 +77,7 @@ shaka.util.StateHistory = class {
    * Get a copy of each state change entry in the history. A copy of each entry
    * is created to break the reference to the internal data.
    *
-   * @return {!Array.<shaka.extern.StateChange>}
+   * @return {!Array<shaka.extern.StateChange>}
    */
   getCopy() {
     const clone = (entry) => {