shaka-player 4.10.0 → 4.10.2

package/externs/shaka/player.js

@@ -1707,7 +1707,8 @@ shaka.extern.AdsConfiguration;
  *   ignoreDevicePixelRatio: boolean,
  *   clearBufferSwitch: boolean,
  *   safeMarginSwitch: number,
- *   cacheLoadThreshold: number
+ *   cacheLoadThreshold: number,
+ *   minTimeToSwitch: number
  * }}
  *
  * @property {boolean} enabled
@@ -1769,6 +1770,11 @@ shaka.extern.AdsConfiguration;
  *   Indicates the value in milliseconds from which a request is not
  *   considered cached.
  *   Defaults to <code>20</code>.
+ * @property {number} minTimeToSwitch
+ *   Indicates the minimum time to change quality once the real bandwidth is
+ *   available, in seconds. This time is only used on the first load.
+ *   Defaults to <code>0</code> seconds except in Apple browsers whose default
+ *   value  is <code>0.5</code> seconds.
  * @exportDoc
  */
 shaka.extern.AbrConfiguration;

package/lib/abr/simple_abr_manager.js

@@ -433,14 +433,17 @@ shaka.abr.SimpleAbrManager = class {
         return;
       }
       this.startupComplete_ = true;
-    } else {
-      // Check if we've left the switch interval.
-      const now = Date.now();
-      const delta = now - this.lastTimeChosenMs_;
-      if (delta < this.config_.switchInterval * 1000) {
-        shaka.log.v2('Still within switch interval...');
-        return;
-      }
+
+      this.lastTimeChosenMs_ -=
+          (this.config_.switchInterval - this.config_.minTimeToSwitch) * 1000;
+    }
+
+    // Check if we've left the switch interval.
+    const now = Date.now();
+    const delta = now - this.lastTimeChosenMs_;
+    if (delta < this.config_.switchInterval * 1000) {
+      shaka.log.v2('Still within switch interval...');
+      return;
     }
 
     const chosenVariant = this.chooseVariant();

package/lib/hls/hls_parser.js

@@ -16,7 +16,6 @@ goog.require('shaka.hls.PlaylistType');
 goog.require('shaka.hls.Tag');
 goog.require('shaka.hls.Utils');
 goog.require('shaka.log');
-goog.require('shaka.media.DrmEngine');
 goog.require('shaka.media.InitSegmentReference');
 goog.require('shaka.media.ManifestParser');
 goog.require('shaka.media.PresentationTimeline');
@@ -27,6 +26,7 @@ goog.require('shaka.net.DataUriPlugin');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ArrayUtils');
 goog.require('shaka.util.BufferUtils');
+goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.ContentSteeringManager');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
@@ -635,9 +635,10 @@ shaka.hls.HlsParser = class {
         if (goog.DEBUG) {
           const firstSequenceStartTime =
               mediaSequenceToStartTime.values().next().value;
-          shaka.log.warning(
-              firstSequenceStartTime == segment0.startTime,
-              'Sequence number map is not ordered as expected!');
+          if (firstSequenceStartTime != segment0.startTime) {
+            shaka.log.warning(
+                'Sequence number map is not ordered as expected!');
+          }
         }
         for (const [sequence, start] of mediaSequenceToStartTime) {
           if (start == segment0.startTime) {
@@ -1936,7 +1937,7 @@ shaka.hls.HlsParser = class {
       audioInfos, videoInfos, bandwidth, width, height, frameRate, videoRange,
       videoLayout, drmInfos, keyIds) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
-    const DrmEngine = shaka.media.DrmEngine;
+    const DrmUtils = shaka.util.DrmUtils;
 
     for (const info of videoInfos) {
       this.addVideoAttributes_(
@@ -1979,7 +1980,7 @@ shaka.hls.HlsParser = class {
         const variantUriKey = videoStreamUri + ' - ' + audioStreamUri;
 
         if (audioStream && videoStream) {
-          if (!DrmEngine.areDrmCompatible(audioDrmInfos, videoDrmInfos)) {
+          if (!DrmUtils.areDrmCompatible(audioDrmInfos, videoDrmInfos)) {
             shaka.log.warning(
                 'Incompatible DRM info in HLS variant.  Skipping.');
             continue;

package/lib/media/drm_engine.js

@@ -18,7 +18,6 @@ goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.Iterables');
-goog.require('shaka.util.Lazy');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MapUtils');
 goog.require('shaka.util.MimeUtils');
@@ -736,12 +735,13 @@ shaka.media.DrmEngine = class {
     // Note that some init data are extremely large and can't portably be used
     // as keys in a dictionary.
 
-    const metadatas = this.activeSessions_.values();
-    for (const metadata of metadatas) {
-      if (shaka.util.BufferUtils.equal(initData, metadata.initData) &&
-          this.config_.ignoreDuplicateInitData) {
-        shaka.log.debug('Ignoring duplicate init data.');
-        return;
+    if (this.config_.ignoreDuplicateInitData) {
+      const metadatas = this.activeSessions_.values();
+      for (const metadata of metadatas) {
+        if (shaka.util.BufferUtils.equal(initData, metadata.initData)) {
+          shaka.log.debug('Ignoring duplicate init data.');
+          return;
+        }
       }
     }
 
@@ -762,13 +762,6 @@ shaka.media.DrmEngine = class {
     return this.initialized_;
   }
 
-  /**
-   * @param {?shaka.extern.DrmInfo} drmInfo
-   * @return {string} */
-  static keySystem(drmInfo) {
-    return drmInfo ? drmInfo.keySystem : '';
-  }
-
   /**
    * Check if DrmEngine (as initialized) will likely be able to support the
    * given content type.
@@ -1763,30 +1756,13 @@ shaka.media.DrmEngine = class {
     this.playerInterface_.onKeyStatus(shaka.util.MapUtils.asObject(publicMap));
   }
 
-  /**
-   * Returns true if the browser has recent EME APIs.
-   *
-   * @return {boolean}
-   */
-  static isBrowserSupported() {
-    const basic =
-        !!window.MediaKeys &&
-        !!window.navigator &&
-        !!window.navigator.requestMediaKeySystemAccess &&
-        !!window.MediaKeySystemAccess &&
-        // eslint-disable-next-line no-restricted-syntax
-        !!window.MediaKeySystemAccess.prototype.getConfiguration;
-
-    return basic;
-  }
-
   /**
    * Returns a Promise to a map of EME support for well-known key systems.
    *
    * @return {!Promise.<!Object.<string, ?shaka.extern.DrmSupportType>>}
    */
   static async probeSupport() {
-    goog.asserts.assert(shaka.media.DrmEngine.isBrowserSupported(),
+    goog.asserts.assert(shaka.util.DrmUtils.isBrowserSupported(),
         'Must have basic EME support');
 
     const testKeySystems = [
@@ -2115,91 +2091,13 @@ shaka.media.DrmEngine = class {
       }
     }
 
-    const keySystem = shaka.media.DrmEngine.keySystem(this.currentDrmInfo_);
+    const keySystem = shaka.util.DrmUtils.keySystem(this.currentDrmInfo_);
     const drmInfos = this.getVariantDrmInfos_(variant);
 
     return drmInfos.length == 0 ||
         drmInfos.some((drmInfo) => drmInfo.keySystem == keySystem);
   }
 
-  /**
-   * Checks if two DrmInfos can be decrypted using the same key system.
-   * Clear content is considered compatible with every key system.
-   *
-   * @param {!Array.<!shaka.extern.DrmInfo>} drms1
-   * @param {!Array.<!shaka.extern.DrmInfo>} drms2
-   * @return {boolean}
-   */
-  static areDrmCompatible(drms1, drms2) {
-    if (!drms1.length || !drms2.length) {
-      return true;
-    }
-
-    if (drms1 === drms2) {
-      return true;
-    }
-
-    return shaka.media.DrmEngine.getCommonDrmInfos(
-        drms1, drms2).length > 0;
-  }
-
-  /**
-   * Returns an array of drm infos that are present in both input arrays.
-   * If one of the arrays is empty, returns the other one since clear
-   * content is considered compatible with every drm info.
-   *
-   * @param {!Array.<!shaka.extern.DrmInfo>} drms1
-   * @param {!Array.<!shaka.extern.DrmInfo>} drms2
-   * @return {!Array.<!shaka.extern.DrmInfo>}
-   */
-  static getCommonDrmInfos(drms1, drms2) {
-    if (!drms1.length) {
-      return drms2;
-    }
-    if (!drms2.length) {
-      return drms1;
-    }
-
-    const commonDrms = [];
-
-    for (const drm1 of drms1) {
-      for (const drm2 of drms2) {
-        if (drm1.keySystem == drm2.keySystem) {
-          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]) :
-              drm1.keyIds || drm2.keyIds;
-          const mergedDrm = {
-            keySystem: drm1.keySystem,
-            licenseServerUri: drm1.licenseServerUri || drm2.licenseServerUri,
-            distinctiveIdentifierRequired: drm1.distinctiveIdentifierRequired ||
-                drm2.distinctiveIdentifierRequired,
-            persistentStateRequired: drm1.persistentStateRequired ||
-                drm2.persistentStateRequired,
-            videoRobustness: drm1.videoRobustness || drm2.videoRobustness,
-            audioRobustness: drm1.audioRobustness || drm2.audioRobustness,
-            serverCertificate: drm1.serverCertificate || drm2.serverCertificate,
-            serverCertificateUri: drm1.serverCertificateUri ||
-                drm2.serverCertificateUri,
-            initData,
-            keyIds,
-          };
-          commonDrms.push(mergedDrm);
-          break;
-        }
-      }
-    }
-
-    return commonDrms;
-  }
-
   /**
    * Concat the audio and video drmInfos in a variant.
    * @param {shaka.extern.Variant} variant
@@ -2717,73 +2615,6 @@ shaka.media.DrmEngine = class {
     this.newInitData('cenc', combinedData);
     return this.allSessionsLoaded_;
   }
-
-  /**
-   * A method for generating a key for the MediaKeySystemAccessRequests cache.
-   *
-   * @param {string} videoCodec
-   * @param {string} audioCodec
-   * @param {string} keySystem
-   * @return {string}
-   * @private
-   */
-  static generateKeySystemCacheKey_(videoCodec, audioCodec, keySystem) {
-    return `${videoCodec}#${audioCodec}#${keySystem}`;
-  }
-
-  /**
-   * Check does MediaKeySystemAccess cache contains something for following
-   * attributes.
-   *
-   * @param {string} videoCodec
-   * @param {string} audioCodec
-   * @param {string} keySystem
-   * @return {boolean}
-   */
-  static hasMediaKeySystemAccess(videoCodec, audioCodec, keySystem) {
-    const DrmEngine = shaka.media.DrmEngine;
-    const key = DrmEngine.generateKeySystemCacheKey_(
-        videoCodec, audioCodec, keySystem);
-    return DrmEngine.memoizedMediaKeySystemAccessRequests_.has(key);
-  }
-
-  /**
-   * Get MediaKeySystemAccess object for following attributes.
-   *
-   * @param {string} videoCodec
-   * @param {string} audioCodec
-   * @param {string} keySystem
-   * @return {?MediaKeySystemAccess}
-   */
-  static getMediaKeySystemAccess(videoCodec, audioCodec, keySystem) {
-    const DrmEngine = shaka.media.DrmEngine;
-    const key = DrmEngine.generateKeySystemCacheKey_(
-        videoCodec, audioCodec, keySystem);
-    return DrmEngine.memoizedMediaKeySystemAccessRequests_.get(key) || null;
-  }
-
-  /**
-   * Store MediaKeySystemAccess object associated with specified attributes.
-   *
-   * @param {string} videoCodec
-   * @param {string} audioCodec
-   * @param {string} keySystem
-   * @param {!MediaKeySystemAccess} mksa
-   */
-  static setMediaKeySystemAccess(videoCodec, audioCodec, keySystem, mksa) {
-    const DrmEngine = shaka.media.DrmEngine;
-    const key = DrmEngine.generateKeySystemCacheKey_(
-        videoCodec, audioCodec, keySystem);
-    return DrmEngine.memoizedMediaKeySystemAccessRequests_.set(key, mksa);
-  }
-
-  /**
-   * Clears underlying cache.
-   */
-  static clearMediaKeySystemAccessMap() {
-    const DrmEngine = shaka.media.DrmEngine;
-    DrmEngine.memoizedMediaKeySystemAccessRequests_.clear();
-  }
 };
 
 
@@ -2868,22 +2699,3 @@ shaka.media.DrmEngine.SESSION_LOAD_TIMEOUT_ = 5;
  * @type {number}
  */
 shaka.media.DrmEngine.KEY_STATUS_BATCH_TIME = 0.5;
-
-
-/**
- * Contains the suggested "default" key ID used by EME polyfills that do not
- * have a per-key key status. See w3c/encrypted-media#32.
- * @type {!shaka.util.Lazy.<!ArrayBuffer>}
- */
-shaka.media.DrmEngine.DUMMY_KEY_ID = new shaka.util.Lazy(
-    () => shaka.util.BufferUtils.toArrayBuffer(new Uint8Array([0])));
-
-
-/**
- * A cache that stores the MediaKeySystemAccess result of calling
- * `navigator.requestMediaKeySystemAccess` by a key combination of
- * video/audio codec and key system string.
- *
- * @private {!Map<string, !MediaKeySystemAccess>}
- */
-shaka.media.DrmEngine.memoizedMediaKeySystemAccessRequests_ = new Map();

package/lib/media/presentation_timeline.js

@@ -247,12 +247,22 @@ shaka.media.PresentationTimeline = class {
       return;
     }
 
-    const firstStartTime = timeline[0].start + startOffset;
-    const lastEndTime = timeline[timeline.length - 1].end + startOffset;
+    // Date.now() is in milliseconds, from which we compute "now" in seconds.
+    const now = (Date.now() + this.clockOffset_) / 1000.0;
+    // Exclude time ranges that are in the "future".
+    const timelineForStart = timeline.filter((timeRange) =>
+      timeRange.start + startOffset < now);
+    if (timelineForStart.length == 0) {
+      return;
+    }
+
+    const firstStartTime = timelineForStart[0].start + startOffset;
+    const lastEndTime = timelineForStart[timelineForStart.length - 1].end +
+      startOffset;
 
     this.notifyMinSegmentStartTime(firstStartTime);
 
-    this.maxSegmentDuration_ = timeline.reduce(
+    this.maxSegmentDuration_ = timelineForStart.reduce(
         (max, r) => { return Math.max(max, r.end - r.start); },
         this.maxSegmentDuration_);
 
@@ -263,8 +273,6 @@ shaka.media.PresentationTimeline = class {
             !this.startTimeLocked_) {
       // Since we have explicit segment end times, calculate a presentation
       // start based on them.  This start time accounts for drift.
-      // Date.now() is in milliseconds, from which we compute "now" in seconds.
-      const now = (Date.now() + this.clockOffset_) / 1000.0;
       this.presentationStartTime_ =
             now - this.maxSegmentEndTime_ - this.maxSegmentDuration_;
     }

package/lib/player.js

@@ -45,6 +45,7 @@ goog.require('shaka.util.CmcdManager');
 goog.require('shaka.util.CmsdManager');
 goog.require('shaka.util.ConfigUtils');
 goog.require('shaka.util.Dom');
+goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
@@ -108,8 +109,8 @@ goog.requireType('shaka.media.PresentationTimeline');
  *   'downloadfailed'
  * @property {!shaka.extern.Request} request
  * @property {?shaka.util.Error} error
- * @param {number} httpResponseCode
- * @param {boolean} aborted
+ * @property {number} httpResponseCode
+ * @property {boolean} aborted
  * @exportDoc
  */
 
@@ -1072,7 +1073,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // DRM support is not strictly necessary, but the APIs at least need to be
     // there.  Our no-op DRM polyfill should handle that.
     // TODO(#1017): Consider making even DrmEngine optional.
-    const drmSupport = shaka.media.DrmEngine.isBrowserSupported();
+    const drmSupport = shaka.util.DrmUtils.isBrowserSupported();
     if (!drmSupport) {
       return false;
     }
@@ -1469,7 +1470,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // each playback.
       if (this.config_.streaming.clearDecodingCache) {
         shaka.util.StreamUtils.clearDecodingConfigCache();
-        shaka.media.DrmEngine.clearMediaKeySystemAccessMap();
+        shaka.util.DrmUtils.clearMediaKeySystemAccessMap();
       }
 
       this.manifest_ = null;
@@ -4330,7 +4331,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @export
    */
   keySystem() {
-    return shaka.media.DrmEngine.keySystem(this.drmInfo());
+    return shaka.util.DrmUtils.keySystem(this.drmInfo());
   }
 
   /**
@@ -4995,9 +4996,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
                 Math.abs((a.video.width || 0) - (b.video.width || 0));
         }
       };
-        // Find the variant whose size is closest to the active variant.  This
-        // ensures we stay at about the same resolution when just changing the
-        // language/role.
+      // Find the variant whose size is closest to the active variant.  This
+      // ensures we stay at about the same resolution when just changing the
+      // language/role.
       const active = this.streamingEngine_.getCurrentVariant();
       const set =
             this.currentAdaptationSetCriteria_.create(this.manifest_.variants);
@@ -5011,6 +5012,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           bestVariant = curVariant;
         }
       }
+      if (bestVariant == active) {
+        shaka.log.debug('Audio already selected.');
+        return;
+      }
       if (bestVariant) {
         const track = shaka.util.StreamUtils.variantToTrack(bestVariant);
         this.selectVariantTrack(track, /* clearBuffer= */ true, safeMargin);
@@ -5475,7 +5480,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const element = /** @type {!HTMLVideoElement} */ (this.video_);
 
     const completionRatio = element.currentTime / element.duration;
-    if (!isNaN(completionRatio)) {
+    if (!isNaN(completionRatio) && !this.isLive()) {
       this.stats_.setCompletionPercent(Math.round(100 * completionRatio));
     }
 
@@ -6926,7 +6931,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // Check if we should show text (based on difference between audio and text
     // languages).
     if (initialTextStream) {
-      if (initialVariant.audio && this.shouldInitiallyShowText_(
+      if (this.shouldInitiallyShowText_(
           initialVariant.audio, initialTextStream)) {
         this.isTextVisible_ = true;
       }
@@ -6946,7 +6951,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   /**
    * Check if we should show text on screen automatically.
    *
-   * @param {shaka.extern.Stream} audioStream
+   * @param {?shaka.extern.Stream} audioStream
    * @param {shaka.extern.Stream} textStream
    * @return {boolean}
    * @private
@@ -6977,6 +6982,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }
 
     if (this.config_.autoShowText == AutoShowText.IF_SUBTITLES_MAY_BE_NEEDED) {
+      if (!audioStream) {
+        return false;
+      }
       /* The text should automatically be shown if the text is
        * language-compatible with the user's text language preference, but not
        * compatible with the audio.  These are cases where we deduce that
@@ -7801,7 +7809,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.10.0' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.10.2' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -8,8 +8,8 @@ goog.provide('shaka.polyfill.MediaCapabilities');
 
 goog.require('shaka.log');
 goog.require('shaka.media.Capabilities');
-goog.require('shaka.media.DrmEngine');
 goog.require('shaka.polyfill');
+goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.Platform');
 
 
@@ -284,14 +284,14 @@ shaka.polyfill.MediaCapabilities = class {
     /** @type {MediaKeySystemAccess} */
     let keySystemAccess = null;
     try {
-      if (shaka.media.DrmEngine.hasMediaKeySystemAccess(
+      if (shaka.util.DrmUtils.hasMediaKeySystemAccess(
           videoCodec, audioCodec, keySystem)) {
-        keySystemAccess = shaka.media.DrmEngine.getMediaKeySystemAccess(
+        keySystemAccess = shaka.util.DrmUtils.getMediaKeySystemAccess(
             videoCodec, audioCodec, keySystem);
       } else {
         keySystemAccess = await navigator.requestMediaKeySystemAccess(
             mcapKeySystemConfig.keySystem, [mediaKeySystemConfig]);
-        shaka.media.DrmEngine.setMediaKeySystemAccess(
+        shaka.util.DrmUtils.setMediaKeySystemAccess(
             videoCodec, audioCodec, keySystem, keySystemAccess);
       }
     } catch (e) {

package/lib/polyfill/patchedmediakeys_apple.js

@@ -8,9 +8,9 @@ goog.provide('shaka.polyfill.PatchedMediaKeysApple');
 
 goog.require('goog.asserts');
 goog.require('shaka.log');
-goog.require('shaka.media.DrmEngine');
 goog.require('shaka.polyfill');
 goog.require('shaka.util.BufferUtils');
+goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.FakeEventTarget');
@@ -746,7 +746,7 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeyStatusMap = class {
   /** @override */
   forEach(fn) {
     if (this.status_) {
-      fn(this.status_, shaka.media.DrmEngine.DUMMY_KEY_ID.value());
+      fn(this.status_, shaka.util.DrmUtils.DUMMY_KEY_ID.value());
     }
   }
 
@@ -760,7 +760,7 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeyStatusMap = class {
 
   /** @override */
   has(keyId) {
-    const fakeKeyId = shaka.media.DrmEngine.DUMMY_KEY_ID.value();
+    const fakeKeyId = shaka.util.DrmUtils.DUMMY_KEY_ID.value();
     if (this.status_ && shaka.util.BufferUtils.equal(keyId, fakeKeyId)) {
       return true;
     }

package/lib/polyfill/patchedmediakeys_webkit.js

@@ -8,9 +8,9 @@ goog.provide('shaka.polyfill.PatchedMediaKeysWebkit');
 
 goog.require('goog.asserts');
 goog.require('shaka.log');
-goog.require('shaka.media.DrmEngine');
 goog.require('shaka.polyfill');
 goog.require('shaka.util.BufferUtils');
+goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.FakeEventTarget');
@@ -924,7 +924,7 @@ shaka.polyfill.PatchedMediaKeysWebkit.MediaKeyStatusMap = class {
   /** @override */
   forEach(fn) {
     if (this.status_) {
-      fn(this.status_, shaka.media.DrmEngine.DUMMY_KEY_ID.value());
+      fn(this.status_, shaka.util.DrmUtils.DUMMY_KEY_ID.value());
     }
   }
 
@@ -938,7 +938,7 @@ shaka.polyfill.PatchedMediaKeysWebkit.MediaKeyStatusMap = class {
 
   /** @override */
   has(keyId) {
-    const fakeKeyId = shaka.media.DrmEngine.DUMMY_KEY_ID.value();
+    const fakeKeyId = shaka.util.DrmUtils.DUMMY_KEY_ID.value();
     if (this.status_ && shaka.util.BufferUtils.equal(keyId, fakeKeyId)) {
       return true;
     }

package/lib/text/simple_text_displayer.js

@@ -37,6 +37,9 @@ shaka.text.SimpleTextDisplayer = class {
     // If the video element has TextTracks, disable them.  If we see one that
     // was created by a previous instance of Shaka Player, reuse it.
     for (const track of Array.from(video.textTracks)) {
+      if (track.kind === 'metadata' || track.kind === 'chapters') {
+        continue;
+      }
       // NOTE: There is no API available to remove a TextTrack from a video
       // element.
       track.mode = 'disabled';

package/lib/text/ssa_text_parser.js

@@ -60,24 +60,39 @@ shaka.text.SsaTextParser = class {
       events: '',
     };
 
+    let tag = null;
+    let lines = null;
     const parts = str.split(/\r?\n\s*\r?\n/);
     for (const part of parts) {
+      lines = part;
       // SSA content
       const match = SsaTextParser.ssaContent_.exec(part);
       if (match) {
-        const tag = match[1];
-        const lines = match[2];
-        if (tag == 'V4 Styles' || tag == 'V4+ Styles') {
+        tag = match[1];
+        lines = match[2];
+      }
+      if (tag == 'V4 Styles' || tag == 'V4+ Styles') {
+        section.styles = lines;
+        if (section.events) {
+          section.styles += '\n' + lines;
+        } else {
           section.styles = lines;
-          continue;
         }
-        if (tag == 'Events') {
+        continue;
+      }
+      if (tag == 'Events') {
+        if (section.events) {
+          section.events += '\n' + lines;
+        } else {
           section.events = lines;
-          continue;
         }
+        continue;
+      }
+      if (tag == 'Script Info') {
+        continue;
       }
       shaka.log.warning('SsaTextParser parser encountered an unknown part.',
-          part);
+          lines);
     }
 
     // Process styles

package/lib/text/text_utils.js

@@ -148,7 +148,7 @@ shaka.text.Utils = class {
    */
   static getCuesToFlatten(cues, parentCue) {
     const result = [];
-    for (const cue of cues) {
+    for (const cue of shaka.text.Utils.removeDuplicates(cues)) {
       if (cue.isContainer) {
         // Recurse to find the actual text payload cues.
         result.push(...shaka.text.Utils.getCuesToFlatten(cue.nestedCues, cue));
@@ -162,4 +162,20 @@ shaka.text.Utils = class {
     }
     return result;
   }
+
+  /**
+   * @param {!Array.<!shaka.text.Cue>} cues
+   * @return {!Array.<!shaka.text.Cue>}
+   */
+  static removeDuplicates(cues) {
+    const uniqueCues = [];
+    for (const cue of cues) {
+      const isValid = !uniqueCues.some(
+          (existingCue) => shaka.text.Cue.equal(cue, existingCue));
+      if (isValid) {
+        uniqueCues.push(cue);
+      }
+    }
+    return uniqueCues;
+  }
 };