shaka-player 3.3.1 → 3.3.4

package/lib/dash/dash_parser.js

@@ -22,7 +22,6 @@ goog.require('shaka.text.TextEngine');
 goog.require('shaka.util.CmcdManager');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
@@ -104,7 +103,7 @@ shaka.dash.DashParser = class {
 
     /**
      * Period IDs seen in previous manifest.
-     * @private {!Array.<number>}
+     * @private {!Array.<string>}
      */
     this.lastManifestUpdatePeriodIds_ = [];
 
@@ -383,7 +382,7 @@ shaka.dash.DashParser = class {
       // This gives us confidence that our state is maintained correctly, and
       // that the complex logic of multi-Period eviction and period-flattening
       // is correct.  See also:
-      // https://github.com/google/shaka-player/issues/3169#issuecomment-823580634
+      // https://github.com/shaka-project/shaka-player/issues/3169#issuecomment-823580634
       for (const stream of Object.values(this.streamMap_)) {
         if (stream.segmentIndex) {
           stream.segmentIndex.evict(
@@ -410,6 +409,24 @@ shaka.dash.DashParser = class {
           this.config_.dash.autoCorrectDrift);
     }
 
+    presentationTimeline.setStatic(mpdType == 'static');
+
+    const isLive = presentationTimeline.isLive();
+
+    // If it's live, we check for an override.
+    if (isLive && !isNaN(this.config_.availabilityWindowOverride)) {
+      segmentAvailabilityDuration = this.config_.availabilityWindowOverride;
+    }
+
+    // If it's null, that means segments are always available.  This is always
+    // the case for VOD, and sometimes the case for live.
+    if (segmentAvailabilityDuration == null) {
+      segmentAvailabilityDuration = Infinity;
+    }
+
+    presentationTimeline.setSegmentAvailabilityDuration(
+        segmentAvailabilityDuration);
+
     const profiles = mpd.getAttribute('profiles') || '';
 
     /** @type {shaka.dash.DashParser.Context} */
@@ -432,7 +449,6 @@ shaka.dash.DashParser = class {
     const duration = periodsAndDuration.duration;
     const periods = periodsAndDuration.periods;
 
-    presentationTimeline.setStatic(mpdType == 'static');
     if (mpdType == 'static' ||
         !periodsAndDuration.durationDerivedFromPeriods) {
       // Ignore duration calculated from Period lengths if this is dynamic.
@@ -451,6 +467,7 @@ shaka.dash.DashParser = class {
         this.lowLatencyMode_ = this.playerInterface_.isLowLatencyMode();
       }
     }
+
     if (this.lowLatencyMode_) {
       presentationTimeline.setAvailabilityTimeOffset(
           this.minTotalAvailabilityTimeOffset_);
@@ -464,22 +481,6 @@ shaka.dash.DashParser = class {
         'https://bit.ly/3clctcj for details.');
     }
 
-    const isLive = presentationTimeline.isLive();
-
-    // If it's live, we check for an override.
-    if (isLive && !isNaN(this.config_.availabilityWindowOverride)) {
-      segmentAvailabilityDuration = this.config_.availabilityWindowOverride;
-    }
-
-    // If it's null, that means segments are always available.  This is always
-    // the case for VOD, and sometimes the case for live.
-    if (segmentAvailabilityDuration == null) {
-      segmentAvailabilityDuration = Infinity;
-    }
-
-    presentationTimeline.setSegmentAvailabilityDuration(
-        segmentAvailabilityDuration);
-
     // Use @maxSegmentDuration to override smaller, derived values.
     presentationTimeline.notifyMaxSegmentDuration(maxSegmentDuration || 1);
     if (goog.DEBUG) {
@@ -553,10 +554,9 @@ shaka.dash.DashParser = class {
     const periods = [];
     let prevEnd = 0;
     const periodNodes = XmlUtils.findChildren(mpd, 'Period');
-    // This uses a for-loop rather than a for-of loop because this needs to look
-    // ahead to the next element.
-    const enumerate = (it) => shaka.util.Iterables.enumerate(it);
-    for (const {i, item: elem, next} of enumerate(periodNodes)) {
+    for (let i = 0; i < periodNodes.length; i++) {
+      const elem = periodNodes[i];
+      const next = periodNodes[i + 1];
       const start = /** @type {number} */ (
         XmlUtils.parseAttr(elem, 'start', XmlUtils.parseDuration, prevEnd));
       const periodId = elem.id;
@@ -714,8 +714,12 @@ shaka.dash.DashParser = class {
 
     const eventStreamNodes =
         XmlUtils.findChildren(periodInfo.node, 'EventStream');
+    const availabilityStart =
+        context.presentationTimeline.getSegmentAvailabilityStart();
+
     for (const node of eventStreamNodes) {
-      this.parseEventStream_(periodInfo.start, periodInfo.duration, node);
+      this.parseEventStream_(
+          periodInfo.start, periodInfo.duration, node, availabilityStart);
     }
 
     const adaptationSetNodes =
@@ -758,7 +762,7 @@ shaka.dash.DashParser = class {
           for (const stream of normalSet.streams) {
             // There may be multiple trick mode streams, but we do not
             // currently support that.  Just choose one.
-            // TODO: https://github.com/google/shaka-player/issues/1528
+            // TODO: https://github.com/shaka-project/shaka-player/issues/1528
             stream.trickModeVideo = trickModeSet.streams.find((trickStream) =>
               shaka.util.MimeUtils.getCodecBase(stream.codecs) ==
               shaka.util.MimeUtils.getCodecBase(trickStream.codecs));
@@ -1151,7 +1155,7 @@ shaka.dash.DashParser = class {
     // does not make sense in the DASH spec's bandwidth formulas.
     // In some content, however, the attribute is missing or zero.
     // To avoid NaN at the variant level on broken content, fall back to zero.
-    // https://github.com/google/shaka-player/issues/938#issuecomment-317278180
+    // https://github.com/shaka-project/shaka-player/issues/938#issuecomment-317278180
     context.bandwidth =
         XmlUtils.parseAttr(node, 'bandwidth', XmlUtils.parsePositiveInt) || 0;
 
@@ -1230,7 +1234,7 @@ shaka.dash.DashParser = class {
 
     let forced = false;
     if (isText) {
-      // See: https://github.com/google/shaka-player/issues/2122 and
+      // See: https://github.com/shaka-project/shaka-player/issues/2122 and
       // https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/165
       forced = roles.includes('forced_subtitle') ||
           roles.includes('forced-subtitle');
@@ -1378,7 +1382,7 @@ shaka.dash.DashParser = class {
     // NOTE: An updatePeriod_ of -1 means the attribute was missing.
     // An attribute which is present and set to 0 should still result in
     // periodic updates.  For more, see:
-    // https://github.com/google/shaka-player/issues/331
+    // https://github.com/shaka-project/shaka-player/issues/331
     if (this.updatePeriod_ < 0) {
       return;
     }
@@ -1769,9 +1773,10 @@ shaka.dash.DashParser = class {
    * @param {number} periodStart
    * @param {?number} periodDuration
    * @param {!Element} elem
+   * @param {number} availabilityStart
    * @private
    */
-  parseEventStream_(periodStart, periodDuration, elem) {
+  parseEventStream_(periodStart, periodDuration, elem, availabilityStart) {
     const XmlUtils = shaka.util.XmlUtils;
     const parseNumber = XmlUtils.parseNonNegativeInt;
 
@@ -1794,6 +1799,11 @@ shaka.dash.DashParser = class {
         endTime = Math.min(endTime, periodStart + periodDuration);
       }
 
+      // Don't add unavailable regions to the timeline.
+      if (endTime < availabilityStart) {
+        continue;
+      }
+
       /** @type {shaka.extern.TimelineRegionInfo} */
       const region = {
         schemeIdUri: schemeIdUri,

package/lib/dash/mpd_utils.js

@@ -12,7 +12,6 @@ goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.AbortableOperation');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.XmlUtils');
 goog.requireType('shaka.dash.DashParser');
@@ -142,8 +141,9 @@ shaka.dash.MpdUtils = class {
     const timeline = [];
     let lastEndTime = -unscaledPresentationTimeOffset;
 
-    const enumerate = (it) => shaka.util.Iterables.enumerate(it);
-    for (const {item: timePoint, next} of enumerate(timePoints)) {
+    for (let i = 0; i < timePoints.length; ++i) {
+      const timePoint = timePoints[i];
+      const next = timePoints[i + 1];
       let t = XmlUtils.parseAttr(timePoint, 't', XmlUtils.parseNonNegativeInt);
       const d =
           XmlUtils.parseAttr(timePoint, 'd', XmlUtils.parseNonNegativeInt);
@@ -225,8 +225,7 @@ shaka.dash.MpdUtils = class {
         timeline[timeline.length - 1].end = startTime / timescale;
       }
 
-      for (const _ of shaka.util.Iterables.range(repeat + 1)) {
-        shaka.util.Functional.ignored(_);
+      for (let j = 0; j <= repeat; ++j) {
         const endTime = startTime + d;
         const item = {
           start: startTime / timescale,

package/lib/dash/segment_list.js

@@ -15,7 +15,6 @@ goog.require('shaka.media.SegmentIndex');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.XmlUtils');
 goog.requireType('shaka.dash.DashParser');
@@ -222,7 +221,7 @@ shaka.dash.SegmentList = class {
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     const references = [];
     let prevEndTime = info.startTime;
-    for (const i of shaka.util.Iterables.range(max)) {
+    for (let i = 0; i < max; i++) {
       const segment = info.mediaSegments[i];
       const mediaUri = ManifestParserUtils.resolveUris(
           baseUris, [segment.mediaUri]);

package/lib/dash/segment_template.js

@@ -14,7 +14,6 @@ goog.require('shaka.media.InitSegmentReference');
 goog.require('shaka.media.SegmentIndex');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.util.Error');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.ObjectUtils');
 goog.requireType('shaka.dash.DashParser');
@@ -504,8 +503,9 @@ shaka.dash.SegmentTemplate = class {
 
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     const references = [];
-    const enum_ = (it) => shaka.util.Iterables.enumerate(it);
-    for (const {i, item: {start, unscaledStart, end}} of enum_(info.timeline)) {
+    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;

package/lib/hls/hls_parser.js

@@ -30,7 +30,6 @@ goog.require('shaka.util.DataViewReader');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
@@ -919,7 +918,7 @@ shaka.hls.HlsParser = class {
       // the content. This means that if the content changes profiles, it should
       // include both. Since all known browsers support changing profiles
       // without any other work, just ignore them.  See also:
-      // https://github.com/google/shaka-player/issues/1817
+      // https://github.com/shaka-project/shaka-player/issues/1817
       const shortCodec = shaka.util.MimeUtils.getCodecBase(codec);
       if (!seen.has(shortCodec)) {
         ret.push(codec);
@@ -1760,8 +1759,8 @@ shaka.hls.HlsParser = class {
     // Create SegmentReferences for the partial segments.
     const partialSegmentRefs = [];
     if (this.lowLatencyMode_ && hlsSegment.partialSegments.length) {
-      const enumerate = (it) => shaka.util.Iterables.enumerate(it);
-      for (const {i, item} of enumerate(hlsSegment.partialSegments)) {
+      for (let i = 0; i < hlsSegment.partialSegments.length; i++) {
+        const item = hlsSegment.partialSegments[i];
         const pPreviousReference = i == 0 ?
           previousReference : partialSegmentRefs[partialSegmentRefs.length - 1];
         const pStartTime = (i == 0) ? startTime : pPreviousReference.endTime;
@@ -1782,6 +1781,9 @@ shaka.hls.HlsParser = class {
             this.parseByteRange_(pPreviousReference, pByterange);
         }
         const pUri = item.getAttributeValue('URI');
+        if (!pUri) {
+          continue;
+        }
         const pAbsoluteUri = shaka.hls.Utils.constructAbsoluteUri(
             absoluteMediaPlaylistUri, pUri);
 
@@ -1989,9 +1991,9 @@ shaka.hls.HlsParser = class {
         // With delta updates, the DISCONTINUITY may be skipped. Check if
         // the discontintuity Sequence Number based on the media sequence
         // number.
-        while (discontinuityToMediaSequence.has(discontintuitySequenceNum + 1)
-            && discontinuityToMediaSequence.get(discontintuitySequenceNum + 1) <
-            position) {
+        const disconMap = discontinuityToMediaSequence;
+        while (disconMap.has(discontintuitySequenceNum + 1) &&
+            disconMap.get(discontintuitySequenceNum + 1) < position) {
           discontintuitySequenceNum++;
         }
       }
@@ -2002,8 +2004,8 @@ shaka.hls.HlsParser = class {
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     const references = [];
 
-    const enumerate = (it) => shaka.util.Iterables.enumerate(it);
-    for (const {i, item} of enumerate(hlsSegments)) {
+    for (let i = 0; i < hlsSegments.length; i++) {
+      const item = hlsSegments[i];
       const previousReference = references[references.length - 1];
       const startTime = (i == 0) ? firstStartTime :
         previousReference.endTime;

package/lib/hls/manifest_text_parser.js

@@ -13,7 +13,6 @@ goog.require('shaka.hls.Segment');
 goog.require('shaka.hls.Tag');
 goog.require('shaka.hls.Utils');
 goog.require('shaka.util.Error');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.StringUtils');
 goog.require('shaka.util.TextParser');
 
@@ -82,8 +81,9 @@ shaka.hls.ManifestTextParser = class {
     const tags = [];
     // Initialize to "true" to skip the first element.
     skip = true;
-    const enumerate = (it) => shaka.util.Iterables.enumerate(it);
-    for (const {i, item: line, next} of enumerate(lines)) {
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      const next = lines[i + 1];
       // Skip comments
       if (shaka.hls.Utils.isComment(line) || skip) {
         skip = false;
@@ -277,6 +277,7 @@ shaka.hls.ManifestTextParser = class {
         const attrValue = blockAttrs[2] || blockAttrs[3];
         const attribute = new shaka.hls.Attribute(attrName, attrValue);
         attributes.push(attribute);
+        parser.skipWhitespace();
       }
     }
 

package/lib/media/adaptation_set.js

@@ -8,7 +8,6 @@ goog.provide('shaka.media.AdaptationSet');
 
 goog.require('goog.asserts');
 goog.require('shaka.log');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.MimeUtils');
 
 
@@ -215,7 +214,7 @@ shaka.media.AdaptationSet = class {
     codecsA.sort();
     codecsB.sort();
 
-    for (const i of shaka.util.Iterables.range(codecsA.length)) {
+    for (let i = 0; i < codecsA.length; i++) {
       if (codecsA[i] != codecsB[i]) {
         return false;
       }

package/lib/media/content_workarounds.js

@@ -31,7 +31,7 @@ shaka.media.ContentWorkarounds = class {
    *
    * @param {!BufferSource} initSegmentBuffer
    * @return {!Uint8Array}
-   * @see https://github.com/google/shaka-player/issues/2759
+   * @see https://github.com/shaka-project/shaka-player/issues/2759
    */
   static fakeEncryption(initSegmentBuffer) {
     const ContentWorkarounds = shaka.media.ContentWorkarounds;
@@ -283,7 +283,7 @@ shaka.media.ContentWorkarounds = class {
  *
  * @const {!shaka.util.Lazy.<!Uint8Array>}
  * @private
- * @see https://github.com/google/shaka-player/issues/2759
+ * @see https://github.com/shaka-project/shaka-player/issues/2759
  */
 shaka.media.ContentWorkarounds.CANNED_SINF_BOX_ =
     new shaka.util.Lazy(() => new Uint8Array([

package/lib/media/drm_engine.js

@@ -655,7 +655,7 @@ shaka.media.DrmEngine = class {
     // first MIME type even if the others are supported.  To work around this,
     // we say that Edge supports everything.
     //
-    // See https://github.com/google/shaka-player/issues/1495 for details.
+    // See https://github.com/shaka-project/shaka-player/issues/1495 for details.
     if (shaka.util.Platform.isLegacyEdge()) {
       return true;
     }
@@ -667,7 +667,8 @@ shaka.media.DrmEngine = class {
       // Some Tizen devices seem to misreport AC-3 support.  This works around
       // the issue, by falling back to EC-3, which seems to be supported on the
       // same devices and be correctly reported in all cases we have observed.
-      // See https://github.com/google/shaka-player/issues/2989 for details.
+      // See https://github.com/shaka-project/shaka-player/issues/2989 for
+      // details.
       const fallback = contentType.replace('ac-3', 'ec-3');
       return this.supportedTypes_.has(contentType) ||
              this.supportedTypes_.has(fallback);

package/lib/media/media_source_engine.js

@@ -830,7 +830,8 @@ shaka.media.MediaSourceEngine = class {
    * @private
    */
   setTimestampOffset_(contentType, timestampOffset) {
-    // Work around for https://github.com/google/shaka-player/issues/1281:
+    // Work around for
+    // https://github.com/shaka-project/shaka-player/issues/1281:
     // TODO(https://bit.ly/2ttKiBU): follow up when this is fixed in Edge
     if (timestampOffset < 0) {
       // Try to prevent rounding errors in Edge from removing the first
@@ -1100,7 +1101,7 @@ shaka.media.MediaSourceEngine = class {
     // then insert fake encryption metadata for init segments that lack it.
     // The MP4 requirement is because we can currently only do this
     // transformation on MP4 containers.
-    // See: https://github.com/google/shaka-player/issues/2759
+    // See: https://github.com/shaka-project/shaka-player/issues/2759
     if (isInitSegment &&
         encryptionExpected &&
         shaka.util.Platform.requiresEncryptionInfoInAllInitSegments() &&

package/lib/media/mp4_segment_index_parser.js

@@ -11,8 +11,6 @@ goog.require('shaka.log');
 goog.require('shaka.media.InitSegmentReference');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.util.Error');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.Mp4Parser');
 
 
@@ -123,8 +121,7 @@ shaka.media.Mp4SegmentIndexParser = class {
     let unscaledStartTime = earliestPresentationTime;
     let startByte = sidxOffset + box.size + firstOffset;
 
-    for (const _ of shaka.util.Iterables.range(referenceCount)) {
-      shaka.util.Functional.ignored(_);
+    for (let i = 0; i < referenceCount; i++) {
       // |chunk| is 1 bit for |referenceType|, and 31 bits for |referenceSize|.
       const chunk = box.reader.readUint32();
       const referenceType = (chunk & 0x80000000) >>> 31;

package/lib/media/playhead.js

@@ -256,7 +256,7 @@ shaka.media.MediaSourcePlayhead = class {
     // We don't buffer when the livestream video is paused and the playhead time
     // is out of the seek range; thus, we do not clamp the current time when the
     // video is paused.
-    // https://github.com/google/shaka-player/issues/1121
+    // https://github.com/shaka-project/shaka-player/issues/1121
     if (this.mediaElement_.readyState > 0 && !this.mediaElement_.paused) {
       return this.clampTime_(time);
     }
@@ -362,7 +362,7 @@ shaka.media.MediaSourcePlayhead = class {
    * presentation duration.  Seeking to or starting at duration does not work
    * consistently across browsers.
    *
-   * @see https://github.com/google/shaka-player/issues/979
+   * @see https://github.com/shaka-project/shaka-player/issues/979
    * @param {number} time
    * @return {number} The adjusted seek time.
    * @private

package/lib/media/presentation_timeline.js

@@ -355,14 +355,23 @@ shaka.media.PresentationTimeline = class {
    * starting after this time should be assumed to be unavailable.
    *
    * @return {number} The current segment availability end time, in seconds,
-   *   relative to the start of the presentation.  Always returns the
-   *   presentation's duration for video-on-demand.
+   *   relative to the start of the presentation.  For VOD, the availability
+   *   end time is the content's duration.  If the Player's playRangeEnd
+   *   configuration is used, this can override the duration.
    * @export
    */
   getSegmentAvailabilityEnd() {
     if (!this.isLive() && !this.isInProgress()) {
       // It's a static manifest (can also be a dynamic->static conversion)
-      return this.maxSegmentEndTime_ || this.duration_;
+      if (this.maxSegmentEndTime_) {
+        // If we know segment times, use the min of that and duration.
+        // Note that the playRangeEnd configuration changes this.duration_.
+        // See https://github.com/shaka-project/shaka-player/issues/4026
+        return Math.min(this.maxSegmentEndTime_, this.duration_);
+      } else {
+        // If we don't have segment times, use duration.
+        return this.duration_;
+      }
     }
     // Can be either live or "in-progress recording" (live with known duration)
     return Math.min(this.getLiveEdge_() + this.availabilityTimeOffset_,
@@ -389,10 +398,11 @@ shaka.media.PresentationTimeline = class {
     // For VOD, the offset and end time are ignored, and we just return the
     // earliest segment time.  All segments are "safe" in VOD.  However, we
     // should round up to the nearest millisecond to avoid issues like
-    // https://github.com/google/shaka-player/issues/2831, in which we tried to
-    // seek repeatedly to catch up to the seek range, and never actually
-    // "arrived" within it.  The video's currentTime is not as accurate as the
-    // JS number representing the earliest segment time for some content.
+    // https://github.com/shaka-project/shaka-player/issues/2831, in which we
+    // tried to seek repeatedly to catch up to the seek range, and never
+    // actually "arrived" within it.  The video's currentTime is not as
+    // accurate as the JS number representing the earliest segment time for
+    // some content.
     if (this.segmentAvailabilityDuration_ == Infinity) {
       return Math.ceil(earliestSegmentTime * 1e3) / 1e3;
     }
@@ -407,7 +417,7 @@ shaka.media.PresentationTimeline = class {
     // Add the offset to the availability start to ensure that we don't fall
     // outside the availability window while we buffer; we don't need to add the
     // offset to earliestSegmentTime since that won't change over time.
-    // Also see: https://github.com/google/shaka-player/issues/692
+    // Also see: https://github.com/shaka-project/shaka-player/issues/692
     const desiredStart =
         Math.min(availabilityStart + offset, this.getSeekRangeEnd());
     return Math.max(earliestSegmentTime, desiredStart);

package/lib/media/quality_observer.js

@@ -8,48 +8,40 @@ goog.provide('shaka.media.QualityObserver');
 
 goog.require('shaka.media.IPlayheadObserver');
 goog.require('shaka.log');
+goog.require('shaka.util.FakeEvent');
+goog.require('shaka.util.FakeEventTarget');
 
 /**
- * Monitors the quality of content being appended to the source
- * buffers and fires onQualityChange events when the media quality
- * at the playhead changes.
+ * Monitors the quality of content being appended to the source buffers and
+ * fires 'qualitychange' events when the media quality at the playhead changes.
  *
  * @implements {shaka.media.IPlayheadObserver}
  * @final
  */
-shaka.media.QualityObserver = class {
+shaka.media.QualityObserver = class extends shaka.util.FakeEventTarget {
   /**
    * Creates a new QualityObserver.
    *
    * @param {!function():!shaka.extern.BufferedInfo} getBufferedInfo
-   *  Buffered info is needed to purge QualityChanges that are no
-   * longer relevant.
+   *   Buffered info is needed to purge QualityChanges that are no
+   *   longer relevant.
    */
   constructor(getBufferedInfo) {
+    super();
+
     /**
      * @private {!Map.<string,!shaka.media.QualityObserver.ContentTypeState>}
      */
     this.contentTypeStates_ = new Map();
 
-    /** @private {shaka.media.QualityObserver.EventListener} */
-    this.onQualityChange_ = (mediaQuality, position) => {};
-
     /** @private function():!shaka.extern.BufferedInfo */
     this.getBufferedInfo_ = getBufferedInfo;
   }
 
-  /**
-   * Set all the listeners. This overrides any previous calls to |setListeners|.
-   *
-   * @param {shaka.media.QualityObserver.EventListener} onQualityChange
-   */
-  setListeners(onQualityChange) {
-    this.onQualityChange_ = onQualityChange;
-  }
-
   /** @override */
   release() {
     this.contentTypeStates_.clear();
+    super.release();
   }
 
   /**
@@ -169,10 +161,15 @@ shaka.media.QualityObserver = class {
         if (this.positionIsBuffered_(
             positionInSeconds, qualityAtPosition.contentType)) {
           contentTypeState.currentQuality = qualityAtPosition;
+
           shaka.log.debug('Media quality changed at position ' +
             positionInSeconds + ' ' + JSON.stringify(qualityAtPosition));
-          this.onQualityChange_(
-              qualityAtPosition, positionInSeconds);
+
+          const event = new shaka.util.FakeEvent('qualitychange', new Map([
+            ['quality', qualityAtPosition],
+            ['position', positionInSeconds],
+          ]));
+          this.dispatchEvent(event);
         }
       }
     }
@@ -237,20 +234,6 @@ shaka.media.QualityObserver = class {
   }
 };
 
-/**
- * @typedef {function(shaka.extern.MediaQualityInfo, number)}
- *
- * @description
- * A callback function used to notify the player when media quality changes
- * are detected at the playhead.
- *
- * The first argument is information about media quality at the playhead
- * position.
- *
- * The second argument is the playhead position in seconds.
- */
-shaka.media.QualityObserver.EventListener;
-
 /**
   * @typedef {{
   *   mediaQuality: !shaka.extern.MediaQualityInfo,