shaka-player 4.7.13 → 4.8.0

package/externs/shaka/text.js

@@ -85,6 +85,18 @@ shaka.extern.TextParser = class {
 shaka.extern.TextParser.TimeContext;
 
 
+/**
+ * A callback used for editing cues before appending.
+ * Provides the cue, the URI of the captions file the cue was parsed from, and
+ * the time context that was used when generating that cue.
+ * You can edit the cue object passed in.
+ * @typedef {function(!shaka.text.Cue, ?string,
+ *    !shaka.extern.TextParser.TimeContext)}
+ * @exportDoc
+ */
+shaka.extern.TextParser.ModifyCueCallback;
+
+
 /**
  * @typedef {function():!shaka.extern.TextParser}
  * @exportDoc
@@ -120,6 +132,13 @@ shaka.extern.TextDisplayer = class {
    */
   destroy() {}
 
+  /**
+   * Sets the TextDisplayer configuration.
+   *
+   * @param {shaka.extern.TextDisplayerConfiguration} config
+   */
+  configure(config) {}
+
   /**
    * Append given text cues to the list of cues to be displayed.
    *

package/externs/tizen.js

@@ -0,0 +1,41 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Externs for Tizen
+ * @externs
+ */
+
+
+/** @const */
+var webapis = {};
+
+
+/** @const */
+webapis.systeminfo = {};
+
+
+/**
+ * @return {{width: number, height: number}}
+ */
+webapis.systeminfo.getMaxVideoResolution = function() {};
+
+
+/** @const */
+webapis.productinfo = {};
+
+
+/**
+ * @return {boolean}
+ */
+webapis.productinfo.is8KPanelSupported = function() {};
+
+
+/**
+ * @return {boolean}
+ */
+webapis.productinfo.isUdPanelSupported = function() {};
+

package/externs/webos.js

@@ -0,0 +1,19 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Externs for WebOS
+ *
+ * @externs
+ */
+
+
+/** @const */
+var PalmSystem = {};
+
+
+/** @type {string} */
+PalmSystem.deviceInfo;

package/externs/xbox.js

@@ -0,0 +1,43 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Externs for Xbox
+ *
+ * @externs
+ */
+
+
+/** @const */
+var Windows = {};
+
+
+/** @const */
+Windows.Media = {};
+
+
+/** @const */
+Windows.Media.Protection = {};
+
+
+/** @const */
+Windows.Media.Protection.ProtectionCapabilities = class {
+  /**
+   * @param {string} type
+   * @param {string} keySystem
+   * @return {!Windows.Media.Protection.ProtectionCapabilityResult}
+   */
+  isTypeSupported(type, keySystem) {}
+};
+
+/**
+ * @enum {string}
+ */
+Windows.Media.Protection.ProtectionCapabilityResult = {
+  notSupported: 'NotSupported',
+  maybe: 'Maybe',
+  probably: 'Probably',
+};

package/lib/abr/simple_abr_manager.js

@@ -297,11 +297,19 @@ shaka.abr.SimpleAbrManager = class {
 
 
   /**
+   * @param {number} deltaTimeMs The duration, in milliseconds, that the request
+   *     took to complete.
+   * @param {number} numBytes The total number of bytes transferred.
+   * @param {boolean} allowSwitch Indicate if the segment is allowed to switch
+   *     to another stream.
+   * @param {shaka.extern.Request=} request
+   *     A reference to the request
    * @override
    * @export
    */
-  segmentDownloaded(deltaTimeMs, numBytes, allowSwitch) {
+  segmentDownloaded(deltaTimeMs, numBytes, allowSwitch, request) {
     shaka.log.v2('Segment downloaded:',
+        'contentType=' + (request && request.contentType),
         'deltaTimeMs=' + deltaTimeMs,
         'numBytes=' + numBytes,
         'lastTimeChosenMs=' + this.lastTimeChosenMs_,

package/lib/ads/ad_manager.js

@@ -560,6 +560,23 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
   }
 
 
+  /**
+   * @param {string} url
+   * @override
+   * @export
+   */
+  addMediaTailorTrackingUrl(url) {
+    if (!this.mtAdManager_) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.RECOVERABLE,
+          shaka.util.Error.Category.ADS,
+          shaka.util.Error.Code.MT_AD_MANAGER_NOT_INITIALIZED);
+    }
+
+    this.mtAdManager_.addTrackingUrl(url);
+  }
+
+
   /**
    * @override
    * @export
@@ -705,8 +722,8 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
   onDashTimedMetadata(region) {
     if (this.ssAdManager_ && region.schemeIdUri == 'urn:google:dai:2018') {
       const type = region.schemeIdUri;
-      const data = region.eventElement ?
-          region.eventElement.getAttribute('messageData') : null;
+      const data = region.eventNode ?
+          region.eventNode.attributes['messageData'] : null;
       const timestamp = region.startTime;
       this.ssAdManager_.onTimedMetadata(type, data, timestamp);
     }

package/lib/ads/client_side_ad_manager.js

@@ -308,7 +308,7 @@ shaka.ads.ClientSideAdManager = class {
       // seen the ads actually play until requestAds() is called.
       // Note: We listen for a play event to avoid autoplay issues that might
       // crash IMA.
-      if (this.videoPlayed_) {
+      if (this.videoPlayed_ || this.config_.skipPlayDetection) {
         this.imaAdsManager_.start();
       } else {
         this.eventManager_.listenOnce(this.video_, 'play', () => {
@@ -533,7 +533,9 @@ shaka.ads.ClientSideAdManager = class {
         shaka.ads.AdManager.AD_STARTED, data));
     if (this.ad_.isLinear()) {
       this.adContainer_.setAttribute('ad-active', 'true');
-      this.video_.pause();
+      if (!this.config_.customPlayheadTracker) {
+        this.video_.pause();
+      }
       if (this.video_.muted) {
         this.ad_.setInitialMuted(this.video_.volume);
       } else {
@@ -551,7 +553,7 @@ shaka.ads.ClientSideAdManager = class {
         (new Map()).set('originalEvent', e)));
     if (this.ad_ && this.ad_.isLinear()) {
       this.adContainer_.removeAttribute('ad-active');
-      if (!this.video_.ended) {
+      if (!this.config_.customPlayheadTracker && !this.video_.ended) {
         this.video_.play();
       }
     }

package/lib/ads/media_tailor_ad_manager.js

@@ -130,6 +130,15 @@ shaka.ads.MediaTailorAdManager = class {
     return this.streamPromise_;
   }
 
+  /**
+   * @param {string} url
+   */
+  addTrackingUrl(url) {
+    this.trackingUrl_ = url;
+    this.onEvent_(new shaka.util.FakeEvent(shaka.ads.AdManager.ADS_LOADED,
+        (new Map()).set('loadTime', 0)));
+  }
+
   /**
    * Resets the MediaTailor manager and removes any continuous polling.
    */

package/lib/cast/cast_receiver.js

@@ -287,20 +287,6 @@ shaka.cast.CastReceiver = class extends shaka.util.FakeEventTarget {
           this.player_, name, (event) => this.proxyEvent_('player', event));
     }
 
-    // In our tests, the original Chromecast seems to have trouble decoding
-    // above 1080p.  It would be a waste to select a higher res anyway, given
-    // that the device only outputs 1080p to begin with.
-
-    // Chromecast has an extension to query the device/display's resolution.
-    if (cast.__platform__ && cast.__platform__.canDisplayType(
-        'video/mp4; codecs="avc1.640028"; width=3840; height=2160')) {
-      // The device and display can both do 4k.  Assume a 4k limit.
-      this.player_.setMaxHardwareResolution(3840, 2160);
-    } else {
-      // Chromecast has always been able to do 1080p.  Assume a 1080p limit.
-      this.player_.setMaxHardwareResolution(1920, 1080);
-    }
-
     // Do not start excluding values from update messages until the video is
     // fully loaded.
     this.eventManager_.listen(this.video_, 'loadeddata', () => {

package/lib/cast/cast_utils.js

@@ -355,6 +355,7 @@ shaka.cast.CastUtils.LargePlayerGetterMethods = {
 shaka.cast.CastUtils.PlayerGetterMethodsThatRequireLive = {
   'getPlayheadTimeAsDate': 1,
   'getPresentationStartTimeAsDate': 20,
+  'getSegmentAvailabilityDuration': 20,
 };
 
 

package/lib/cea/mp4_cea_parser.js

@@ -107,6 +107,8 @@ shaka.cea.Mp4CeaParser = class {
         .box('avc3', codecBoxParser)
         .box('hev1', codecBoxParser)
         .box('hvc1', codecBoxParser)
+        .box('dvav', codecBoxParser)
+        .box('dva1', codecBoxParser)
         .box('dvh1', codecBoxParser)
         .box('dvhe', codecBoxParser)
 
@@ -374,7 +376,10 @@ shaka.cea.Mp4CeaParser.CodecBitstreamMap_ = {
   'avc3': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
   'hev1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
   'hvc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
-  // Dobly vision is also H265.
+  // Dolby Vision based in AVC
+  'dvav': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
+  'dva1': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
+  // Dolby Vision based in HEVC
   'dvh1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
   'dvhe': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
 };

package/lib/dash/content_protection.js

@@ -13,8 +13,8 @@ goog.require('shaka.util.Error');
 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');
 
 
 /**
@@ -25,7 +25,7 @@ shaka.dash.ContentProtection = class {
   /**
    * Parses info from the ContentProtection elements at the AdaptationSet level.
    *
-   * @param {!Array.<!Element>} elems
+   * @param {!Array.<!shaka.extern.xml.Node>} elems
    * @param {boolean} ignoreDrmInfo
    * @param {!Object.<string, string>} keySystemsByURI
    * @return {shaka.dash.ContentProtection.Context}
@@ -47,6 +47,8 @@ shaka.dash.ContentProtection = class {
     // Remove any possible null value (elements may have no key ids).
     keyIds.delete(null);
 
+    let encryptionScheme = 'cenc';
+
     if (keyIds.size > 1) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
@@ -70,6 +72,14 @@ shaka.dash.ContentProtection = class {
         aes128Info = ContentProtection.parseAes128_(aes128Elements[0]);
       }
 
+      const mp4ProtectionParsed = parsed.find((elem) => {
+        return elem.schemeUri == ContentProtection.MP4Protection_;
+      });
+
+      if (mp4ProtectionParsed && mp4ProtectionParsed.encryptionScheme) {
+        encryptionScheme = mp4ProtectionParsed.encryptionScheme;
+      }
+
       // Find the default key ID and init data.  Create a new array of all the
       // non-CENC elements.
       parsedNonCenc = parsed.filter((elem) => {
@@ -84,13 +94,14 @@ shaka.dash.ContentProtection = class {
       });
 
       if (parsedNonCenc.length) {
-        drmInfos = ContentProtection.convertElements_(
-            defaultInit, parsedNonCenc, keySystemsByURI, keyIds);
+        drmInfos = ContentProtection.convertElements_(defaultInit,
+            encryptionScheme, parsedNonCenc, keySystemsByURI, keyIds);
 
         // If there are no drmInfos after parsing, then add a dummy entry.
         // This may be removed in parseKeyIds.
         if (drmInfos.length == 0) {
-          drmInfos = [ManifestParserUtils.createDrmInfo('', defaultInit)];
+          drmInfos = [ManifestParserUtils.createDrmInfo(
+              '', encryptionScheme, defaultInit)];
         }
       }
     }
@@ -106,8 +117,8 @@ shaka.dash.ContentProtection = class {
         // put clearkey in this list.  Otherwise, it may be triggered when
         // a real key system should be used instead.
         if (keySystem != 'org.w3.clearkey') {
-          const info =
-              ManifestParserUtils.createDrmInfo(keySystem, defaultInit);
+          const info = ManifestParserUtils.createDrmInfo(
+              keySystem, encryptionScheme, defaultInit);
           drmInfos.push(info);
         }
       }
@@ -137,7 +148,7 @@ shaka.dash.ContentProtection = class {
    * Parses the given ContentProtection elements found at the Representation
    * level.  This may update the |context|.
    *
-   * @param {!Array.<!Element>} elems
+   * @param {!Array.<!shaka.extern.xml.Node>} elems
    * @param {shaka.dash.ContentProtection.Context} context
    * @param {boolean} ignoreDrmInfo
    * @param {!Object.<string, string>} keySystemsByURI
@@ -191,17 +202,22 @@ shaka.dash.ContentProtection = class {
    * @return {string}
    */
   static getWidevineLicenseUrl(element) {
-    const dashIfLaurlNode = shaka.util.XmlUtils.findChildNS(
+    const StringUtils = shaka.util.StringUtils;
+    const dashIfLaurlNode = shaka.util.TXml.findChildNS(
         element.node, shaka.dash.ContentProtection.DashIfNamespaceUri_,
         'Laurl',
     );
-    if (dashIfLaurlNode && dashIfLaurlNode.textContent) {
-      return dashIfLaurlNode.textContent;
+    if (dashIfLaurlNode) {
+      const textContents = shaka.util.TXml.getTextContents(dashIfLaurlNode);
+      if (textContents) {
+        return textContents;
+      }
     }
-    const mslaurlNode = shaka.util.XmlUtils.findChildNS(
+    const mslaurlNode = shaka.util.TXml.findChildNS(
         element.node, 'urn:microsoft', 'laurl');
     if (mslaurlNode) {
-      return mslaurlNode.getAttribute('licenseUrl') || '';
+      return StringUtils.htmlUnescape(
+          mslaurlNode.attributes['licenseUrl']) || '';
     }
     return '';
   }
@@ -214,21 +230,27 @@ shaka.dash.ContentProtection = class {
    * @return {string}
    */
   static getClearKeyLicenseUrl(element) {
-    const dashIfLaurlNode = shaka.util.XmlUtils.findChildNS(
+    const dashIfLaurlNode = shaka.util.TXml.findChildNS(
         element.node, shaka.dash.ContentProtection.DashIfNamespaceUri_,
         'Laurl',
     );
-    if (dashIfLaurlNode && dashIfLaurlNode.textContent) {
-      return dashIfLaurlNode.textContent;
+    if (dashIfLaurlNode) {
+      const textContents = shaka.util.TXml.getTextContents(dashIfLaurlNode);
+      if (textContents) {
+        return textContents;
+      }
     }
-    const clearKeyLaurlNode = shaka.util.XmlUtils.findChildNS(
+    const clearKeyLaurlNode = shaka.util.TXml.findChildNS(
         element.node, shaka.dash.ContentProtection.ClearKeyNamespaceUri_,
         'Laurl',
     );
     if (clearKeyLaurlNode &&
-      clearKeyLaurlNode.getAttribute('Lic_type') === 'EME-1.0') {
-      if (clearKeyLaurlNode.textContent) {
-        return clearKeyLaurlNode.textContent;
+        clearKeyLaurlNode.attributes['Lic_type'] === 'EME-1.0') {
+      if (clearKeyLaurlNode) {
+        const textContents = shaka.util.TXml.getTextContents(clearKeyLaurlNode);
+        if (textContents) {
+          return textContents;
+        }
       }
     }
     return '';
@@ -312,18 +334,21 @@ shaka.dash.ContentProtection = class {
   /**
    * PlayReady Header format: https://goo.gl/dBzxNA
    *
-   * @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')) {
-      for (const child of elem.childNodes) {
-        if (child instanceof Element && child.tagName == 'LA_URL') {
-          return child.textContent;
+    for (const elem of TXml.getElementsByTagName(xml, 'DATA')) {
+      if (elem.children) {
+        for (const child of elem.children) {
+          if (child.tagName == 'LA_URL') {
+            return /** @type{string} */(shaka.util.TXml.getTextContents(child));
+          }
         }
       }
     }
@@ -340,25 +365,30 @@ shaka.dash.ContentProtection = class {
    * @return {string}
    */
   static getPlayReadyLicenseUrl(element) {
-    const dashIfLaurlNode = shaka.util.XmlUtils.findChildNS(
+    const dashIfLaurlNode = shaka.util.TXml.findChildNS(
         element.node, shaka.dash.ContentProtection.DashIfNamespaceUri_,
         'Laurl',
     );
-    if (dashIfLaurlNode && dashIfLaurlNode.textContent) {
-      return dashIfLaurlNode.textContent;
+    if (dashIfLaurlNode) {
+      const textContents = shaka.util.TXml.getTextContents(dashIfLaurlNode);
+      if (textContents) {
+        return textContents;
+      }
     }
 
-    const proNode = shaka.util.XmlUtils.findChildNS(
+    const proNode = shaka.util.TXml.findChildNS(
         element.node, 'urn:microsoft:playready', 'pro');
 
-    if (!proNode) {
+    if (!proNode || !shaka.util.TXml.getTextContents(proNode)) {
       return '';
     }
 
     const ContentProtection = shaka.dash.ContentProtection;
     const PLAYREADY_RECORD_TYPES = ContentProtection.PLAYREADY_RECORD_TYPES;
 
-    const bytes = shaka.util.Uint8ArrayUtils.fromBase64(proNode.textContent);
+    const textContent =
+    /** @type {string} */ (shaka.util.TXml.getTextContents(proNode));
+    const bytes = shaka.util.Uint8ArrayUtils.fromBase64(textContent);
     const records = ContentProtection.parseMsPro_(bytes);
     const record = records.filter((record) => {
       return record.type === PLAYREADY_RECORD_TYPES.RIGHTS_MANAGEMENT;
@@ -369,7 +399,7 @@ shaka.dash.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 '';
     }
@@ -386,13 +416,16 @@ shaka.dash.ContentProtection = class {
    * @private
    */
   static getInitDataFromPro_(element) {
-    const proNode = shaka.util.XmlUtils.findChildNS(
+    const proNode = shaka.util.TXml.findChildNS(
         element.node, 'urn:microsoft:playready', 'pro');
-    if (!proNode) {
+    if (!proNode || !shaka.util.TXml.getTextContents(proNode)) {
       return null;
     }
+
     const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
-    const data = Uint8ArrayUtils.fromBase64(proNode.textContent);
+    const textContent =
+    /** @type{string} */ (shaka.util.TXml.getTextContents(proNode));
+    const data = Uint8ArrayUtils.fromBase64(textContent);
     const systemId = new Uint8Array([
       0x9a, 0x04, 0xf0, 0x79, 0x98, 0x40, 0x42, 0x86,
       0xab, 0x92, 0xe6, 0x5b, 0xe0, 0x88, 0x5f, 0x95,
@@ -445,13 +478,15 @@ shaka.dash.ContentProtection = class {
    * Creates DrmInfo objects from the given element.
    *
    * @param {Array.<shaka.extern.InitDataOverride>} defaultInit
+   * @param {string} encryptionScheme
    * @param {!Array.<shaka.dash.ContentProtection.Element>} elements
    * @param {!Object.<string, string>} keySystemsByURI
    * @param {!Set.<string>} keyIds
    * @return {!Array.<shaka.extern.DrmInfo>}
    * @private
    */
-  static convertElements_(defaultInit, elements, keySystemsByURI, keyIds) {
+  static convertElements_(defaultInit, encryptionScheme, elements,
+      keySystemsByURI, keyIds) {
     const ContentProtection = shaka.dash.ContentProtection;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
     const licenseUrlParsers = ContentProtection.licenseUrlParsers_;
@@ -475,7 +510,8 @@ shaka.dash.ContentProtection = class {
         }
         const initData = element.init || defaultInit || proInitData ||
           clearKeyInitData;
-        const info = ManifestParserUtils.createDrmInfo(keySystem, initData);
+        const info = ManifestParserUtils.createDrmInfo(
+            keySystem, encryptionScheme, initData);
         const licenseParser = licenseUrlParsers.get(keySystem);
         if (licenseParser) {
           info.licenseServerUri = licenseParser(element);
@@ -492,7 +528,7 @@ shaka.dash.ContentProtection = class {
    * Parses the given ContentProtection elements.  If there is an error, it
    * removes those elements.
    *
-   * @param {!Array.<!Element>} elems
+   * @param {!Array.<!shaka.extern.xml.Node>} elems
    * @return {!Array.<shaka.dash.ContentProtection.Element>}
    * @private
    */
@@ -513,20 +549,23 @@ shaka.dash.ContentProtection = class {
   /**
    * Parses the given ContentProtection element.
    *
-   * @param {!Element} elem
+   * @param {!shaka.extern.xml.Node} elem
    * @return {?shaka.dash.ContentProtection.Element}
    * @private
    */
   static parseElement_(elem) {
     const NS = shaka.dash.ContentProtection.CencNamespaceUri_;
+    const TXml = shaka.util.TXml;
 
     /** @type {?string} */
-    let schemeUri = elem.getAttribute('schemeIdUri');
+    let schemeUri = elem.attributes['schemeIdUri'];
     /** @type {?string} */
-    let keyId = shaka.util.XmlUtils.getAttributeNS(elem, NS, 'default_KID');
+    let keyId = TXml.getAttributeNS(elem, NS, 'default_KID');
     /** @type {!Array.<string>} */
-    const psshs = shaka.util.XmlUtils.findChildrenNS(elem, NS, 'pssh')
-        .map(shaka.util.XmlUtils.getContents);
+    const psshs = TXml.findChildrenNS(elem, NS, 'pssh')
+        .map(TXml.getContents);
+
+    const encryptionScheme = elem.attributes['value'];
 
     if (!schemeUri) {
       shaka.log.error('Missing required schemeIdUri attribute on',
@@ -565,9 +604,10 @@ shaka.dash.ContentProtection = class {
 
     return {
       node: elem,
-      schemeUri: schemeUri,
-      keyId: keyId,
+      schemeUri,
+      keyId,
       init: (init.length > 0 ? init : null),
+      encryptionScheme,
     };
   }
 
@@ -590,7 +630,7 @@ shaka.dash.ContentProtection = class {
     }
 
     const namespace = 'urn:mpeg:dash:schema:sea:2012';
-    const segmentEncryption = shaka.util.XmlUtils.findChildNS(
+    const segmentEncryption = shaka.util.TXml.findChildNS(
         element.node, namespace, 'SegmentEncryption');
 
     if (!segmentEncryption) {
@@ -602,7 +642,7 @@ shaka.dash.ContentProtection = class {
 
     const aesSchemeIdUri = 'urn:mpeg:dash:sea:aes128-cbc:2013';
     const segmentEncryptionSchemeIdUri =
-        segmentEncryption.getAttribute('schemeIdUri');
+        segmentEncryption.attributes['schemeIdUri'];
     if (segmentEncryptionSchemeIdUri != aesSchemeIdUri) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
@@ -610,7 +650,7 @@ shaka.dash.ContentProtection = class {
           shaka.util.Error.Code.DASH_UNSUPPORTED_AES_128);
     }
 
-    const cryptoPeriod = shaka.util.XmlUtils.findChildNS(
+    const cryptoPeriod = shaka.util.TXml.findChildNS(
         element.node, namespace, 'CryptoPeriod');
 
     if (!cryptoPeriod) {
@@ -620,8 +660,9 @@ shaka.dash.ContentProtection = class {
           shaka.util.Error.Code.DASH_UNSUPPORTED_AES_128);
     }
 
-    const ivHex = cryptoPeriod.getAttribute('IV');
-    const keyUri = cryptoPeriod.getAttribute('keyUriTemplate');
+    const ivHex = cryptoPeriod.attributes['IV'];
+    const keyUri = shaka.util.StringUtils.htmlUnescape(
+        cryptoPeriod.attributes['keyUriTemplate']);
     if (!ivHex || !keyUri) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
@@ -721,16 +762,17 @@ shaka.dash.ContentProtection.Aes128Info;
 
 /**
  * @typedef {{
- *   node: !Element,
+ *   node: !shaka.extern.xml.Node,
  *   schemeUri: string,
  *   keyId: ?string,
- *   init: Array.<shaka.extern.InitDataOverride>
+ *   init: Array.<shaka.extern.InitDataOverride>,
+ *   encryptionScheme: ?string
  * }}
  *
  * @description
  * The parsed result of a single ContentProtection element.
  *
- * @property {!Element} node
+ * @property {!shaka.extern.xml.Node} node
  *   The ContentProtection XML element.
  * @property {string} schemeUri
  *   The scheme URI.
@@ -739,6 +781,8 @@ shaka.dash.ContentProtection.Aes128Info;
  * @property {Array.<shaka.extern.InitDataOverride>} init
  *   The init data, if present.  If there is no init data, it will be null.  If
  *   this is non-null, there is at least one element.
+ * @property {?string} encryptionScheme
+ *   The encryption scheme, if present.
  */
 shaka.dash.ContentProtection.Element;