shaka-player 4.7.13 → 4.8.0

package/lib/mss/content_protection.js

@@ -11,8 +11,8 @@ goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.Pssh');
 goog.require('shaka.util.StringUtils');
+goog.require('shaka.util.TXml');
 goog.require('shaka.util.Uint8ArrayUtils');
-goog.require('shaka.util.XmlUtils');
 
 
 /**
@@ -23,19 +23,19 @@ shaka.mss.ContentProtection = class {
   /**
    * Parses info from the Protection elements.
    *
-   * @param {!Array.<!Element>} elems
+   * @param {!Array.<!shaka.extern.xml.Node>} elems
    * @param {!Object.<string, string>} keySystemsBySystemId
    * @return {!Array.<shaka.extern.DrmInfo>}
    */
   static parseFromProtection(elems, keySystemsBySystemId) {
     const ContentProtection = shaka.mss.ContentProtection;
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
 
-    /** @type {!Array.<!Element>} */
+    /** @type {!Array.<!shaka.extern.xml.Node>} */
     let protectionHeader = [];
     for (const elem of elems) {
       protectionHeader = protectionHeader.concat(
-          XmlUtils.findChildren(elem, 'ProtectionHeader'));
+          TXml.findChildren(elem, 'ProtectionHeader'));
     }
     if (!protectionHeader.length) {
       return [];
@@ -123,18 +123,19 @@ shaka.mss.ContentProtection = class {
    * Parse a PlayReady Header format: https://goo.gl/dBzxNA
    * a try to find the LA_URL value.
    *
-   * @param {!Element} xml
+   * @param {!shaka.extern.xml.Node} xml
    * @return {string}
    * @private
    */
   static getLaurl_(xml) {
+    const TXml = shaka.util.TXml;
     // LA_URL element is optional and no more than one is
     // allowed inside the DATA element. Only absolute URLs are allowed.
     // If the LA_URL element exists, it must not be empty.
-    for (const elem of xml.getElementsByTagName('DATA')) {
-      const laUrl = shaka.util.XmlUtils.findChild(elem, 'LA_URL');
+    for (const elem of TXml.getElementsByTagName(xml, 'DATA')) {
+      const laUrl = TXml.findChild(elem, 'LA_URL');
       if (laUrl) {
-        return laUrl.textContent;
+        return /** @type {string} */ (shaka.util.TXml.getTextContents(laUrl));
       }
     }
 
@@ -148,7 +149,7 @@ shaka.mss.ContentProtection = class {
    * Gets a PlayReady license URL from a protection element
    * containing a PlayReady Header Object
    *
-   * @param {!Element} element
+   * @param {!shaka.extern.xml.Node} element
    * @return {string}
    */
   static getPlayReadyLicenseUrl(element) {
@@ -165,19 +166,21 @@ shaka.mss.ContentProtection = class {
    * Parse a PlayReady Header format: https://goo.gl/dBzxNA
    * a try to find the KID value.
    *
-   * @param {!Element} xml
+   * @param {!shaka.extern.xml.Node} xml
    * @return {?string}
    * @private
    */
   static getKID_(xml) {
+    const TXml = shaka.util.TXml;
     // KID element is optional and no more than one is
     // allowed inside the DATA element.
-    for (const elem of xml.getElementsByTagName('DATA')) {
-      const kid = shaka.util.XmlUtils.findChild(elem, 'KID');
+    for (const elem of TXml.getElementsByTagName(xml, 'DATA')) {
+      const kid = TXml.findChild(elem, 'KID');
       if (kid) {
         // GUID: [DWORD, WORD, WORD, 8-BYTE]
         const guidBytes =
-            shaka.util.Uint8ArrayUtils.fromBase64(kid.textContent);
+            shaka.util.Uint8ArrayUtils.fromBase64(
+                /** @type{string} */ (shaka.util.TXml.getTextContents(kid)));
         // Reverse byte order from little-endian to big-endian
         const kidBytes = new Uint8Array([
           guidBytes[3], guidBytes[2], guidBytes[1], guidBytes[0],
@@ -197,7 +200,7 @@ shaka.mss.ContentProtection = class {
    * Gets a PlayReady KID from a protection element
    * containing a PlayReady Header Object
    *
-   * @param {!Element} element
+   * @param {!shaka.extern.xml.Node} element
    * @return {?string}
    * @private
    */
@@ -214,15 +217,16 @@ shaka.mss.ContentProtection = class {
   /**
    * Gets a PlayReady Header Object from a protection element
    *
-   * @param {!Element} element
-   * @return {?Element}
+   * @param {!shaka.extern.xml.Node} element
+   * @return {?shaka.extern.xml.Node}
    * @private
    */
   static getPlayReadyHeaderObject_(element) {
     const ContentProtection = shaka.mss.ContentProtection;
     const PLAYREADY_RECORD_TYPES = ContentProtection.PLAYREADY_RECORD_TYPES;
 
-    const bytes = shaka.util.Uint8ArrayUtils.fromBase64(element.textContent);
+    const bytes = shaka.util.Uint8ArrayUtils.fromBase64(
+        /** @type{string} */ (shaka.util.TXml.getTextContents(element)));
     const records = ContentProtection.parseMsPro_(bytes);
     const record = records.filter((record) => {
       return record.type === PLAYREADY_RECORD_TYPES.RIGHTS_MANAGEMENT;
@@ -233,7 +237,7 @@ shaka.mss.ContentProtection = class {
     }
 
     const xml = shaka.util.StringUtils.fromUTF16(record.value, true);
-    const rootElement = shaka.util.XmlUtils.parseXmlString(xml, 'WRMHEADER');
+    const rootElement = shaka.util.TXml.parseXmlString(xml, 'WRMHEADER');
     if (!rootElement) {
       return null;
     }
@@ -243,7 +247,7 @@ shaka.mss.ContentProtection = class {
   /**
    * Gets a initData from a protection element.
    *
-   * @param {!Element} element
+   * @param {!shaka.extern.xml.Node} element
    * @param {string} systemID
    * @param {?string} keyId
    * @return {?Array.<shaka.extern.InitDataOverride>}
@@ -251,7 +255,8 @@ shaka.mss.ContentProtection = class {
    */
   static getInitDataFromPro_(element, systemID, keyId) {
     const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
-    const data = Uint8ArrayUtils.fromBase64(element.textContent);
+    const data = Uint8ArrayUtils.fromBase64(
+        /** @type{string} */ (shaka.util.TXml.getTextContents(element)));
     const systemId = Uint8ArrayUtils.fromHex(systemID.replace(/-/g, ''));
     const keyIds = new Set();
     const psshVersion = 0;
@@ -269,7 +274,7 @@ shaka.mss.ContentProtection = class {
   /**
    * Creates DrmInfo objects from an array of elements.
    *
-   * @param {!Array.<!Element>} elements
+   * @param {!Array.<!shaka.extern.xml.Node>} elements
    * @param {!Object.<string, string>} keySystemsBySystemId
    * @return {!Array.<shaka.extern.DrmInfo>}
    * @private
@@ -284,14 +289,15 @@ shaka.mss.ContentProtection = class {
 
     for (let i = 0; i < elements.length; i++) {
       const element = elements[i];
-      const systemID = element.getAttribute('SystemID').toLowerCase();
+      const systemID = element.attributes['SystemID'].toLowerCase();
       const keySystem = keySystemsBySystemId[systemID];
       if (keySystem) {
         const KID = ContentProtection.getPlayReadyKID_(element);
         const initData = ContentProtection.getInitDataFromPro_(
             element, systemID, KID);
 
-        const info = ManifestParserUtils.createDrmInfo(keySystem, initData);
+        const info = ManifestParserUtils.createDrmInfo(
+            keySystem, /* encryptionScheme= */ 'cenc', initData);
         if (KID) {
           info.keyIds.add(KID);
         }
@@ -338,7 +344,7 @@ shaka.mss.ContentProtection.PLAYREADY_RECORD_TYPES = {
 /**
  * A map of key system name to license server url parser.
  *
- * @const {!Map.<string, function(!Element)>}
+ * @const {!Map.<string, function(!shaka.extern.xml.Node)>}
  * @private
  */
 shaka.mss.ContentProtection.licenseUrlParsers_ = new Map()

package/lib/mss/mss_parser.js

@@ -7,6 +7,7 @@
 goog.provide('shaka.mss.MssParser');
 
 goog.require('goog.asserts');
+goog.require('shaka.Deprecate');
 goog.require('shaka.abr.Ewma');
 goog.require('shaka.log');
 goog.require('shaka.media.InitSegmentReference');
@@ -23,6 +24,7 @@ goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mp4Generator');
 goog.require('shaka.util.OperationManager');
 goog.require('shaka.util.Timer');
+goog.require('shaka.util.TXml');
 goog.require('shaka.util.XmlUtils');
 
 
@@ -278,7 +280,25 @@ shaka.mss.MssParser = class {
    * @private
    */
   parseManifest_(data, finalManifestUri) {
-    const mss = shaka.util.XmlUtils.parseXml(data, 'SmoothStreamingMedia');
+    let manifestData = data;
+    const manifestPreprocessor = this.config_.mss.manifestPreprocessor;
+    if (manifestPreprocessor) {
+      shaka.Deprecate.deprecateFeature(5,
+          'manifest.mss.manifestPreprocessor configuration',
+          'Please Use manifest.mss.manifestPreprocessorTXml instead.');
+      const mssElement =
+          shaka.util.XmlUtils.parseXml(manifestData, 'SmoothStreamingMedia');
+      if (!mssElement) {
+        throw new shaka.util.Error(
+            shaka.util.Error.Severity.CRITICAL,
+            shaka.util.Error.Category.MANIFEST,
+            shaka.util.Error.Code.MSS_INVALID_XML,
+            finalManifestUri);
+      }
+      manifestPreprocessor(mssElement);
+      manifestData = shaka.util.XmlUtils.toArrayBuffer(mssElement);
+    }
+    const mss = shaka.util.TXml.parseXml(manifestData, 'SmoothStreamingMedia');
     if (!mss) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
@@ -286,6 +306,10 @@ shaka.mss.MssParser = class {
           shaka.util.Error.Code.MSS_INVALID_XML,
           finalManifestUri);
     }
+    const manifestPreprocessorTXml = this.config_.mss.manifestPreprocessorTXml;
+    if (manifestPreprocessorTXml) {
+      manifestPreprocessorTXml(mss);
+    }
     this.processManifest_(mss, finalManifestUri);
     return Promise.resolve();
   }
@@ -294,26 +318,21 @@ shaka.mss.MssParser = class {
   /**
    * Takes a formatted MSS and converts it into a manifest.
    *
-   * @param {!Element} mss
+   * @param {!shaka.extern.xml.Node} mss
    * @param {string} finalManifestUri The final manifest URI, which may
    *   differ from this.manifestUri_ if there has been a redirect.
    * @private
    */
   processManifest_(mss, finalManifestUri) {
-    const XmlUtils = shaka.util.XmlUtils;
-
-    const manifestPreprocessor = this.config_.mss.manifestPreprocessor;
-    if (manifestPreprocessor) {
-      manifestPreprocessor(mss);
-    }
+    const TXml = shaka.util.TXml;
 
     if (!this.presentationTimeline_) {
       this.presentationTimeline_ = new shaka.media.PresentationTimeline(
           /* presentationStartTime= */ null, /* delay= */ 0);
     }
 
-    const isLive = XmlUtils.parseAttr(mss, 'IsLive',
-        XmlUtils.parseBoolean, /* defaultValue= */ false);
+    const isLive = TXml.parseAttr(mss, 'IsLive',
+        TXml.parseBoolean, /* defaultValue= */ false);
 
     if (isLive) {
       throw new shaka.util.Error(
@@ -324,21 +343,21 @@ shaka.mss.MssParser = class {
 
     this.presentationTimeline_.setStatic(!isLive);
 
-    const timescale = XmlUtils.parseAttr(mss, 'TimeScale',
-        XmlUtils.parseNonNegativeInt, shaka.mss.MssParser.DEFAULT_TIME_SCALE_);
+    const timescale = TXml.parseAttr(mss, 'TimeScale',
+        TXml.parseNonNegativeInt, shaka.mss.MssParser.DEFAULT_TIME_SCALE_);
     goog.asserts.assert(timescale && timescale >= 0,
         'Timescale must be defined!');
 
-    let dvrWindowLength = XmlUtils.parseAttr(mss, 'DVRWindowLength',
-        XmlUtils.parseNonNegativeInt);
+    let dvrWindowLength = TXml.parseAttr(mss, 'DVRWindowLength',
+        TXml.parseNonNegativeInt);
     // If the DVRWindowLength field is omitted for a live presentation or set
     // to 0, the DVR window is effectively infinite
     if (isLive && (dvrWindowLength === 0 || isNaN(dvrWindowLength))) {
       dvrWindowLength = Infinity;
     }
     // Start-over
-    const canSeek = XmlUtils.parseAttr(mss, 'CanSeek',
-        XmlUtils.parseBoolean, /* defaultValue= */ false);
+    const canSeek = TXml.parseAttr(mss, 'CanSeek',
+        TXml.parseBoolean, /* defaultValue= */ false);
     if (dvrWindowLength === 0 && canSeek) {
       dvrWindowLength = Infinity;
     }
@@ -363,8 +382,8 @@ shaka.mss.MssParser = class {
         segmentAvailabilityDuration);
 
     // Duration in timescale units.
-    const duration = XmlUtils.parseAttr(mss, 'Duration',
-        XmlUtils.parseNonNegativeInt, Infinity);
+    const duration = TXml.parseAttr(mss, 'Duration',
+        TXml.parseNonNegativeInt, Infinity);
     goog.asserts.assert(duration && duration >= 0,
         'Duration must be defined!');
 
@@ -414,25 +433,25 @@ shaka.mss.MssParser = class {
   }
 
   /**
-   * @param {!Element} mss
+   * @param {!shaka.extern.xml.Node} mss
    * @param {!shaka.mss.MssParser.Context} context
    * @private
    */
   parseStreamIndexes_(mss, context) {
     const ContentProtection = shaka.mss.ContentProtection;
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
-    const protectionElems = XmlUtils.findChildren(mss, 'Protection');
+    const protectionElems = TXml.findChildren(mss, 'Protection');
     const drmInfos = ContentProtection.parseFromProtection(
         protectionElems, this.config_.mss.keySystemsBySystemId);
 
     const audioStreams = [];
     const videoStreams = [];
     const textStreams = [];
-    const streamIndexes = XmlUtils.findChildren(mss, 'StreamIndex');
+    const streamIndexes = TXml.findChildren(mss, 'StreamIndex');
     for (const streamIndex of streamIndexes) {
-      const qualityLevels = XmlUtils.findChildren(streamIndex, 'QualityLevel');
+      const qualityLevels = TXml.findChildren(streamIndex, 'QualityLevel');
       const timeline = this.createTimeline_(
           streamIndex, context.timescale, context.duration);
       // For each QualityLevel node, create a stream element
@@ -467,8 +486,8 @@ shaka.mss.MssParser = class {
   }
 
   /**
-   * @param {!Element} streamIndex
-   * @param {!Element} qualityLevel
+   * @param {!shaka.extern.xml.Node} streamIndex
+   * @param {!shaka.extern.xml.Node} qualityLevel
    * @param {!Array.<shaka.mss.MssParser.TimeRange>} timeline
    * @param {!Array.<shaka.extern.DrmInfo>} drmInfos
    * @param {!shaka.mss.MssParser.Context} context
@@ -476,11 +495,11 @@ shaka.mss.MssParser = class {
    * @private
    */
   createStream_(streamIndex, qualityLevel, timeline, drmInfos, context) {
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const MssParser = shaka.mss.MssParser;
 
-    const type = streamIndex.getAttribute('Type');
+    const type = streamIndex.attributes['Type'];
     const isValidType = type === 'audio' || type === 'video' ||
         type === 'text';
     if (!isValidType) {
@@ -488,19 +507,19 @@ shaka.mss.MssParser = class {
       return null;
     }
 
-    const lang = streamIndex.getAttribute('Language');
+    const lang = streamIndex.attributes['Language'];
     const id = this.globalId_++;
 
-    const bandwidth = XmlUtils.parseAttr(
-        qualityLevel, 'Bitrate', XmlUtils.parsePositiveInt);
-    const width = XmlUtils.parseAttr(
-        qualityLevel, 'MaxWidth', XmlUtils.parsePositiveInt);
-    const height = XmlUtils.parseAttr(
-        qualityLevel, 'MaxHeight', XmlUtils.parsePositiveInt);
-    const channelsCount = XmlUtils.parseAttr(
-        qualityLevel, 'Channels', XmlUtils.parsePositiveInt);
-    const audioSamplingRate = XmlUtils.parseAttr(
-        qualityLevel, 'SamplingRate', XmlUtils.parsePositiveInt);
+    const bandwidth = TXml.parseAttr(
+        qualityLevel, 'Bitrate', TXml.parsePositiveInt);
+    const width = TXml.parseAttr(
+        qualityLevel, 'MaxWidth', TXml.parsePositiveInt);
+    const height = TXml.parseAttr(
+        qualityLevel, 'MaxHeight', TXml.parsePositiveInt);
+    const channelsCount = TXml.parseAttr(
+        qualityLevel, 'Channels', TXml.parsePositiveInt);
+    const audioSamplingRate = TXml.parseAttr(
+        qualityLevel, 'SamplingRate', TXml.parsePositiveInt);
 
     let duration = context.duration;
     if (timeline.length) {
@@ -516,7 +535,7 @@ shaka.mss.MssParser = class {
     /** @type {!shaka.extern.Stream} */
     const stream = {
       id: id,
-      originalId: streamIndex.getAttribute('Name') || String(id),
+      originalId: streamIndex.attributes['Name'] || String(id),
       groupId: null,
       createSegmentIndex: () => Promise.resolve(),
       closeSegmentIndex: () => Promise.resolve(),
@@ -561,7 +580,7 @@ shaka.mss.MssParser = class {
     };
 
     // This is specifically for text tracks.
-    const subType = streamIndex.getAttribute('Subtype');
+    const subType = streamIndex.attributes['Subtype'];
     if (subType) {
       const role = MssParser.ROLE_MAPPING_[subType];
       if (role) {
@@ -572,12 +591,12 @@ shaka.mss.MssParser = class {
       }
     }
 
-    let fourCCValue = qualityLevel.getAttribute('FourCC');
+    let fourCCValue = qualityLevel.attributes['FourCC'];
 
     // If FourCC not defined at QualityLevel level,
     // then get it from StreamIndex level
     if (fourCCValue === null || fourCCValue === '') {
-      fourCCValue = streamIndex.getAttribute('FourCC');
+      fourCCValue = streamIndex.attributes['FourCC'];
     }
 
     // If still not defined (optional for audio stream,
@@ -700,7 +719,7 @@ shaka.mss.MssParser = class {
   }
 
   /**
-   * @param {!Element} qualityLevel
+   * @param {!shaka.extern.xml.Node} qualityLevel
    * @param {string} type
    * @param {string} fourCCValue
    * @param {!shaka.extern.Stream} stream
@@ -708,7 +727,7 @@ shaka.mss.MssParser = class {
    * @private
    */
   getCodecPrivateData_(qualityLevel, type, fourCCValue, stream) {
-    const codecPrivateData = qualityLevel.getAttribute('CodecPrivateData');
+    const codecPrivateData = qualityLevel.attributes['CodecPrivateData'];
     if (codecPrivateData) {
       return codecPrivateData;
     }
@@ -786,7 +805,7 @@ shaka.mss.MssParser = class {
   }
 
   /**
-   * @param {!Element} qualityLevel
+   * @param {!shaka.extern.xml.Node} qualityLevel
    * @param {string} fourCCValue
    * @param {?string} codecPrivateData
    * @return {string}
@@ -815,7 +834,7 @@ shaka.mss.MssParser = class {
   }
 
   /**
-   * @param {!Element} qualityLevel
+   * @param {!shaka.extern.xml.Node} qualityLevel
    * @param {?string} codecPrivateData
    * @return {string}
    * @private
@@ -841,14 +860,14 @@ shaka.mss.MssParser = class {
   /**
    * @param {!shaka.media.InitSegmentReference} initSegmentRef
    * @param {!shaka.extern.Stream} stream
-   * @param {!Element} streamIndex
+   * @param {!shaka.extern.xml.Node} streamIndex
    * @param {!Array.<shaka.mss.MssParser.TimeRange>} timeline
    * @return {!Array.<!shaka.media.SegmentReference>}
    * @private
    */
   createSegments_(initSegmentRef, stream, streamIndex, timeline) {
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
-    const url = streamIndex.getAttribute('Url');
+    const url = streamIndex.attributes['Url'];
     goog.asserts.assert(url, 'Missing URL for segments');
 
     const mediaUrl = url.replace('{bitrate}', String(stream.bandwidth));
@@ -877,7 +896,7 @@ shaka.mss.MssParser = class {
    * Expands a streamIndex into an array-based timeline.  The results are in
    * seconds.
    *
-   * @param {!Element} streamIndex
+   * @param {!shaka.extern.xml.Node} streamIndex
    * @param {number} timescale
    * @param {number} duration The duration in seconds.
    * @return {!Array.<shaka.mss.MssParser.TimeRange>}
@@ -890,9 +909,9 @@ shaka.mss.MssParser = class {
     goog.asserts.assert(
         duration > 0, 'duration must be a positive integer');
 
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
 
-    const timePoints = XmlUtils.findChildren(streamIndex, 'c');
+    const timePoints = TXml.findChildren(streamIndex, 'c');
 
     /** @type {!Array.<shaka.mss.MssParser.TimeRange>} */
     const timeline = [];
@@ -902,10 +921,10 @@ shaka.mss.MssParser = class {
       const timePoint = timePoints[i];
       const next = timePoints[i + 1];
       const t =
-          XmlUtils.parseAttr(timePoint, 't', XmlUtils.parseNonNegativeInt);
+          TXml.parseAttr(timePoint, 't', TXml.parseNonNegativeInt);
       const d =
-          XmlUtils.parseAttr(timePoint, 'd', XmlUtils.parseNonNegativeInt);
-      const r = XmlUtils.parseAttr(timePoint, 'r', XmlUtils.parseInt);
+          TXml.parseAttr(timePoint, 'd', TXml.parseNonNegativeInt);
+      const r = TXml.parseAttr(timePoint, 'r', TXml.parseInt);
 
       if (!d) {
         shaka.log.warning(
@@ -920,7 +939,7 @@ shaka.mss.MssParser = class {
       if (repeat < 0) {
         if (next) {
           const nextStartTime =
-              XmlUtils.parseAttr(next, 't', XmlUtils.parseNonNegativeInt);
+              TXml.parseAttr(next, 't', TXml.parseNonNegativeInt);
           if (nextStartTime == null) {
             shaka.log.warning(
                 'An "c" element cannot have a negative repeat',

package/lib/net/networking_engine.js

@@ -46,7 +46,8 @@ goog.require('shaka.util.Timer');
  */
 shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
   /**
-   * @param {function(number, number, boolean)=} onProgressUpdated Called when
+   * @param {shaka.net.NetworkingEngine.onProgressUpdated=} onProgressUpdated
+   *   Called when
    *   a progress event is triggered. Passed the duration, in milliseconds,
    *   that the request took, the number of bytes transferred, and the boolean
    *   of whether the switching is allowed.
@@ -58,9 +59,11 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
    *   Called when a request is made
    * @param {shaka.net.NetworkingEngine.OnRetry=} onRetry
    *   Called when a request retry is made
+   * @param {shaka.net.NetworkingEngine.OnResponse=} onResponse
+   *   Called when receive the response
    */
   constructor(onProgressUpdated, onHeadersReceived, onDownloadFailed,
-      onRequest, onRetry) {
+      onRequest, onRetry, onResponse) {
     super();
 
     /** @private {boolean} */
@@ -75,7 +78,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     /** @private {!Set.<shaka.extern.ResponseFilter>} */
     this.responseFilters_ = new Set();
 
-    /** @private {?function(number, number, boolean)} */
+    /** @private {?shaka.net.NetworkingEngine.onProgressUpdated} */
     this.onProgressUpdated_ = onProgressUpdated || null;
 
     /** @private {?shaka.net.NetworkingEngine.OnHeadersReceived} */
@@ -90,6 +93,9 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     /** @private {?shaka.net.NetworkingEngine.OnRetry} */
     this.onRetry_ = onRetry || null;
 
+    /** @private {?shaka.net.NetworkingEngine.OnResponse} */
+    this.onResponse_ = onResponse || null;
+
     /** @private {boolean} */
     this.forceHTTPS_ = false;
   }
@@ -333,6 +339,9 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
         this.onProgressUpdated_(
             response.timeMs, response.data.byteLength, allowSwitch);
       }
+      if (this.onResponse_) {
+        this.onResponse_(type, response, context);
+      }
       return response;
     }, (e) => {
       // Any error thrown from elsewhere should be recategorized as CRITICAL
@@ -510,6 +519,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
 
       startTimeMs = Date.now();
       const segment = shaka.net.NetworkingEngine.RequestType.SEGMENT;
+      let packetNumber = 0;
 
       const progressUpdated = (time, bytes, numBytesRemaining) => {
         if (connectionTimer) {
@@ -519,8 +529,10 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
           stallTimer.tickAfter(stallTimeoutMs / 1000);
         }
         if (this.onProgressUpdated_ && type == segment) {
+          packetNumber++;
+          request.packetNumber = packetNumber;
           const allowSwitch = this.allowSwitch_(context);
-          this.onProgressUpdated_(time, bytes, allowSwitch);
+          this.onProgressUpdated_(time, bytes, allowSwitch, request);
           gotProgress = true;
           numBytesRemainingObj.setBytes(numBytesRemaining);
         }
@@ -530,7 +542,11 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
           this.onHeadersReceived_(headers, request, type);
         }
         headersReceivedCalled = true;
+        request.timeToFirstByte = Date.now() -
+        /** @type {number} */ (request.requestStartTime);
       };
+      request.requestStartTime = Date.now();
+
       const requestPlugin = plugin(
           request.uris[index], request, type, progressUpdated, headersReceived);
 
@@ -899,6 +915,21 @@ shaka.net.NetworkingEngine.ResponseAndGotProgress;
  */
 shaka.net.NetworkingEngine.OnHeadersReceived;
 
+/**
+ * @typedef {function(
+ *    number,
+ *    number,
+ *    boolean,
+ *    shaka.extern.Request=)}
+ *
+ * @description
+ * A callback that is passed the duration, in milliseconds,
+ * that the request took, the number of bytes transferred, a boolean
+ * representing whether the switching is allowed and a ref to the
+ * original request.
+ * @export
+ */
+shaka.net.NetworkingEngine.onProgressUpdated;
 
 /**
  * @typedef {function(
@@ -941,3 +972,17 @@ shaka.net.NetworkingEngine.OnRequest;
  * @export
  */
 shaka.net.NetworkingEngine.OnRetry;
+
+
+/**
+ * @typedef {function(
+ *    !shaka.net.NetworkingEngine.RequestType,
+ *    !shaka.extern.Response,
+ *    (shaka.extern.RequestContext|undefined))}
+ *
+ * @description
+ * A callback function called on every request
+ * @export
+ */
+shaka.net.NetworkingEngine.OnResponse;
+

package/lib/offline/storage.js

@@ -664,7 +664,8 @@ shaka.offline.Storage = class {
     // Filter the manifest based on what we know MediaCapabilities will be able
     // to play later (no point storing something we can't play).
     await shaka.util.StreamUtils.filterManifestByMediaCapabilities(
-        drmEngine, manifest, config.offline.usePersistentLicense);
+        drmEngine, manifest, config.offline.usePersistentLicense,
+        config.drm.preferredKeySystems);
 
     // Gather all tracks.
     const allTracks = [];
@@ -1656,7 +1657,6 @@ shaka.offline.Storage.defaultSystemIds_ = new Map()
     .set('com.microsoft.playready.software',
         '9a04f07998404286ab92e65be0885f95')
     .set('com.microsoft.playready.hardware',
-        '9a04f07998404286ab92e65be0885f95')
-    .set('com.adobe.primetime', 'f239e769efa348509c16a903c6932efb');
+        '9a04f07998404286ab92e65be0885f95');
 
 shaka.Player.registerSupportPlugin('offline', shaka.offline.Storage.support);