shaka-player 4.3.12 → 4.3.14

package/lib/hls/hls_parser.js

@@ -215,6 +215,9 @@ shaka.hls.HlsParser = class {
      * {!Map.<string, !shaka.media.InitSegmentReference>} */
     this.mapTagToInitSegmentRefMap_ = new Map();
 
+    /** @private {Map.<string, !shaka.extern.HlsAes128Key>} */
+    this.aesKeyInfoMap_ = new Map();
+
     /** @private {boolean} */
     this.lowLatencyMode_ = false;
   }
@@ -277,6 +280,8 @@ shaka.hls.HlsParser = class {
     this.groupIdToStreamInfosMap_.clear();
     this.groupIdToCodecsMap_.clear();
     this.globalVariables_.clear();
+    this.mapTagToInitSegmentRefMap_.clear();
+    this.aesKeyInfoMap_.clear();
 
     return Promise.all(pending);
   }
@@ -435,6 +440,14 @@ shaka.hls.HlsParser = class {
     // No-op
   }
 
+  /**
+   * @override
+   * @exportInterface
+   */
+  onInitialVariantChosen(variant) {
+    // No-op
+  }
+
   /**
    * Align the streams by sequence number by dropping early segments.  Then
    * offset the streams to begin at presentation time 0.
@@ -774,7 +787,7 @@ shaka.hls.HlsParser = class {
     // enough info here to determine the presentation type and duration.
     if (playlist.type == shaka.hls.PlaylistType.MEDIA) {
       if (this.isLive_()) {
-        this.changePresentationTimelineToLive_();
+        this.changePresentationTimelineToLive_(playlist);
         const delay = this.updatePlaylistDelay_;
         this.updatePlaylistTimer_.tickAfter(/* seconds= */ delay);
       }
@@ -833,6 +846,22 @@ shaka.hls.HlsParser = class {
         this.presentationTimeline_.setSegmentAvailabilityDuration(
             segmentAvailabilityDuration);
       }
+
+      if (!this.presentationTimeline_.isStartTimeLocked()) {
+        const streamInfos = Array.from(this.uriToStreamInfosMap_.values());
+        const activeStreamInfos =
+            streamInfos.filter((s) => s.stream.segmentIndex);
+        for (const streamInfo of activeStreamInfos) {
+          if (streamInfo.type != 'audio' && streamInfo.type != 'video') {
+            continue;
+          }
+          const firstReference = streamInfo.stream.segmentIndex.get(0);
+          if (firstReference && firstReference.syncTime) {
+            const syncTime = firstReference.syncTime;
+            this.presentationTimeline_.setPresentationStartTime(syncTime);
+          }
+        }
+      }
     } else {
       // Use the minimum duration as the presentation duration.
       this.presentationTimeline_.setDuration(this.getMinDuration_());
@@ -1291,9 +1320,15 @@ shaka.hls.HlsParser = class {
     // the value NONE. If the value is a quoted-string, it MUST match the
     // value of the GROUP-ID attribute of an EXT-X-MEDIA tag elsewhere in the
     // Playlist whose TYPE attribute is CLOSED-CAPTIONS.
-    if (type == ContentType.VIDEO && closedCaptionsAttr &&
-    closedCaptionsAttr != 'NONE') {
-      return this.groupIdToClosedCaptionsMap_.get(closedCaptionsAttr);
+    if (type == ContentType.VIDEO) {
+      if (closedCaptionsAttr && closedCaptionsAttr != 'NONE') {
+        return this.groupIdToClosedCaptionsMap_.get(closedCaptionsAttr);
+      } else if (!closedCaptionsAttr &&
+          this.groupIdToClosedCaptionsMap_.size) {
+        for (const key of this.groupIdToClosedCaptionsMap_.keys()) {
+          return this.groupIdToClosedCaptionsMap_.get(key);
+        }
+      }
     }
     return null;
   }
@@ -1440,7 +1475,14 @@ shaka.hls.HlsParser = class {
     for (const tag of closedCaptionsTags) {
       goog.asserts.assert(tag.name == 'EXT-X-MEDIA',
           'Should only be called on media tags!');
-      const language = this.getLanguage_(tag);
+      const languageValue = tag.getAttributeValue('LANGUAGE');
+      let language = this.getLanguage_(tag);
+      if (!languageValue) {
+        const nameValue = tag.getAttributeValue('NAME');
+        if (nameValue) {
+          language = nameValue;
+        }
+      }
 
       // The GROUP-ID value is a quoted-string that specifies the group to which
       // the Rendition belongs.
@@ -1449,7 +1491,9 @@ shaka.hls.HlsParser = class {
       // The value of INSTREAM-ID is a quoted-string that specifies a Rendition
       // within the segments in the Media Playlist. This attribute is REQUIRED
       // if the TYPE attribute is CLOSED-CAPTIONS.
-      const instreamId = tag.getRequiredAttrValue('INSTREAM-ID');
+      // We need replace SERVICE string by our internal svc string.
+      const instreamId = tag.getRequiredAttrValue('INSTREAM-ID')
+          .replace('SERVICE', 'svc');
       if (!this.groupIdToClosedCaptionsMap_.get(groupId)) {
         this.groupIdToClosedCaptionsMap_.set(groupId, new Map());
       }
@@ -1709,7 +1753,7 @@ shaka.hls.HlsParser = class {
       if (this.isLive_() && !wasLive) {
         // Now that we know that the presentation is live, convert the timeline
         // to live.
-        this.changePresentationTimelineToLive_();
+        this.changePresentationTimelineToLive_(playlist);
       }
 
       // Copy values from the real stream info to our initial one.
@@ -2074,8 +2118,15 @@ shaka.hls.HlsParser = class {
       }
     }
 
-    const kind = (type == shaka.util.ManifestParserUtils.ContentType.TEXT) ?
-        shaka.util.ManifestParserUtils.TextStreamKind.SUBTITLE : undefined;
+    let kind = undefined;
+    if (type == shaka.util.ManifestParserUtils.ContentType.TEXT) {
+      if (roles.includes('public.accessibility.transcribes-spoken-dialog') &&
+          roles.includes('public.accessibility.describes-music-and-sound')) {
+        kind = shaka.util.ManifestParserUtils.TextStreamKind.CLOSED_CAPTION;
+      } else {
+        kind = shaka.util.ManifestParserUtils.TextStreamKind.SUBTITLE;
+      }
+    }
 
     // If there are no roles, and we have defaulted to the subtitle "kind" for
     // this track, add the implied subtitle role.
@@ -2231,30 +2282,36 @@ shaka.hls.HlsParser = class {
     const request = shaka.net.NetworkingEngine.makeRequest(
         [keyUri], this.config_.retryParameters);
 
-    const keyInfo = {method: 'AES-128', iv, firstMediaSequenceNumber};
+    const aesKeyInfoKey = `${drmTag.toString()}-${firstMediaSequenceNumber}`;
+    if (!this.aesKeyInfoMap_.has(aesKeyInfoKey)) {
+      const keyInfo = {method: 'AES-128', iv, firstMediaSequenceNumber};
 
-    // Don't download the key object until the segment is parsed, to avoid a
-    // startup delay for long manifests with lots of keys.
-    keyInfo.fetchKey = async () => {
-      const keyResponse = await this.makeNetworkRequest_(request, requestType);
+      // Don't download the key object until the segment is parsed, to avoid a
+      // startup delay for long manifests with lots of keys.
+      keyInfo.fetchKey = async () => {
+        const keyResponse = await this.makeNetworkRequest_(
+            request, requestType);
 
-      // keyResponse.status is undefined when URI is "data:text/plain;base64,"
-      if (!keyResponse.data || keyResponse.data.byteLength != 16) {
-        throw new shaka.util.Error(
-            shaka.util.Error.Severity.CRITICAL,
-            shaka.util.Error.Category.MANIFEST,
-            shaka.util.Error.Code.HLS_AES_128_INVALID_KEY_LENGTH);
-      }
+        // keyResponse.status is undefined when URI is
+        // "data:text/plain;base64,"
+        if (!keyResponse.data || keyResponse.data.byteLength != 16) {
+          throw new shaka.util.Error(
+              shaka.util.Error.Severity.CRITICAL,
+              shaka.util.Error.Category.MANIFEST,
+              shaka.util.Error.Code.HLS_AES_128_INVALID_KEY_LENGTH);
+        }
 
-      const algorithm = {
-        name: 'AES-CBC',
+        const algorithm = {
+          name: 'AES-CBC',
+        };
+        keyInfo.cryptoKey = await window.crypto.subtle.importKey(
+            'raw', keyResponse.data, algorithm, true, ['decrypt']);
+        keyInfo.fetchKey = undefined; // No longer needed.
       };
-      keyInfo.cryptoKey = await window.crypto.subtle.importKey(
-          'raw', keyResponse.data, algorithm, true, ['decrypt']);
-      keyInfo.fetchKey = undefined; // No longer needed.
-    };
+      this.aesKeyInfoMap_.set(aesKeyInfoKey, keyInfo);
+    }
 
-    return keyInfo;
+    return this.aesKeyInfoMap_.get(aesKeyInfoKey);
   }
 
 
@@ -2323,9 +2380,10 @@ shaka.hls.HlsParser = class {
   }
 
   /**
+   * @param {!shaka.hls.Playlist} playlist
    * @private
    */
-  changePresentationTimelineToLive_() {
+  changePresentationTimelineToLive_(playlist) {
     // The live edge will be calculated from segments, so we don't need to
     // set a presentation start time.  We will assert later that this is
     // working as expected.
@@ -2346,8 +2404,12 @@ shaka.hls.HlsParser = class {
     } else if (this.lowLatencyPresentationDelay_) {
       presentationDelay = this.lowLatencyPresentationDelay_;
     } else {
-      const numberOfSegments = this.config_.hls.liveSegmentsDelay;
-      presentationDelay = this.maxTargetDuration_ * numberOfSegments;
+      const playlistSegments = playlist.segments.length;
+      let delaySegments = this.config_.hls.liveSegmentsDelay;
+      if (delaySegments > (playlistSegments - 2)) {
+        delaySegments = Math.max(1, playlistSegments - 2);
+      }
+      presentationDelay = this.maxTargetDuration_ * delaySegments;
     }
 
     this.presentationTimeline_.setPresentationStartTime(0);
@@ -2357,13 +2419,13 @@ shaka.hls.HlsParser = class {
 
   /**
    * Get the InitSegmentReference for a segment if it has a EXT-X-MAP tag.
-   * @param {string} playlistUri The absolute uri of the media playlist.
+   * @param {!shaka.hls.Playlist} playlist
    * @param {!Array.<!shaka.hls.Tag>} tags Segment tags
    * @param {!Map.<string, string>} variables
    * @return {shaka.media.InitSegmentReference}
    * @private
    */
-  getInitSegmentReference_(playlistUri, tags, variables) {
+  getInitSegmentReference_(playlist, tags, variables) {
     /** @type {?shaka.hls.Tag} */
     const mapTag = shaka.hls.Utils.getFirstTagWithName(tags, 'EXT-X-MAP');
 
@@ -2374,7 +2436,7 @@ shaka.hls.HlsParser = class {
     const verbatimInitSegmentUri = mapTag.getRequiredAttrValue('URI');
     const absoluteInitSegmentUri = this.variableSubstitution_(
         shaka.hls.Utils.constructAbsoluteUri(
-            playlistUri, verbatimInitSegmentUri),
+            playlist.absoluteUri, verbatimInitSegmentUri),
         variables);
 
     const mapTagKey = [
@@ -2382,8 +2444,21 @@ shaka.hls.HlsParser = class {
       mapTag.getAttributeValue('BYTERANGE', ''),
     ].join('-');
     if (!this.mapTagToInitSegmentRefMap_.has(mapTagKey)) {
+      /** @type {shaka.extern.HlsAes128Key|undefined} */
+      let aes128Key = undefined;
+      let byteRangeTag = null;
+      for (const tag of tags) {
+        if (tag.name == 'EXT-X-KEY') {
+          if (tag.getRequiredAttrValue('METHOD') == 'AES-128' &&
+              tag.id < mapTag.id) {
+            aes128Key = this.parseAES128DrmTag_(tag, playlist);
+          }
+        } else if (tag.name == 'EXT-X-BYTERANGE' && tag.id < mapTag.id) {
+          byteRangeTag = tag;
+        }
+      }
       const initSegmentRef = this.createInitSegmentReference_(
-          absoluteInitSegmentUri, mapTag);
+          absoluteInitSegmentUri, mapTag, byteRangeTag, aes128Key);
       this.mapTagToInitSegmentRefMap_.set(mapTagKey, initSegmentRef);
     }
     return this.mapTagToInitSegmentRefMap_.get(mapTagKey);
@@ -2394,13 +2469,19 @@ shaka.hls.HlsParser = class {
    * playlist.
    * @param {string} absoluteInitSegmentUri
    * @param {!shaka.hls.Tag} mapTag EXT-X-MAP
+   * @param {shaka.hls.Tag=} byteRangeTag EXT-X-BYTERANGE
+   * @param {shaka.extern.HlsAes128Key=} aes128Key
    * @return {!shaka.media.InitSegmentReference}
    * @private
    */
-  createInitSegmentReference_(absoluteInitSegmentUri, mapTag) {
+  createInitSegmentReference_(absoluteInitSegmentUri, mapTag, byteRangeTag,
+      aes128Key) {
     let startByte = 0;
     let endByte = null;
-    const byterange = mapTag.getAttributeValue('BYTERANGE');
+    let byterange = mapTag.getAttributeValue('BYTERANGE');
+    if (!byterange && byteRangeTag) {
+      byterange = byteRangeTag.value;
+    }
     // If a BYTERANGE attribute is not specified, the segment consists
     // of the entire resource.
     if (byterange) {
@@ -2408,12 +2489,25 @@ shaka.hls.HlsParser = class {
       const byteLength = Number(blocks[0]);
       startByte = Number(blocks[1]);
       endByte = startByte + byteLength - 1;
+
+      if (aes128Key) {
+        // MAP segment encrypted with method 'AES-128', when served with
+        // HTTP Range, has the unencrypted size specified in the range.
+        // See: https://tools.ietf.org/html/draft-pantos-hls-rfc8216bis-08#section-6.3.6
+        const length = (endByte + 1) - startByte;
+        if (length % 16) {
+          endByte += (16 - (length % 16));
+        }
+      }
     }
 
     const initSegmentRef = new shaka.media.InitSegmentReference(
         () => [absoluteInitSegmentUri],
         startByte,
-        endByte);
+        endByte,
+        /* mediaQuality= */ null,
+        /* timescale= */ null,
+        aes128Key);
     return initSegmentRef;
   }
 
@@ -2427,15 +2521,13 @@ shaka.hls.HlsParser = class {
    * @param {!Map.<string, string>} variables
    * @param {string} absoluteMediaPlaylistUri
    * @param {string} type
-   * @param {number} timestampOffset
    * @param {shaka.extern.HlsAes128Key=} hlsAes128Key
    * @return {shaka.media.SegmentReference}
    * @private
    */
   createSegmentReference_(
       initSegmentReference, previousReference, hlsSegment, startTime,
-      variables, absoluteMediaPlaylistUri, type, timestampOffset,
-      hlsAes128Key) {
+      variables, absoluteMediaPlaylistUri, type, hlsAes128Key) {
     const tags = hlsSegment.tags;
     const absoluteSegmentUri = this.variableSubstitution_(
         hlsSegment.absoluteUri, variables);
@@ -2539,7 +2631,7 @@ shaka.hls.HlsParser = class {
             pStartByte,
             pEndByte,
             initSegmentReference,
-            /* timestampOffset= */ 0, // This value is ignored in sequence mode.
+            /* timestampOffset= */ 0,
             /* appendWindowStart= */ 0,
             /* appendWindowEnd= */ Infinity,
             /* partialReferences= */ [],
@@ -2571,8 +2663,11 @@ shaka.hls.HlsParser = class {
         return null;
       }
       endTime = startTime + duration;
-    } else {
+    } else if (partialSegmentRefs.length) {
       endTime = partialSegmentRefs[partialSegmentRefs.length - 1].endTime;
+    } else {
+      // Skip segments without duration and without partialsegments
+      return null;
     }
 
     // If the segment has EXT-X-BYTERANGE tag, set the start byte and end byte
@@ -2612,7 +2707,7 @@ shaka.hls.HlsParser = class {
         startByte,
         endByte,
         initSegmentReference,
-        timestampOffset, // This value is ignored in sequence mode.
+        /* timestampOffset= */ 0,
         /* appendWindowStart= */ 0,
         /* appendWindowEnd= */ Infinity,
         partialSegmentRefs,
@@ -2692,12 +2787,18 @@ 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 = [];
 
     let previousReference = null;
-    let lastDiscontinuityStartTime = firstStartTime;
 
     for (let i = 0; i < hlsSegments.length; i++) {
       const item = hlsSegments[i];
@@ -2709,7 +2810,6 @@ shaka.hls.HlsParser = class {
           item.tags, 'EXT-X-DISCONTINUITY');
       if (discontinuityTag) {
         discontinuitySequence++;
-        lastDiscontinuityStartTime = startTime;
       }
 
       // Apply new AES-128 tags as you see them, keeping a running total.
@@ -2725,8 +2825,8 @@ shaka.hls.HlsParser = class {
 
       mediaSequenceToStartTime.set(position, startTime);
 
-      initSegmentRef = this.getInitSegmentReference_(playlist.absoluteUri,
-          item.tags, variables);
+      initSegmentRef = this.getInitSegmentReference_(playlist, item.tags,
+          variables);
 
       // If the stream is low latency and the user has not configured the
       // lowLatencyMode, but if it has been configured to activate the
@@ -2748,7 +2848,6 @@ shaka.hls.HlsParser = class {
           variables,
           playlist.absoluteUri,
           type,
-          lastDiscontinuityStartTime,
           hlsAes128Key);
 
       if (reference) {

package/lib/hls/hls_utils.js

@@ -45,12 +45,12 @@ shaka.hls.Utils = class {
    * @return {?shaka.hls.Tag}
    */
   static getFirstTagWithName(tags, name) {
-    const tagsWithName = shaka.hls.Utils.filterTagsByName(tags, name);
-    if (!tagsWithName.length) {
-      return null;
+    for (const tag of tags) {
+      if (tag.name === name) {
+        return tag;
+      }
     }
-
-    return tagsWithName[0];
+    return null;
   }
 
   /**

package/lib/media/content_workarounds.js

@@ -69,6 +69,30 @@ shaka.media.ContentWorkarounds = class {
         })
         .fullBox('encv', onEncryptionMetadataBox)
         .fullBox('enca', onEncryptionMetadataBox)
+        .fullBox('dvav', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('dva1', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('dvh1', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('dvhe', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
         .fullBox('hev1', (box) => {
           boxesToModify.push({
             box,
@@ -105,6 +129,12 @@ shaka.media.ContentWorkarounds = class {
             newType: ContentWorkarounds.BOX_TYPE_ENCA_,
           });
         })
+        .fullBox('ac-4', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCA_,
+          });
+        })
         .fullBox('mp4a', (box) => {
           boxesToModify.push({
             box,

package/lib/media/drm_engine.js

@@ -520,6 +520,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.
    *
@@ -1920,19 +1929,14 @@ shaka.media.DrmEngine = class {
 
     for (const drm1 of drms1) {
       for (const drm2 of drms2) {
-        // This method is only called to compare drmInfos of a video and an
-        // audio adaptations, so we shouldn't have to worry about checking
-        // robustness.
         if (drm1.keySystem == drm2.keySystem) {
-          /** @type {Array<shaka.extern.InitDataOverride>} */
-          let initData = [];
-          initData = initData.concat(drm1.initData || []);
-          initData = initData.concat(drm2.initData || []);
-          initData = initData.filter((d, i) => {
-            return d.keyId === undefined || i === initData.findIndex((d2) => {
-              return d2.keyId === d.keyId;
-            });
-          });
+          const initDataMap = new Map();
+          const bothInitDatas = (drm1.initData || [])
+              .concat(drm2.initData || []);
+          for (const d of bothInitDatas) {
+            initDataMap.set(d.keyId, d);
+          }
+          const initData = Array.from(initDataMap.values());
 
           const keyIds = drm1.keyIds && drm2.keyIds ?
               new Set([...drm1.keyIds, ...drm2.keyIds]) :

package/lib/media/media_source_engine.js

@@ -202,6 +202,7 @@ shaka.media.MediaSourceEngine = class {
       'audio/mp4; codecs="mp4a.40.2"',
       'audio/mp4; codecs="ac-3"',
       'audio/mp4; codecs="ec-3"',
+      'audio/mp4; codecs="ac-4"',
       'audio/mp4; codecs="opus"',
       'audio/mp4; codecs="flac"',
       'audio/mp4; codecs="dtsc"', // DTS Digital Surround
@@ -601,14 +602,15 @@ shaka.media.MediaSourceEngine = class {
       await this.textEngine_.appendBuffer(
           data,
           reference ? reference.startTime : null,
-          reference ? reference.endTime : null);
+          reference ? reference.endTime : null,
+          reference ? reference.getUris()[0] : null);
       return;
     }
 
     const uint8ArrayData = shaka.util.BufferUtils.toUint8(data);
     let mimeType = this.sourceBufferTypes_[contentType];
     if (this.transmuxers_[contentType]) {
-      mimeType = this.transmuxers_[contentType].getOrginalMimeType();
+      mimeType = this.transmuxers_[contentType].getOriginalMimeType();
     }
     if (shaka.util.TsParser.probe(uint8ArrayData)) {
       const tsParser = new shaka.util.TsParser().parse(uint8ArrayData);

package/lib/media/play_rate_controller.js

@@ -47,6 +47,7 @@ shaka.media.PlayRateController = class {
 
   /** @override */
   release() {
+    this.set(this.getDefaultRate());
     if (this.timer_) {
       this.timer_.stop();
       this.timer_ = null;

package/lib/media/presentation_timeline.js

@@ -288,6 +288,17 @@ shaka.media.PresentationTimeline = class {
   }
 
 
+  /**
+   * Returns if the presentation timeline's start time is locked.
+   *
+   * @return {boolean}
+   * @export
+   */
+  isStartTimeLocked() {
+    return this.startTimeLocked_;
+  }
+
+
   /**
    * Gives PresentationTimeline a Stream's minimum segment start time.
    *

package/lib/media/quality_observer.js

@@ -261,7 +261,7 @@ shaka.media.QualityObserver.QualityChangePosition;
   *
   * @description
   * Contains media quality information for a specific content type
-  * e.g video or audio.
+  * e.g. video or audio.
   *
   * @property {!Array.<shaka.media.QualityObserver.QualityChangePosition>}
   * qualityChangePositions

package/lib/media/segment_reference.js

@@ -27,11 +27,14 @@ shaka.media.InitSegmentReference = class {
    * @param {?number} endByte The offset from the start of the resource
    *   to the end of the segment, inclusive.  A value of null indicates that the
    *   segment extends to the end of the resource.
-   * @param {null|shaka.extern.MediaQualityInfo=} mediaQuality Information about
-   *   the quality of the media associated with this init segment.
-   * @param {number=} timescale
+   * @param {(null|shaka.extern.MediaQualityInfo)=} mediaQuality Information
+   *   about the quality of the media associated with this init segment.
+   * @param {(null|number)=} timescale
+   * @param {?shaka.extern.HlsAes128Key=} aes128Key
+   *  The segment's AES-128-CBC full segment encryption key and iv.
    */
-  constructor(uris, startByte, endByte, mediaQuality = null, timescale) {
+  constructor(uris, startByte, endByte, mediaQuality = null, timescale = null,
+      aes128Key = null) {
     /** @type {function():!Array.<string>} */
     this.getUris = uris;
 
@@ -44,8 +47,11 @@ shaka.media.InitSegmentReference = class {
     /** @const {shaka.extern.MediaQualityInfo|null} */
     this.mediaQuality = mediaQuality;
 
-    /** @type {number|undefined} */
+    /** @type {number|null} */
     this.timescale = timescale;
+
+    /** @type {?shaka.extern.HlsAes128Key} */
+    this.hlsAes128Key = aes128Key;
   }
 
   /**
@@ -101,12 +107,15 @@ shaka.media.InitSegmentReference = class {
    */
   static equal(reference1, reference2) {
     const ArrayUtils = shaka.util.ArrayUtils;
-    if (!reference1 || !reference2) {
+    if (reference1 === reference2) {
+      return true;
+    } else if (!reference1 || !reference2) {
       return reference1 == reference2;
     } else {
       return reference1.getStartByte() == reference2.getStartByte() &&
           reference1.getEndByte() == reference2.getEndByte() &&
-          ArrayUtils.equal(reference1.getUris(), reference2.getUris());
+          ArrayUtils.equal(
+              reference1.getUris().sort(), reference2.getUris().sort());
     }
   }
 };