shaka-player 4.4.2 → 4.5.0

package/lib/dash/segment_template.js

@@ -36,17 +36,19 @@ shaka.dash.SegmentTemplate = class {
    * @param {number} segmentLimit The maximum number of segments to generate for
    *   a SegmentTemplate with fixed duration.
    * @param {!Object.<string, number>} periodDurationMap
+   * @param {shaka.extern.aes128Key|undefined} aes128Key
    * @return {shaka.dash.DashParser.StreamInfo}
    */
   static createStreamInfo(
       context, requestSegment, streamMap, isUpdate, segmentLimit,
-      periodDurationMap) {
+      periodDurationMap, aes128Key) {
     goog.asserts.assert(context.representation.segmentTemplate,
         'Should only be called with SegmentTemplate');
     const SegmentTemplate = shaka.dash.SegmentTemplate;
     const TimelineSegmentIndex = shaka.dash.TimelineSegmentIndex;
 
-    const initSegmentReference = SegmentTemplate.createInitSegment_(context);
+    const initSegmentReference =
+        SegmentTemplate.createInitSegment_(context, aes128Key);
 
     /** @type {shaka.dash.SegmentTemplate.SegmentTemplateInfo} */
     const info = SegmentTemplate.parseSegmentTemplateInfo_(context);
@@ -82,7 +84,7 @@ shaka.dash.SegmentTemplate = class {
         generateSegmentIndex: () => {
           return SegmentTemplate.generateSegmentIndexFromDuration_(
               shallowCopyOfContext, info, segmentLimit, initSegmentReference,
-              periodDurationMap);
+              periodDurationMap, aes128Key);
         },
       };
     } else {
@@ -134,6 +136,7 @@ shaka.dash.SegmentTemplate = class {
             periodEnd,
             initSegmentReference,
             shouldFit,
+            aes128Key,
         );
       } else {
         const tsi = /** @type {!TimelineSegmentIndex} */(segmentIndex);
@@ -299,11 +302,13 @@ shaka.dash.SegmentTemplate = class {
    * @param {number} segmentLimit The maximum number of segments to generate.
    * @param {shaka.media.InitSegmentReference} initSegmentReference
    * @param {!Object.<string, number>} periodDurationMap
+   * @param {shaka.extern.aes128Key|undefined} aes128Key
    * @return {!Promise.<shaka.media.SegmentIndex>}
    * @private
    */
   static generateSegmentIndexFromDuration_(
-      context, info, segmentLimit, initSegmentReference, periodDurationMap) {
+      context, info, segmentLimit, initSegmentReference, periodDurationMap,
+      aes128Key) {
     goog.asserts.assert(info.mediaTemplate,
         'There should be a media template with duration');
 
@@ -419,9 +424,12 @@ shaka.dash.SegmentTemplate = class {
           info.scaledPresentationTimeOffset;
 
       const getUris = () => {
+        let time = segmentMediaTime * timescale;
+        if ('BigInt' in window && time > Number.MAX_SAFE_INTEGER) {
+          time = BigInt(segmentMediaTime) * BigInt(timescale);
+        }
         const mediaUri = MpdUtils.fillUriTemplate(
-            template, id, position, bandwidth,
-            segmentMediaTime * timescale);
+            template, id, position, bandwidth, time);
         return ManifestParserUtils.resolveUris(baseUris, [mediaUri]);
       };
 
@@ -446,7 +454,13 @@ shaka.dash.SegmentTemplate = class {
           initSegmentReference,
           timestampOffset,
           /* appendWindowStart= */ periodStart,
-          /* appendWindowEnd= */ getPeriodEnd());
+          /* appendWindowEnd= */ getPeriodEnd(),
+          /* partialReferences= */ [],
+          /* tilesLayout= */ '',
+          /* tileDuration= */ null,
+          /* syncTime= */ null,
+          shaka.media.SegmentReference.Status.AVAILABLE,
+          aes128Key);
       // This is necessary information for thumbnail streams:
       ref.trueEndTime = trueSegmentEnd;
       return ref;
@@ -505,87 +519,15 @@ shaka.dash.SegmentTemplate = class {
     return Promise.resolve(segmentIndex);
   }
 
-  /**
-   * Creates segment references from a timeline.
-   *
-   * @param {shaka.dash.DashParser.Context} context
-   * @param {shaka.dash.SegmentTemplate.SegmentTemplateInfo} info
-   * @param {shaka.media.InitSegmentReference} initSegmentReference
-   * @return {!Array.<!shaka.media.SegmentReference>}
-   * @private
-   */
-  static createFromTimeline_(context, info, initSegmentReference) {
-    const MpdUtils = shaka.dash.MpdUtils;
-    const ManifestParserUtils = shaka.util.ManifestParserUtils;
-
-    const periodStart = context.periodInfo.start;
-    const periodDuration = context.periodInfo.duration;
-
-    const timestampOffset = periodStart - info.scaledPresentationTimeOffset;
-    const appendWindowStart = periodStart;
-    const appendWindowEnd = periodDuration ?
-        periodStart + periodDuration : Infinity;
-
-    /** @type {!Array.<!shaka.media.SegmentReference>} */
-    const references = [];
-    for (let i = 0; i < info.timeline.length; i++) {
-      const {start, unscaledStart, end} = info.timeline[i];
-
-      // Note: i = k - 1, where k indicates the k'th segment listed in the MPD.
-      // (See section 5.3.9.5.3 of the DASH spec.)
-      const segmentReplacement = i + info.startNumber;
-
-      // Consider the presentation time offset in segment uri computation
-      const timeReplacement = unscaledStart +
-          info.unscaledPresentationTimeOffset;
-      const repId = context.representation.id;
-      const bandwidth = context.bandwidth || null;
-      const mediaTemplate = info.mediaTemplate;
-      const baseUris = context.representation.baseUris;
-
-      // This callback must not capture any non-local
-      // variables, such as info, context, etc.  Make
-      // sure any values you reference here have
-      // been assigned to local variables within the
-      // loop, or else we will end up with a leak.
-      const createUris =
-          () => {
-            goog.asserts.assert(
-                mediaTemplate,
-                'There should be a media template with a timeline');
-            const mediaUri = MpdUtils.fillUriTemplate(
-                mediaTemplate, repId,
-                segmentReplacement, bandwidth || null, timeReplacement);
-            return ManifestParserUtils
-                .resolveUris(baseUris, [mediaUri])
-                .map((g) => {
-                  return g.toString();
-                });
-          };
-
-      references.push(new shaka.media.SegmentReference(
-          periodStart + start,
-          periodStart + end,
-          createUris,
-          /* startByte= */ 0,
-          /* endByte= */ null,
-          initSegmentReference,
-          timestampOffset,
-          appendWindowStart,
-          appendWindowEnd));
-    }
-
-    return references;
-  }
-
   /**
    * Creates an init segment reference from a context object.
    *
    * @param {shaka.dash.DashParser.Context} context
+   * @param {shaka.extern.aes128Key|undefined} aes128Key
    * @return {shaka.media.InitSegmentReference}
    * @private
    */
-  static createInitSegment_(context) {
+  static createInitSegment_(context, aes128Key) {
     const MpdUtils = shaka.dash.MpdUtils;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
     const SegmentTemplate = shaka.dash.SegmentTemplate;
@@ -608,7 +550,14 @@ shaka.dash.SegmentTemplate = class {
       return resolvedUris;
     };
     const qualityInfo = shaka.dash.SegmentBase.createQualityInfo(context);
-    return new shaka.media.InitSegmentReference(getUris, 0, null, qualityInfo);
+    return new shaka.media.InitSegmentReference(
+        getUris,
+        /* startByte= */ 0,
+        /* endByte= */ null,
+        qualityInfo,
+        /* timescale= */ null,
+        /* segmentData= */ null,
+        aes128Key);
   }
 };
 
@@ -635,10 +584,11 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @param {number} periodEnd
    * @param {shaka.media.InitSegmentReference} initSegmentReference
    * @param {boolean} shouldFit
-   *
+   * @param {shaka.extern.aes128Key|undefined} aes128Key
   */
   constructor(templateInfo, representationId, bandwidth, baseUris,
-      periodStart, periodEnd, initSegmentReference, shouldFit) {
+      periodStart, periodEnd, initSegmentReference, shouldFit,
+      aes128Key) {
     super([]);
 
     /** @private {?shaka.dash.SegmentTemplate.SegmentTemplateInfo} */
@@ -655,6 +605,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     this.periodEnd_ = periodEnd;
     /** @private {shaka.media.InitSegmentReference} */
     this.initSegmentReference_ = initSegmentReference;
+    /** @private {shaka.extern.aes128Key|undefined} */
+    this.aes128Key_ = aes128Key;
 
 
     if (shouldFit) {
@@ -894,7 +846,13 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
           this.initSegmentReference_,
           timestampOffset,
           this.periodStart_,
-          this.periodEnd_);
+          this.periodEnd_,
+          /* partialReferences= */ [],
+          /* tilesLayout= */ '',
+          /* tileDuration= */ null,
+          /* syncTime= */ null,
+          shaka.media.SegmentReference.Status.AVAILABLE,
+          this.aes128Key_);
       this.references[correctedPosition] = ref;
     }
 

package/lib/dependencies/all.js

@@ -6,6 +6,8 @@
 
 goog.provide('shaka.dependencies');
 
+goog.require('shaka.Deprecate');
+
 /**
  * @export
  */
@@ -22,6 +24,12 @@ shaka.dependencies = class {
     if (!shaka.dependencies.Allowed[key]) {
       throw new Error(`${key} is not supported`);
     }
+    if (key == shaka.dependencies.Allowed.muxjs) {
+      shaka.Deprecate.deprecateFeature(5,
+          'mux.js',
+          'mux.js is no longer used in Shaka Player.');
+      return;
+    }
     shaka.dependencies.dependencies_.set(key, () => dep);
   }
 
@@ -36,12 +44,6 @@ shaka.dependencies = class {
     return shaka.dependencies.dependencies_.has(key);
   }
 
-  /** @return {?muxjs} */
-  static muxjs() {
-    return /** @type {?muxjs} */ (shaka.dependencies.dependencies_.get(
-        shaka.dependencies.Allowed.muxjs)());
-  }
-
   /** @return {?ISOBoxer} */
   static isoBoxer() {
     return /** @type {?ISOBoxer} */ (shaka.dependencies.dependencies_.get(
@@ -65,6 +67,5 @@ shaka.dependencies.Allowed = {
  * @private {!Map.<shaka.dependencies.Allowed, function():?>}
  */
 shaka.dependencies.dependencies_ = new Map([
-  [shaka.dependencies.Allowed.muxjs, () => window.muxjs],
   [shaka.dependencies.Allowed.ISOBoxer, () => window.ISOBoxer],
 ]);

package/lib/hls/hls_parser.js

@@ -9,6 +9,7 @@ goog.provide('shaka.hls.HlsParser');
 
 goog.require('goog.Uri');
 goog.require('goog.asserts');
+goog.require('shaka.abr.Ewma');
 goog.require('shaka.hls.ManifestTextParser');
 goog.require('shaka.hls.Playlist');
 goog.require('shaka.hls.PlaylistType');
@@ -215,6 +216,13 @@ shaka.hls.HlsParser = class {
 
     /** @private {boolean} */
     this.lowLatencyByterangeOptimization_ = false;
+
+    /**
+     * An ewma that tracks how long updates take.
+     * This is to mitigate issues caused by slow parsing on embedded devices.
+     * @private {!shaka.abr.Ewma}
+     */
+    this.averageUpdateDuration_ = new shaka.abr.Ewma(5);
   }
 
 
@@ -787,7 +795,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.getUpdatePlaylistDelay_();
         this.updatePlaylistTimer_.tickAfter(/* seconds= */ delay);
       }
@@ -856,7 +864,7 @@ shaka.hls.HlsParser = class {
 
     let segmentUris = [firstSegment.absoluteUri];
     const initSegmentRef = this.getInitSegmentReference_(
-        playlist.absoluteUri, firstSegment.tags, new Map());
+        playlist, firstSegment.tags, new Map());
     if (initSegmentRef) {
       segmentUris = initSegmentRef.getUris();
     }
@@ -932,7 +940,11 @@ shaka.hls.HlsParser = class {
         hasVideo = true;
         break;
       case 'hvc':
-        codecs.push('hvc1.1.6.L93.90');
+        if (videoInfo.codec) {
+          codecs.push(videoInfo.codec);
+        } else {
+          codecs.push('hvc1.1.6.L93.90');
+        }
         hasVideo = true;
         break;
     }
@@ -1781,7 +1793,13 @@ shaka.hls.HlsParser = class {
       goog.asserts.assert(tag.name == 'EXT-X-MEDIA',
           'Should only be called on media tags!');
       const languageValue = tag.getAttributeValue('LANGUAGE');
-      const language = this.getLanguage_(languageValue);
+      let language = this.getLanguage_(languageValue);
+      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.
@@ -1790,7 +1808,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());
       }
@@ -2054,7 +2074,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.
@@ -2485,6 +2505,7 @@ shaka.hls.HlsParser = class {
     return {
       id: this.globalId_++,
       originalId: name,
+      groupId: null,
       createSegmentIndex: () => Promise.resolve(),
       segmentIndex: null,
       mimeType,
@@ -2587,7 +2608,7 @@ shaka.hls.HlsParser = class {
   /**
    * @param {!shaka.hls.Tag} drmTag
    * @param {!shaka.hls.Playlist} playlist
-   * @return {!shaka.extern.HlsAes128Key}
+   * @return {!shaka.extern.aes128Key}
    * @private
    */
   parseAES128DrmTag_(drmTag, playlist) {
@@ -2621,7 +2642,7 @@ shaka.hls.HlsParser = class {
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MANIFEST,
-            shaka.util.Error.Code.HLS_AES_128_INVALID_IV_LENGTH);
+            shaka.util.Error.Code.AES_128_INVALID_IV_LENGTH);
       }
     }
 
@@ -2644,7 +2665,7 @@ shaka.hls.HlsParser = class {
         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);
+            shaka.util.Error.Code.AES_128_INVALID_KEY_LENGTH);
       }
 
       const algorithm = {
@@ -2770,9 +2791,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.
@@ -2795,8 +2817,12 @@ shaka.hls.HlsParser = class {
     } else if (this.presentationDelay_) {
       presentationDelay = this.presentationDelay_;
     } 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);
@@ -2806,13 +2832,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');
 
@@ -2823,7 +2849,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 = [
@@ -2831,8 +2857,18 @@ shaka.hls.HlsParser = class {
       mapTag.getAttributeValue('BYTERANGE', ''),
     ].join('-');
     if (!this.mapTagToInitSegmentRefMap_.has(mapTagKey)) {
+      /** @type {shaka.extern.aes128Key|undefined} */
+      let aes128Key = undefined;
+      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);
+          }
+        }
+      }
       const initSegmentRef = this.createInitSegmentReference_(
-          absoluteInitSegmentUri, mapTag);
+          absoluteInitSegmentUri, mapTag, aes128Key);
       this.mapTagToInitSegmentRefMap_.set(mapTagKey, initSegmentRef);
     }
     return this.mapTagToInitSegmentRefMap_.get(mapTagKey);
@@ -2843,10 +2879,11 @@ shaka.hls.HlsParser = class {
    * playlist.
    * @param {string} absoluteInitSegmentUri
    * @param {!shaka.hls.Tag} mapTag EXT-X-MAP
+   * @param {shaka.extern.aes128Key=} aes128Key
    * @return {!shaka.media.InitSegmentReference}
    * @private
    */
-  createInitSegmentReference_(absoluteInitSegmentUri, mapTag) {
+  createInitSegmentReference_(absoluteInitSegmentUri, mapTag, aes128Key) {
     let startByte = 0;
     let endByte = null;
     const byterange = mapTag.getAttributeValue('BYTERANGE');
@@ -2857,12 +2894,26 @@ 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,
+        /* segmentData= */ null,
+        aes128Key);
     return initSegmentRef;
   }
 
@@ -2877,15 +2928,13 @@ shaka.hls.HlsParser = class {
    * @param {string} absoluteMediaPlaylistUri
    * @param {string} type
    * @param {string} mimeType
-   * @param {number} timestampOffset
-   * @param {shaka.extern.HlsAes128Key=} hlsAes128Key
+   * @param {shaka.extern.aes128Key=} aes128Key
    * @return {shaka.media.SegmentReference}
    * @private
    */
   createSegmentReference_(
       initSegmentReference, previousReference, hlsSegment, startTime,
-      variables, absoluteMediaPlaylistUri, type, mimeType, timestampOffset,
-      hlsAes128Key) {
+      variables, absoluteMediaPlaylistUri, type, mimeType, aes128Key) {
     const tags = hlsSegment.tags;
     const extinfTag =
         shaka.hls.Utils.getFirstTagWithName(tags, 'EXTINF');
@@ -3022,7 +3071,7 @@ shaka.hls.HlsParser = class {
             pStartByte,
             pEndByte,
             initSegmentReference,
-            /* timestampOffset= */ 0, // This value is ignored in sequence mode.
+            /* timestampOffset= */ 0,
             /* appendWindowStart= */ 0,
             /* appendWindowEnd= */ Infinity,
             /* partialReferences= */ [],
@@ -3030,7 +3079,7 @@ shaka.hls.HlsParser = class {
             /* tileDuration= */ null,
             partialSyncTime,
             partialStatus,
-            hlsAes128Key);
+            aes128Key);
         if (item.name == 'EXT-X-PRELOAD-HINT') {
           partial.markAsPreload();
           isPreloadSegment = true;
@@ -3067,8 +3116,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 (segmentWithByteRangeOptimization) {
@@ -3131,7 +3183,7 @@ shaka.hls.HlsParser = class {
         startByte,
         endByte,
         initSegmentReference,
-        timestampOffset, // This value is ignored in sequence mode.
+        /* timestampOffset= */ 0,
         /* appendWindowStart= */ 0,
         /* appendWindowEnd= */ Infinity,
         partialSegmentRefs,
@@ -3139,7 +3191,7 @@ shaka.hls.HlsParser = class {
         tileDuration,
         syncTime,
         status,
-        hlsAes128Key,
+        aes128Key,
     );
 
     if (segmentWithByteRangeOptimization) {
@@ -3206,8 +3258,8 @@ shaka.hls.HlsParser = class {
     /** @type {shaka.media.InitSegmentReference} */
     let initSegmentRef;
 
-    /** @type {shaka.extern.HlsAes128Key|undefined} */
-    let hlsAes128Key = undefined;
+    /** @type {shaka.extern.aes128Key|undefined} */
+    let aes128Key = undefined;
 
     let discontinuitySequence = shaka.hls.Utils.getFirstTagWithNameAsNumber(
         playlist.tags, 'EXT-X-DISCONTINUITY-SEQUENCE', 0);
@@ -3230,7 +3282,6 @@ shaka.hls.HlsParser = class {
     const references = [];
 
     let previousReference = null;
-    let lastDiscontinuityStartTime = firstStartTime;
 
     /** @type {!Array.<{bitrate: number, duration: number}>} */
     const bitrates = [];
@@ -3245,23 +3296,22 @@ 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.
       for (const drmTag of item.tags) {
         if (drmTag.name == 'EXT-X-KEY') {
           if (drmTag.getRequiredAttrValue('METHOD') == 'AES-128') {
-            hlsAes128Key = this.parseAES128DrmTag_(drmTag, playlist);
+            aes128Key = this.parseAES128DrmTag_(drmTag, playlist);
           } else {
-            hlsAes128Key = undefined;
+            aes128Key = undefined;
           }
         }
       }
 
       mediaSequenceToStartTime.set(position, startTime);
 
-      initSegmentRef = this.getInitSegmentReference_(playlist.absoluteUri,
+      initSegmentRef = this.getInitSegmentReference_(playlist,
           item.tags, variables);
 
       // If the stream is low latency and the user has not configured the
@@ -3285,8 +3335,7 @@ shaka.hls.HlsParser = class {
           playlist.absoluteUri,
           type,
           mimeType,
-          lastDiscontinuityStartTime,
-          hlsAes128Key);
+          aes128Key);
 
       if (reference) {
         const bitrate = shaka.hls.Utils.getFirstTagWithNameAsNumber(
@@ -3654,12 +3703,20 @@ shaka.hls.HlsParser = class {
     }
 
     try {
+      const startTime = Date.now();
       await this.update();
 
+      // Keep track of how long the longest manifest update took.
+      const endTime = Date.now();
+
       // This may have converted to VOD, in which case we stop updating.
       if (this.isLive_()) {
+        const updateDuration = (endTime - startTime) / 1000.0;
+        this.averageUpdateDuration_.sample(1, updateDuration);
         const delay = this.getUpdatePlaylistDelay_();
-        this.updatePlaylistTimer_.tickAfter(/* seconds= */ delay);
+        const finalDelay = Math.max(0,
+            delay - this.averageUpdateDuration_.getEstimate());
+        this.updatePlaylistTimer_.tickAfter(/* seconds= */ finalDelay);
       }
     } catch (error) {
       // Detect a call to stop() during this.update()
@@ -3682,6 +3739,13 @@ shaka.hls.HlsParser = class {
       // Try again very soon.
       this.updatePlaylistTimer_.tickAfter(/* seconds= */ 0.1);
     }
+
+    // Detect a call to stop()
+    if (!this.playerInterface_) {
+      return;
+    }
+
+    this.playerInterface_.onManifestUpdated();
   }