shaka-player 4.6.5 → 4.6.7

package/docs/tutorials/fairplay.md

@@ -98,9 +98,9 @@ player.getNetworkingEngine().registerRequestFilter((type, request, context) => {
   const originalPayload = new Uint8Array(request.body);
   const base64Payload =
       shaka.util.Uint8ArrayUtils.toStandardBase64(originalPayload);
-  const params = 'spc=' + base64Payload;
+  const params = 'spc=' + encodeURIComponent(base64Payload);
   request.headers['Content-Type'] = 'application/x-www-form-urlencoded';
-  request.body = shaka.util.StringUtils.toUTF8(encodeURIComponent(params));
+  request.body = shaka.util.StringUtils.toUTF8(params);
 });
 
 player.getNetworkingEngine().registerResponseFilter((type, response, context) => {

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/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);
@@ -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/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

@@ -6779,7 +6779,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.5' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.7' + '-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;
   }
 

package/lib/util/periods.js

@@ -1097,6 +1097,11 @@ shaka.util.PeriodCombiner = class {
       return true;
     }
 
+    // Forced subtitles should be treated as unique streams
+    if (outputStream.forced !== candidate.forced) {
+      return false;
+    }
+
     const languageRelatedness = LanguageUtils.relatedness(
         outputStream.language, candidate.language);
 

package/lib/util/platform.js

@@ -234,10 +234,12 @@ shaka.util.Platform = class {
     return !!navigator.vendor && navigator.vendor.includes('Apple') &&
         !shaka.util.Platform.isTizen() &&
         !shaka.util.Platform.isEOS() &&
+        !shaka.util.Platform.isAPL() &&
         !shaka.util.Platform.isVirginMedia() &&
         !shaka.util.Platform.isOrange() &&
         !shaka.util.Platform.isPS4() &&
-        !shaka.util.Platform.isAmazonFireTV();
+        !shaka.util.Platform.isAmazonFireTV() &&
+        !shaka.util.Platform.isWPE();
   }
 
   /**
@@ -292,6 +294,14 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('AFT');
   }
 
+  /**
+   * Check if the current platform is Comcast X1.
+   * @return {boolean}
+   */
+  static isWPE() {
+    return shaka.util.Platform.userAgentContains_('WPE');
+  }
+
   /**
    * Returns a major version number for Safari, or Safari-based iOS browsers.
    *
@@ -348,6 +358,15 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('PC=EOS');
   }
 
+  /**
+   * Check if the current platform is an APL set-top box.
+   *
+   * @return {boolean}
+   */
+  static isAPL() {
+    return shaka.util.Platform.userAgentContains_('PC=APL');
+  }
+
   /**
    * Guesses if the platform is a mobile one (iOS or Android).
    *

package/lib/util/ts_parser.js

@@ -32,7 +32,7 @@ shaka.util.TsParser = class {
     /** @private {?string} */
     this.videoCodec_ = null;
 
-    /** @private {!Array.<Uint8Array>} */
+    /** @private {!Array.<!Array.<Uint8Array>>} */
     this.videoData_ = [];
 
     /** @private {!Array.<shaka.extern.MPEG_PES>} */
@@ -44,7 +44,7 @@ shaka.util.TsParser = class {
     /** @private {?string} */
     this.audioCodec_ = null;
 
-    /** @private {!Array.<Uint8Array>} */
+    /** @private {!Array.<!Array.<Uint8Array>>} */
     this.audioData_ = [];
 
     /** @private {!Array.<shaka.extern.MPEG_PES>} */
@@ -53,7 +53,7 @@ shaka.util.TsParser = class {
     /** @private {?number} */
     this.id3Pid_ = null;
 
-    /** @private {!Array.<Uint8Array>} */
+    /** @private {!Array.<!Array.<Uint8Array>>} */
     this.id3Data_ = [];
   }
 
@@ -79,7 +79,6 @@ shaka.util.TsParser = class {
    */
   parse(data) {
     const packetLength = shaka.util.TsParser.PacketLength_;
-    const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
 
     // A TS fragment should contain at least 3 TS packets, a PAT, a PMT, and
     // one PID.
@@ -162,12 +161,11 @@ shaka.util.TsParser = class {
           case this.videoPid_: {
             const videoData = data.subarray(offset, start + packetLength);
             if (payloadUnitStartIndicator) {
-              this.videoData_.push(videoData);
+              this.videoData_.push([videoData]);
             } else if (this.videoData_.length) {
               const prevVideoData = this.videoData_[this.videoData_.length - 1];
               if (prevVideoData) {
-                this.videoData_[this.videoData_.length - 1] =
-                    Uint8ArrayUtils.concat(prevVideoData, videoData);
+                this.videoData_[this.videoData_.length - 1].push(videoData);
               }
             }
             break;
@@ -175,12 +173,11 @@ shaka.util.TsParser = class {
           case this.audioPid_: {
             const audioData = data.subarray(offset, start + packetLength);
             if (payloadUnitStartIndicator) {
-              this.audioData_.push(audioData);
+              this.audioData_.push([audioData]);
             } else if (this.audioData_.length) {
               const prevAudioData = this.audioData_[this.audioData_.length - 1];
               if (prevAudioData) {
-                this.audioData_[this.audioData_.length - 1] =
-                    Uint8ArrayUtils.concat(prevAudioData, audioData);
+                this.audioData_[this.audioData_.length - 1].push(audioData);
               }
             }
             break;
@@ -188,12 +185,11 @@ shaka.util.TsParser = class {
           case this.id3Pid_: {
             const id3Data = data.subarray(offset, start + packetLength);
             if (payloadUnitStartIndicator) {
-              this.id3Data_.push(id3Data);
+              this.id3Data_.push([id3Data]);
             } else if (this.id3Data_.length) {
               const prevId3Data = this.id3Data_[this.id3Data_.length - 1];
               if (prevId3Data) {
-                this.id3Data_[this.id3Data_.length - 1] =
-                    Uint8ArrayUtils.concat(prevId3Data, id3Data);
+                this.id3Data_[this.id3Data_.length - 1].push(id3Data);
               }
             }
             break;
@@ -588,7 +584,8 @@ shaka.util.TsParser = class {
   getMetadata() {
     const timescale = shaka.util.TsParser.Timescale;
     const metadata = [];
-    for (const id3Data of this.id3Data_) {
+    for (const id3DataArray of this.id3Data_) {
+      const id3Data = shaka.util.Uint8ArrayUtils.concat(...id3DataArray);
       const pes = this.parsePES_(id3Data);
       if (pes) {
         metadata.push({
@@ -612,7 +609,8 @@ shaka.util.TsParser = class {
   getAudioData() {
     if (this.audioData_.length && !this.audioPes_.length) {
       let sort = false;
-      for (const audioData of this.audioData_) {
+      for (const audioDataArray of this.audioData_) {
+        const audioData = shaka.util.Uint8ArrayUtils.concat(...audioDataArray);
         const pes = this.parsePES_(audioData);
         let previousPes = this.audioPes_.length ?
             this.audioPes_[this.audioPes_.length - 1] : null;
@@ -654,7 +652,8 @@ shaka.util.TsParser = class {
   getVideoData(naluProcessing = true) {
     if (this.videoData_.length && !this.videoPes_.length) {
       let sort = false;
-      for (const videoData of this.videoData_) {
+      for (const videoDataArray of this.videoData_) {
+        const videoData = shaka.util.Uint8ArrayUtils.concat(...videoDataArray);
         const pes = this.parsePES_(videoData);
         let previousPes = this.videoPes_.length ?
             this.videoPes_[this.videoPes_.length - 1] : null;

package/lib/util/uint8array_utils.js

@@ -107,21 +107,26 @@ shaka.util.Uint8ArrayUtils = class {
    * @export
    */
   static concat(...varArgs) {
+    const BufferUtils = shaka.util.BufferUtils;
     let totalLength = 0;
-    for (const arr of varArgs) {
-      totalLength += arr.byteLength;
+    for (let i = 0; i < varArgs.length; ++i) {
+      const value = varArgs[i];
+      totalLength += value.byteLength;
     }
 
     const result = new Uint8Array(totalLength);
     let offset = 0;
-    for (const arr of varArgs) {
-      if (arr instanceof Uint8Array) {
-        result.set(arr, offset);
+
+    for (let i = 0; i < varArgs.length; ++i) {
+      const value = varArgs[i];
+      if (value instanceof Uint8Array) {
+        result.set(value, offset);
       } else {
-        result.set(shaka.util.BufferUtils.toUint8(arr), offset);
+        result.set(BufferUtils.toUint8(value), offset);
       }
-      offset += arr.byteLength;
+      offset += value.byteLength;
     }
+
     return result;
   }
 };

package/package.json

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

package/test/text/ui_text_displayer_unit.js

@@ -605,4 +605,13 @@ describe('UITextDisplayer', () => {
         (e) => e.nodeType == Node.ELEMENT_NODE);
     expect(childrenOfTwo.length).toBe(3);
   });
+
+  it('textDisplayer does not crash if destroy is called more than once', () => {
+    expect(videoContainer.childNodes.length).toBe(1);
+
+    textDisplayer.destroy();
+    textDisplayer.destroy();
+
+    expect(videoContainer.childNodes.length).toBe(0);
+  });
 });

package/test/util/periods_unit.js

@@ -603,6 +603,55 @@ describe('PeriodCombiner', () => {
     }
   });
 
+  // Regression test for #6054, where we failed on multi-period content with
+  // different numbers of forced-subtitle streams per period.
+  it('Does not combine subtitle and forced-subtitle tracks', async () => {
+    const videoStreams = [makeVideoStream(1280)];
+    const audioStreams = [makeAudioStream('en', /* channels= */ 2)];
+    const imageStreams = [];
+
+    const forcedSubtitle = makeTextStream('de');
+    forcedSubtitle.roles = ['forced-subtitle'];
+    forcedSubtitle.forced = true;
+
+    const subtitle = makeTextStream('de');
+    subtitle.roles = ['subtitle'];
+
+    /** @type {!Array.<shaka.extern.Period>} */
+    const periods = [
+      {
+        id: '1',
+        videoStreams,
+        audioStreams,
+        textStreams: [
+          forcedSubtitle,
+          subtitle,
+        ],
+        imageStreams,
+      },
+      {
+        id: '2',
+        videoStreams,
+        audioStreams,
+        textStreams: [
+          subtitle,
+        ],
+        imageStreams,
+      },
+      {
+        id: '3',
+        videoStreams,
+        audioStreams,
+        textStreams: [],
+        imageStreams,
+      },
+    ];
+
+    await combiner.combinePeriods(periods, /* isDynamic= */ true);
+    const textStreams = combiner.getTextStreams();
+    expect(textStreams.every((s) => s.roles.length === 1)).toBe(true);
+  });
+
   // Regression test for #3383, where we failed on multi-period content with
   // multiple image streams per period.
   it('Can handle multiple image streams', async () => {