shaka-player 4.3.13 → 4.3.15

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.
@@ -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;
   }
@@ -2083,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.
@@ -2240,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);
   }
 
 
@@ -2398,16 +2446,19 @@ shaka.hls.HlsParser = class {
     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, aes128Key);
+          absoluteInitSegmentUri, mapTag, byteRangeTag, aes128Key);
       this.mapTagToInitSegmentRefMap_.set(mapTagKey, initSegmentRef);
     }
     return this.mapTagToInitSegmentRefMap_.get(mapTagKey);
@@ -2418,14 +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, aes128Key) {
+  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) {
@@ -2731,6 +2787,13 @@ shaka.hls.HlsParser = class {
     if (this.isLive_() && mediaSequenceToStartTime.has(position)) {
       firstStartTime = mediaSequenceToStartTime.get(position);
     }
+    // This is for recovering from disconnects.
+    if (firstStartTime === 0 &&
+        this.presentationType_ == shaka.hls.HlsParser.PresentationType_.LIVE &&
+        mediaSequenceToStartTime.size > 0 &&
+        !mediaSequenceToStartTime.has(position)) {
+      firstStartTime = this.presentationTimeline_.getSegmentAvailabilityStart();
+    }
 
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     const references = [];
@@ -3319,7 +3382,22 @@ shaka.hls.HlsParser = class {
    * @return {?shaka.extern.DrmInfo}
    * @private
    */
-  static identityDrmParser_(drmTag) {
+  static identityDrmParser_(drmTag, mimeType) {
+    if (mimeType == 'video/mp2t') {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          shaka.util.Error.Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);
+    }
+
+    if (shaka.util.Platform.isMediaKeysPolyfilled()) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          shaka.util.Error.Code
+              .HLS_MSE_ENCRYPTED_LEGACY_APPLE_MEDIA_KEYS_NOT_SUPPORTED);
+    }
+
     const method = drmTag.getRequiredAttrValue('METHOD');
     const VALID_METHODS = ['SAMPLE-AES', 'SAMPLE-AES-CTR'];
     if (!VALID_METHODS.includes(method)) {

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/manifest_parser.js

@@ -176,7 +176,8 @@ shaka.media.ManifestParser = class {
         shaka.util.Error.Severity.CRITICAL,
         shaka.util.Error.Category.MANIFEST,
         shaka.util.Error.Code.UNABLE_TO_GUESS_MANIFEST_TYPE,
-        uri);
+        uri,
+        mimeType);
   }
 
 

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

@@ -107,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());
     }
   }
 };

package/lib/media/streaming_engine.js

@@ -6,7 +6,6 @@
 
 /**
  * @fileoverview
- * @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
  */
 
 goog.provide('shaka.media.StreamingEngine');
@@ -19,6 +18,8 @@ goog.require('shaka.media.SegmentIterator');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.net.Backoff');
 goog.require('shaka.net.NetworkingEngine');
+goog.require('shaka.util.BufferUtils');
+goog.require('shaka.util.CmcdManager');
 goog.require('shaka.util.DelayedTick');
 goog.require('shaka.util.Destroyer');
 goog.require('shaka.util.Error');
@@ -27,6 +28,7 @@ goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.Id3Utils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
+goog.require('shaka.util.Mp4BoxParsers');
 goog.require('shaka.util.Mp4Parser');
 goog.require('shaka.util.Networking');
 
@@ -1285,6 +1287,7 @@ shaka.media.StreamingEngine = class {
         let remaining = new Uint8Array(0);
         let processingResult = false;
         let callbackCalled = false;
+        let streamDataCallbackError;
         const streamDataCallback = async (data) => {
           if (processingResult) {
             // If the fallback result processing was triggered, don't also
@@ -1297,35 +1300,44 @@ shaka.media.StreamingEngine = class {
           if (this.fatalError_) {
             return;
           }
-          // Append the data with complete boxes.
-          // Every time streamDataCallback gets called, append the new data to
-          // the remaining data.
-          // Find the last fully completed Mdat box, and slice the data into two
-          // parts: the first part with completed Mdat boxes, and the second
-          // part with an incomplete box.
-          // Append the first part, and save the second part as remaining data,
-          // and handle it with the next streamDataCallback call.
-          remaining = this.concatArray_(remaining, data);
-          let sawMDAT = false;
-          let offset = 0;
-          new shaka.util.Mp4Parser()
-              .box('mdat', (box) => {
-                offset = box.size + box.start;
-                sawMDAT = true;
-              })
-              .parse(remaining, /* partialOkay= */ false,
+          try {
+            // Append the data with complete boxes.
+            // Every time streamDataCallback gets called, append the new data
+            // to the remaining data.
+            // Find the last fully completed Mdat box, and slice the data into
+            // two parts: the first part with completed Mdat boxes, and the
+            // second part with an incomplete box.
+            // Append the first part, and save the second part as remaining
+            // data, and handle it with the next streamDataCallback call.
+            remaining = this.concatArray_(remaining, data);
+            let sawMDAT = false;
+            let offset = 0;
+            new shaka.util.Mp4Parser()
+                .box('mdat', (box) => {
+                  offset = box.size + box.start;
+                  sawMDAT = true;
+                })
+                .parse(remaining, /* partialOkay= */ false,
+                    /* isChunkedData= */ true);
+            if (sawMDAT) {
+              const dataToAppend = remaining.subarray(0, offset);
+              remaining = remaining.subarray(offset);
+              await this.append_(
+                  mediaState, presentationTime, stream, reference, dataToAppend,
                   /* isChunkedData= */ true);
-          if (sawMDAT) {
-            const dataToAppend = remaining.subarray(0, offset);
-            remaining = remaining.subarray(offset);
-            await this.append_(
-                mediaState, presentationTime, stream, reference, dataToAppend,
-                /* isChunkedData= */ true);
+            }
+          } catch (error) {
+            streamDataCallbackError = error;
           }
         };
 
         const result =
             await this.fetch_(mediaState, reference, streamDataCallback);
+
+        if (streamDataCallbackError) {
+          throw streamDataCallbackError;
+        }
+
         if (!callbackCalled) {
           // In some environments, we might be forced to use network plugins
           // that don't support streamDataCallback. In those cases, as a
@@ -2004,8 +2016,8 @@ shaka.media.StreamingEngine = class {
     const bufferedBehind = presentationTime - startTime;
 
     const overflow = bufferedBehind - bufferBehind;
-    // See: https://github.com/shaka-project/shaka-player/issues/2982
-    if (overflow <= 0.01) {
+    // See: https://github.com/shaka-project/shaka-player/issues/6240
+    if (overflow <= 1) {
       shaka.log.v2(logPrefix,
           'buffer behind okay:',
           'presentationTime=' + presentationTime,
@@ -2056,7 +2068,6 @@ shaka.media.StreamingEngine = class {
    *
    * @return {!Promise.<BufferSource>}
    * @private
-   * @suppress {strictMissingProperties}
    */
   async fetch_(mediaState, reference, streamDataCallback) {
     const requestType = shaka.net.NetworkingEngine.RequestType.SEGMENT;
@@ -2071,12 +2082,17 @@ shaka.media.StreamingEngine = class {
     shaka.log.v2('fetching: reference=', reference);
 
     const stream = mediaState.stream;
+    const isInit = reference instanceof shaka.media.InitSegmentReference;
+    const mediaReference =
+    /** @type {!shaka.media.SegmentReference} */(reference);
+    const duration = isInit ? 0 :
+        mediaReference.endTime - mediaReference.startTime;
     this.playerInterface_.modifySegmentRequest(
         request,
         {
           type: stream.type,
-          init: reference instanceof shaka.media.InitSegmentReference,
-          duration: reference.endTime - reference.startTime,
+          init: isInit,
+          duration,
           mimeType: stream.mimeType,
           codecs: stream.codecs,
           bandwidth: stream.bandwidth,
@@ -2090,7 +2106,11 @@ shaka.media.StreamingEngine = class {
 
     let result = response.data;
     if (reference.hlsAes128Key) {
-      const iter = mediaState.segmentIterator;
+      let iter = mediaState.segmentIterator;
+      const time = isInit ? null : mediaReference.startTime;
+      if (!iter && time != null) {
+        iter = mediaState.stream.segmentIndex.getIteratorForTime(time);
+      }
       goog.asserts.assert(iter, 'mediaState.segmentIterator should exist');
       result = await this.aes128Decrypt_(result, reference.hlsAes128Key, iter);
     }

package/lib/media/transmuxer.js

@@ -208,7 +208,7 @@ shaka.media.Transmuxer = class {
    * Returns the original mimetype of the transmuxer.
    * @return {string}
    */
-  getOrginalMimeType() {
+  getOriginalMimeType() {
     return this.originalMimeType_;
   }
 

package/lib/media/video_wrapper.js

@@ -175,8 +175,8 @@ shaka.media.VideoWrapper = class {
 
 /**
  * A class used to move the playhead away from its current time.  Sometimes,
- * Edge ignores re-seeks. After changing the current time, check every 100ms,
- * retrying if the change was not accepted.
+ * legacy Edge ignores re-seeks. After changing the current time, check every
+ * 100ms, retrying if the change was not accepted.
  *
  * Delay stats over 100 runs of a re-seeking integration test:
  *   Edge   -   0ms -   2%
@@ -186,7 +186,8 @@ shaka.media.VideoWrapper = class {
  *   Edge   - 400ms -   2%
  *   Chrome -   0ms - 100%
  *
- * TODO: File a bug on Edge about this.
+ * Unfortunately, legacy Edge is not receiving updates anymore, but it still
+ * must be supported as it is used for web browsers on XBox.
  *
  * @implements {shaka.util.IReleasable}
  * @final

package/lib/offline/offline_manifest_parser.js

@@ -112,6 +112,11 @@ shaka.offline.OfflineManifestParser = class {
       await muxer.destroy();
     }
   }
+
+  /** @override */
+  onInitialVariantChosen(variant) {
+    // No-op
+  }
 };
 
 

package/lib/offline/session_deleter.js

@@ -71,14 +71,6 @@ shaka.offline.SessionDeleter = class {
       return [];
     }
 
-    try {
-      await drmEngine.setServerCertificate();
-    } catch (e) {
-      shaka.log.warning('Error setting server certificate', e);
-      await drmEngine.destroy();
-      return [];
-    }
-
     /** @type {!Array.<string>} */
     const sessionIds = [];
     await Promise.all(bucket.sessionIds.map(async (sessionId) => {

package/lib/offline/storage.js

@@ -396,6 +396,10 @@ shaka.offline.Storage = class {
           downloader, config, activeHandle.cell, manifest, drmEngine);
       this.ensureNotDestroyed_();
 
+      this.setManifestDrmFields_(manifest, manifestDB, drmEngine, config);
+      await activeHandle.cell.updateManifest(manifestId, manifestDB);
+      this.ensureNotDestroyed_();
+
       const offlineUri = shaka.offline.OfflineUri.manifest(
           activeHandle.path.mechanism, activeHandle.path.cell, manifestId);
 
@@ -1231,7 +1235,6 @@ shaka.offline.Storage = class {
     drmEngine.configure(config.drm);
     await drmEngine.initForStorage(
         manifest.variants, config.offline.usePersistentLicense);
-    await drmEngine.setServerCertificate();
     await drmEngine.createOrLoad();
 
     return drmEngine;