shaka-player 4.7.1 → 4.7.3

package/externs/isoboxer.js

@@ -13,27 +13,35 @@
 /**
  * @typedef {{
  *   Utils: !ISOBoxerUtils,
- *   parseBuffer: function(!(ArrayBuffer|ArrayBufferView)):!ISOBoxer,
+ *   parseBuffer: function(!(ArrayBuffer|ArrayBufferView)):!ISOFile,
  *   createBox: function(string, !ISOBoxer, boolean=):!ISOBoxer,
  *   createFullBox: function(string, !ISOBoxer, ?ISOBoxer=):!ISOBoxer,
  *   addBoxProcessor: function(string, function()):!ISOBoxer,
- *   createFile: function():!ISOBoxer,
- *   write: function():!ArrayBuffer,
- *   fetch: function(!ArrayBuffer):!ISOBoxer
+ *   createFile: function():!ISOFile,
  * }}
  * @property {!ISOBoxerUtils} Utils
- * @property {function(!(ArrayBuffer|ArrayBufferView)):!ISOBoxer} parseBuffer
+ * @property {function(!(ArrayBuffer|ArrayBufferView)):!ISOFile} parseBuffer
  * @property {function(string, !ISOBoxer, boolean=):!ISOBoxer} createBox
  * @property {function(string, !ISOBoxer, ?ISOBoxer=):!ISOBoxer} createFullBox
  * @property {function(string, function()):!ISOBoxer} addBoxProcessor
- * @property {function():!ISOBoxer} createFile
- * @property {function():!ArrayBuffer} write
- * @property {function(!ArrayBuffer):!ISOBoxer} fetch
+ * @property {function():!ISOFile} createFile
  * @const
  */
 var ISOBoxer;
 
 
+/**
+ * @typedef {{
+ *   write: function():!ArrayBuffer,
+ *   fetch: function(string):!ISOBox
+ * }}
+ * @property {function():!ArrayBuffer} write
+ * @property {function(string):!ISOBox} fetch
+ * @const
+ */
+var ISOFile;
+
+
 /**
  * @typedef {{
  *   appendBox: function(!ISOBoxer, !ISOBoxer):!ISOBox
@@ -91,7 +99,7 @@ var ISOBoxerUtils;
  *   graphicsmode: number,
  *   opcolor: Array.<number>,
  *   balance: number,
- *   entries: Array.<!ISOBox>,
+ *   entries: Array.<!ISOEntry>,
  *   location: string,
  *   data_reference_index: number,
  *   pre_defined1: number,
@@ -119,7 +127,7 @@ var ISOBoxerUtils;
  *   default_sample_size: number,
  *   default_sample_flags: number,
  *   baseMediaDecodeTime: number,
- *   usertype: ?string,
+ *   usertype: (string|null|undefined),
  *   offset: Array.<number>,
  *   sample_info_size: Array.<number>,
  *   data_offset: number
@@ -170,7 +178,7 @@ var ISOBoxerUtils;
  * @property {number} graphicsmode
  * @property {Array.<number>} opcolor
  * @property {number} balance
- * @property {Array.<!ISOBox} entries
+ * @property {Array.<!ISOEntry>} entries
  * @property {string} location
  * @property {number} data_reference_index
  * @property {number} pre_defined1
@@ -198,7 +206,7 @@ var ISOBoxerUtils;
  * @property {number} default_sample_size
  * @property {number} default_sample_flags
  * @property {number} baseMediaDecodeTime
- * @property {?string} usertype
+ * @property {string|null|undefined} usertype
  * @property {Array.<number} offset
  * @property {Array.<number} sample_info_size
  * @property {number} data_offset

package/externs/shaka/codecs.js

@@ -4,6 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/**
+ * @externs
+ */
+
 /**
  * @typedef {{
  *   data: !Uint8Array,

package/lib/ads/client_side_ad.js

@@ -207,6 +207,15 @@ shaka.ads.ClientSideAd = class {
     }
   }
 
+  /**
+   * It's required for a muted ad to start when autoplaying.
+   *
+   * @param {number} videoVolume
+   */
+  setInitialMuted(videoVolume) {
+    this.volume_ = videoVolume;
+    this.manager_.setVolume(0);
+  }
 
   /**
    * @override

package/lib/ads/client_side_ad_manager.js

@@ -532,9 +532,10 @@ shaka.ads.ClientSideAdManager = class {
     if (this.ad_.isLinear()) {
       this.adContainer_.setAttribute('ad-active', 'true');
       this.video_.pause();
-      this.ad_.setVolume(this.video_.volume);
       if (this.video_.muted) {
-        this.ad_.setMuted(true);
+        this.ad_.setInitialMuted(this.video_.volume);
+      } else {
+        this.ad_.setVolume(this.video_.volume);
       }
     }
   }

package/lib/ads/media_tailor_ad_manager.js

@@ -576,8 +576,9 @@ shaka.ads.MediaTailorAdManager = class {
       if (!app.data.source.length) {
         continue;
       }
-      const imageElement = document.createElement('img');
-      imageElement.setAttribute('src', app.data.source[0].url);
+      const imageElement = /** @type {!HTMLImageElement} */ (
+        document.createElement('img'));
+      imageElement.src = app.data.source[0].url;
       imageElement.style.top = (app.placeholder.top || 0) + '%';
       imageElement.style.height = (100 - (app.placeholder.top || 0)) + '%';
       imageElement.style.left = (app.placeholder.left || 0) + '%';

package/lib/dash/dash_parser.js

@@ -136,9 +136,11 @@ shaka.dash.DashParser = class {
       this.contentSteeringManager_.configure(this.config_);
     }
 
-    this.periodCombiner_.setAllowMultiTypeVariants(
-        this.config_.dash.multiTypeVariantsAllowed &&
-        shaka.media.Capabilities.isChangeTypeSupported());
+    if (this.periodCombiner_) {
+      this.periodCombiner_.setAllowMultiTypeVariants(
+          this.config_.dash.multiTypeVariantsAllowed &&
+          shaka.media.Capabilities.isChangeTypeSupported());
+    }
   }
 
   /**
@@ -1607,7 +1609,6 @@ shaka.dash.DashParser = class {
         hdr,
         videoLayout: undefined,
         tilesLayout,
-        matchedStreams: [],
         accessibilityPurpose,
         external: false,
         fastSwitching: false,

package/lib/hls/hls_parser.js

@@ -295,6 +295,7 @@ shaka.hls.HlsParser = class {
     this.groupIdToStreamInfosMap_.clear();
     this.groupIdToCodecsMap_.clear();
     this.globalVariables_.clear();
+    this.mapTagToInitSegmentRefMap_.clear();
 
     if (this.contentSteeringManager_) {
       this.contentSteeringManager_.destroy();
@@ -905,6 +906,7 @@ shaka.hls.HlsParser = class {
     let initData = null;
     const initSegmentRef = this.getInitSegmentReference_(
         playlist, middleSegment.tags, getUris);
+    this.mapTagToInitSegmentRefMap_.clear();
     if (initSegmentRef) {
       const initSegmentRequest = shaka.net.NetworkingEngine.makeRequest(
           initSegmentRef.getUris(), this.config_.retryParameters);
@@ -2235,7 +2237,7 @@ shaka.hls.HlsParser = class {
       stream.keyIds = realStream.keyIds;
       stream.mimeType = realStream.mimeType;
       stream.bandwidth = realStream.bandwidth;
-      stream.codecs = realStream.codecs || stream.codecs;
+      stream.codecs = stream.codecs || realStream.codecs;
 
       // Since we lazy-loaded this content, the player may need to create new
       // sessions for the DRM info in this stream.
@@ -3450,6 +3452,13 @@ shaka.hls.HlsParser = class {
     if (this.isLive_() && mediaSequenceToStartTime.has(position)) {
       firstStartTime = mediaSequenceToStartTime.get(position);
     }
+    // This is for recovering from disconnects.
+    if (firstStartTime === 0 &&
+        this.presentationType_ == shaka.hls.HlsParser.PresentationType_.LIVE &&
+        mediaSequenceToStartTime.size > 0 &&
+        !mediaSequenceToStartTime.has(position)) {
+      firstStartTime = this.presentationTimeline_.getSegmentAvailabilityStart();
+    }
 
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     const references = [];
@@ -3764,7 +3773,9 @@ shaka.hls.HlsParser = class {
 
       contentMimeType = response.headers['content-type'];
     } catch (error) {
-      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+      if (error &&
+        (error.code == shaka.util.Error.Code.HTTP_ERROR ||
+         error.code == shaka.util.Error.Code.BAD_HTTP_STATUS)) {
         headRequest.method = 'GET';
         const response = await this.makeNetworkRequest_(
             headRequest, requestType, {type});

package/lib/media/media_source_engine.js

@@ -460,9 +460,10 @@ shaka.media.MediaSourceEngine = class {
    * @param {shaka.util.ManifestParserUtils.ContentType} contentType
    * @param {shaka.extern.Stream} stream
    * @param {string} codecs
+   * @param {boolean=} forceTransmux
    * @private
    */
-  initSourceBuffer_(contentType, stream, codecs) {
+  initSourceBuffer_(contentType, stream, codecs, forceTransmux = false) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     goog.asserts.assert(
@@ -474,7 +475,7 @@ shaka.media.MediaSourceEngine = class {
     if (contentType == ContentType.TEXT) {
       this.reinitText(mimeType, this.sequenceMode_, stream.external);
     } else {
-      let needTransmux = this.config_.forceTransmux;
+      let needTransmux = this.config_.forceTransmux || forceTransmux;
       if (!shaka.media.Capabilities.isTypeSupported(mimeType) ||
           (!this.sequenceMode_ &&
           shaka.util.MimeUtils.RAW_FORMATS.includes(mimeType))) {
@@ -491,8 +492,10 @@ shaka.media.MediaSourceEngine = class {
             ContentType.VIDEO, (codecs || '').split(','));
         if (audioCodec && videoCodec) {
           this.needSplitMuxedContent_ = true;
-          this.initSourceBuffer_(ContentType.AUDIO, stream, audioCodec);
-          this.initSourceBuffer_(ContentType.VIDEO, stream, videoCodec);
+          this.initSourceBuffer_(
+              ContentType.AUDIO, stream, audioCodec, /* forceTransmux= */ true);
+          this.initSourceBuffer_(
+              ContentType.VIDEO, stream, videoCodec, /* forceTransmux= */ true);
           return;
         }
         const transmuxerPlugin =
@@ -1854,7 +1857,8 @@ shaka.media.MediaSourceEngine = class {
     let needTransmux = this.config_.forceTransmux;
     if (!shaka.media.Capabilities.isTypeSupported(newMimeType) ||
         (!this.sequenceMode_ &&
-        shaka.util.MimeUtils.RAW_FORMATS.includes(newMimeType))) {
+        shaka.util.MimeUtils.RAW_FORMATS.includes(newMimeType)) ||
+        codecs.includes(',')) {
       needTransmux = true;
     }
     const TransmuxerEngine = shaka.transmuxer.TransmuxerEngine;
@@ -1935,7 +1939,8 @@ shaka.media.MediaSourceEngine = class {
     let needTransmux = this.config_.forceTransmux;
     if (!shaka.media.Capabilities.isTypeSupported(newMimeType) ||
         (!this.sequenceMode_ &&
-        shaka.util.MimeUtils.RAW_FORMATS.includes(newMimeType))) {
+        shaka.util.MimeUtils.RAW_FORMATS.includes(newMimeType)) ||
+        stream.codecs.includes(',')) {
       needTransmux = true;
     }
     const newMimeTypeWithAllCodecs =

package/lib/media/segment_prefetch.js

@@ -165,12 +165,12 @@ shaka.media.SegmentPrefetch = class {
       if (reference instanceof shaka.media.SegmentReference) {
         shaka.log.debug(
             logPrefix,
-            'reused prefetched segment at time:', reference.startTime,
+            'missed segment at time:', reference.startTime,
             'mapSize', this.segmentPrefetchMap_.size);
       } else {
         shaka.log.debug(
             logPrefix,
-            'reused prefetched init segment at time, mapSize',
+            'missed init segment at time, mapSize',
             this.segmentPrefetchMap_.size);
       }
       return null;

package/lib/net/networking_utils.js

@@ -37,7 +37,9 @@ shaka.net.NetworkingUtils = class {
       const response = await netEngine.request(type, request).promise;
       mimeType = response.headers['content-type'];
     } catch (error) {
-      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+      if (error &&
+        (error.code == shaka.util.Error.Code.HTTP_ERROR ||
+          error.code == shaka.util.Error.Code.BAD_HTTP_STATUS)) {
         request.method = 'GET';
         const response = await netEngine.request(type, request).promise;
         mimeType = response.headers['content-type'];

package/lib/player.js

@@ -6865,7 +6865,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.7.1' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.7.3' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/patchedmediakeys_apple.js

@@ -791,3 +791,9 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeyStatusMap = class {
     goog.asserts.assert(false, 'Not used!  Provided only for the compiler.');
   }
 };
+
+if (!navigator.requestMediaKeySystemAccess ||
+    // eslint-disable-next-line no-restricted-syntax
+    !MediaKeySystemAccess.prototype.getConfiguration) {
+  shaka.polyfill.register(shaka.polyfill.PatchedMediaKeysApple.install);
+}

package/lib/text/ui_text_displayer.js

@@ -154,6 +154,11 @@ shaka.text.UITextDisplayer = class {
    * @export
    */
   destroy() {
+    // Return resolved promise if destroy() has been called.
+    if (!this.textContainer_) {
+      return Promise.resolve();
+    }
+
     // Remove the text container element from the UI.
     this.videoContainer_.removeChild(this.textContainer_);
     this.textContainer_ = null;
@@ -176,6 +181,8 @@ shaka.text.UITextDisplayer = class {
       this.resizeObserver_.disconnect();
       this.resizeObserver_ = null;
     }
+
+    return Promise.resolve();
   }
 
 

package/lib/transmuxer/mss_transmuxer.js

@@ -253,6 +253,7 @@ shaka.transmuxer.MssTransmuxer = class {
    */
   processMediaSegment_(data, stream, reference) {
     let i;
+    /** @type {!ISOFile} */
     const isoFile = this.isoBoxer_.parseBuffer(data);
     // Update track_Id in tfhd box
     const tfhd = isoFile.fetch('tfhd');
@@ -313,8 +314,8 @@ shaka.transmuxer.MssTransmuxer = class {
             // (subsample_count field size)
             // 6 = 2 (BytesOfClearData field size) + 4
             // (BytesOfEncryptedData field size)
-            saiz.sample_info_size[i] =
-                10 + (6 * sepiff.entry[i].NumberOfEntries);
+            const entry = /** @type {!ISOEntry} */ (sepiff.entry[i]);
+            saiz.sample_info_size[i] = 10 + (6 * entry.NumberOfEntries);
           }
         } else {
           // No sub-sample encryption => set default

package/lib/transmuxer/ts_transmuxer.js

@@ -705,7 +705,7 @@ shaka.transmuxer.TsTransmuxer = class {
     /** @type {?number} */
     let baseMediaDecodeTime = null;
 
-    let nalus = [];
+    const nalus = [];
     const videoData = tsParser.getVideoData();
     if (!videoData.length) {
       throw new shaka.util.Error(
@@ -716,7 +716,7 @@ shaka.transmuxer.TsTransmuxer = class {
     for (let i = 0; i < videoData.length; i++) {
       const pes = videoData[i];
       const dataNalus = pes.nalus;
-      nalus = nalus.concat(dataNalus);
+      nalus.push(...dataNalus);
       const frame = H264.parseFrame(dataNalus);
       if (!frame) {
         continue;
@@ -797,7 +797,7 @@ shaka.transmuxer.TsTransmuxer = class {
     /** @type {?number} */
     let baseMediaDecodeTime = null;
 
-    let nalus = [];
+    const nalus = [];
     const videoData = tsParser.getVideoData();
     if (!videoData.length) {
       throw new shaka.util.Error(
@@ -808,7 +808,7 @@ shaka.transmuxer.TsTransmuxer = class {
     for (let i = 0; i < videoData.length; i++) {
       const pes = videoData[i];
       const dataNalus = pes.nalus;
-      nalus = nalus.concat(dataNalus);
+      nalus.push(...dataNalus);
       const frame = H265.parseFrame(dataNalus);
       if (!frame) {
         continue;

package/lib/util/mp4_generator.js

@@ -47,10 +47,11 @@ shaka.util.Mp4Generator = class {
     goog.asserts.assert(this.streamInfos_.length > 0,
         'StreamInfos must have elements');
     const Mp4Generator = shaka.util.Mp4Generator;
-    let traks = new Uint8Array([]);
+    const trakArrays = [];
     for (const streamInfo of this.streamInfos_) {
-      traks = shaka.util.Uint8ArrayUtils.concat(traks, this.trak_(streamInfo));
+      trakArrays.push(this.trak_(streamInfo));
     }
+    const traks = shaka.util.Uint8ArrayUtils.concat(...trakArrays);
     const firstStreamInfo = this.streamInfos_[0];
     return Mp4Generator.box('moov',
         this.mvhd_(firstStreamInfo),
@@ -693,10 +694,11 @@ shaka.util.Mp4Generator = class {
    */
   mvex_() {
     const Mp4Generator = shaka.util.Mp4Generator;
-    let trexs = new Uint8Array([]);
+    const trexArrays = [];
     for (const streamInfo of this.streamInfos_) {
-      trexs = shaka.util.Uint8ArrayUtils.concat(trexs, this.trex_(streamInfo));
+      trexArrays.push(this.trex_(streamInfo));
     }
+    const trexs = shaka.util.Uint8ArrayUtils.concat(...trexArrays);
     return Mp4Generator.box('mvex', trexs);
   }
 
@@ -730,9 +732,9 @@ shaka.util.Mp4Generator = class {
    * @private
    */
   pssh_(streamInfo) {
-    let boxes = new Uint8Array([]);
+    const initDatas = [];
     if (!streamInfo.encrypted) {
-      return boxes;
+      return new Uint8Array([]);
     }
 
     for (const drmInfo of streamInfo.stream.drmInfos) {
@@ -740,9 +742,10 @@ shaka.util.Mp4Generator = class {
         continue;
       }
       for (const initData of drmInfo.initData) {
-        boxes = shaka.util.Uint8ArrayUtils.concat(boxes, initData.initData);
+        initDatas.push(initData.initData);
       }
     }
+    const boxes = shaka.util.Uint8ArrayUtils.concat(...initDatas);
     return boxes;
   }
 
@@ -845,11 +848,12 @@ shaka.util.Mp4Generator = class {
    * @return {!Uint8Array}
    */
   segmentData() {
-    let result = new Uint8Array([]);
+    const segmentDataArray = [];
     for (const streamInfo of this.streamInfos_) {
-      result = shaka.util.Uint8ArrayUtils.concat(result,
-          this.moof_(streamInfo), this.mdat_(streamInfo));
+      segmentDataArray.push(
+          ...[this.moof_(streamInfo), this.mdat_(streamInfo)]);
     }
+    const result = shaka.util.Uint8ArrayUtils.concat(...segmentDataArray);
     return result;
   }