shaka-player 4.7.13 → 4.8.0

package/lib/dash/mpd_utils.js

@@ -13,7 +13,7 @@ goog.require('shaka.util.AbortableOperation');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.Functional');
 goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.XmlUtils');
+goog.require('shaka.util.TXml');
 goog.requireType('shaka.dash.DashParser');
 goog.requireType('shaka.media.PresentationTimeline');
 
@@ -123,7 +123,7 @@ shaka.dash.MpdUtils = class {
    * Expands a SegmentTimeline into an array-based timeline.  The results are in
    * seconds.
    *
-   * @param {!Element} segmentTimeline
+   * @param {!shaka.extern.xml.Node} segmentTimeline
    * @param {number} timescale
    * @param {number} unscaledPresentationTimeOffset
    * @param {number} periodDuration The Period's duration in seconds.
@@ -141,9 +141,9 @@ shaka.dash.MpdUtils = class {
         periodDuration > 0, 'period duration must be a positive integer');
 
     // Alias.
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
 
-    const timePoints = XmlUtils.findChildren(segmentTimeline, 'S');
+    const timePoints = TXml.findChildren(segmentTimeline, 'S');
 
     /** @type {!Array.<shaka.media.PresentationTimeline.TimeRange>} */
     const timeline = [];
@@ -152,12 +152,12 @@ shaka.dash.MpdUtils = class {
     for (let i = 0; i < timePoints.length; ++i) {
       const timePoint = timePoints[i];
       const next = timePoints[i + 1];
-      let t = XmlUtils.parseAttr(timePoint, 't', XmlUtils.parseNonNegativeInt);
+      let t = 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);
 
-      const k = XmlUtils.parseAttr(timePoint, 'k', XmlUtils.parseInt);
+      const k = TXml.parseAttr(timePoint, 'k', TXml.parseInt);
 
       const partialSegments = k || 0;
 
@@ -179,7 +179,7 @@ shaka.dash.MpdUtils = 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 "S" element cannot have a negative repeat',
@@ -260,7 +260,8 @@ shaka.dash.MpdUtils = class {
    * Parses common segment info for SegmentList and SegmentTemplate.
    *
    * @param {shaka.dash.DashParser.Context} context
-   * @param {function(?shaka.dash.DashParser.InheritanceFrame):Element} callback
+   * @param {function(?shaka.dash.DashParser.InheritanceFrame):
+   *   ?shaka.extern.xml.Node} callback
    *   Gets the element that contains the segment info.
    * @return {shaka.dash.MpdUtils.SegmentInfo}
    */
@@ -269,23 +270,23 @@ shaka.dash.MpdUtils = class {
         callback(context.representation),
         'There must be at least one element of the given type.');
     const MpdUtils = shaka.dash.MpdUtils;
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
 
     const timescaleStr =
         MpdUtils.inheritAttribute(context, callback, 'timescale');
     let timescale = 1;
     if (timescaleStr) {
-      timescale = XmlUtils.parsePositiveInt(timescaleStr) || 1;
+      timescale = TXml.parsePositiveInt(timescaleStr) || 1;
     }
 
     const durationStr =
         MpdUtils.inheritAttribute(context, callback, 'duration');
-    let segmentDuration = XmlUtils.parsePositiveInt(durationStr || '');
+    let segmentDuration = TXml.parsePositiveInt(durationStr || '');
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     // TODO: The specification is not clear, check this once it is resolved:
     // https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/404
     if (context.representation.contentType == ContentType.IMAGE) {
-      segmentDuration = XmlUtils.parseFloat(durationStr || '');
+      segmentDuration = TXml.parseFloat(durationStr || '');
     }
     if (segmentDuration) {
       segmentDuration /= timescale;
@@ -296,7 +297,7 @@ shaka.dash.MpdUtils = class {
     const unscaledPresentationTimeOffset =
         Number(MpdUtils.inheritAttribute(context, callback,
             'presentationTimeOffset')) || 0;
-    let startNumber = XmlUtils.parseNonNegativeInt(startNumberStr || '');
+    let startNumber = TXml.parseNonNegativeInt(startNumberStr || '');
     if (startNumberStr == null || startNumber == null) {
       startNumber = 1;
     }
@@ -326,8 +327,9 @@ shaka.dash.MpdUtils = class {
   /**
    * Parses common attributes for Representation, AdaptationSet, and Period.
    * @param {shaka.dash.DashParser.Context} context
-   * @param {function(?shaka.dash.DashParser.InheritanceFrame):Element} callback
-   * @return {!Array.<!Element>}
+   * @param {function(?shaka.dash.DashParser.InheritanceFrame):
+   *    ?shaka.extern.xml.Node} callback
+   * @return {!Array.<!shaka.extern.xml.Node>}
     */
   static getNodes(context, callback) {
     const Functional = shaka.util.Functional;
@@ -347,7 +349,8 @@ shaka.dash.MpdUtils = class {
    * Searches the inheritance for a Segment* with the given attribute.
    *
    * @param {shaka.dash.DashParser.Context} context
-   * @param {function(?shaka.dash.DashParser.InheritanceFrame):Element} callback
+   * @param {function(?shaka.dash.DashParser.InheritanceFrame):
+   *   ?shaka.extern.xml.Node} callback
    *   Gets the Element that contains the attribute to inherit.
    * @param {string} attribute
    * @return {?string}
@@ -358,7 +361,7 @@ shaka.dash.MpdUtils = class {
 
     let result = null;
     for (const node of nodes) {
-      result = node.getAttribute(attribute);
+      result = node.attributes[attribute];
       if (result) {
         break;
       }
@@ -370,19 +373,20 @@ shaka.dash.MpdUtils = class {
    * Searches the inheritance for a Segment* with the given child.
    *
    * @param {shaka.dash.DashParser.Context} context
-   * @param {function(?shaka.dash.DashParser.InheritanceFrame):Element} callback
+   * @param {function(?shaka.dash.DashParser.InheritanceFrame):
+   *   ?shaka.extern.xml.Node} callback
    *   Gets the Element that contains the child to inherit.
    * @param {string} child
-   * @return {Element}
+   * @return {?shaka.extern.xml.Node}
    */
   static inheritChild(context, callback, child) {
     const MpdUtils = shaka.dash.MpdUtils;
     const nodes = MpdUtils.getNodes(context, callback);
 
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
     let result = null;
     for (const node of nodes) {
-      result = XmlUtils.findChild(node, child);
+      result = TXml.findChild(node, child);
       if (result) {
         break;
       }
@@ -395,33 +399,35 @@ shaka.dash.MpdUtils = class {
    * It also strips the xlink properties off of the element,
    * even if the process fails.
    *
-   * @param {!Element} element
+   * @param {!shaka.extern.xml.Node} element
    * @param {!shaka.extern.RetryParameters} retryParameters
    * @param {boolean} failGracefully
    * @param {string} baseUri
    * @param {!shaka.net.NetworkingEngine} networkingEngine
    * @param {number} linkDepth
-   * @return {!shaka.util.AbortableOperation.<!Element>}
+   * @return {!shaka.util.AbortableOperation.<!shaka.extern.xml.Node>}
    * @private
    */
   static handleXlinkInElement_(
       element, retryParameters, failGracefully, baseUri, networkingEngine,
       linkDepth) {
     const MpdUtils = shaka.dash.MpdUtils;
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
     const Error = shaka.util.Error;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
     const NS = MpdUtils.XlinkNamespaceUri_;
 
-    const xlinkHref = XmlUtils.getAttributeNS(element, NS, 'href');
+    const xlinkHref = TXml.getAttributeNS(element, NS, 'href');
     const xlinkActuate =
-        XmlUtils.getAttributeNS(element, NS, 'actuate') || 'onRequest';
+        TXml.getAttributeNS(element, NS, 'actuate') || 'onRequest';
 
     // Remove the xlink properties, so it won't download again
     // when re-processed.
-    for (const attribute of Array.from(element.attributes)) {
-      if (attribute.namespaceURI == NS) {
-        element.removeAttributeNS(attribute.namespaceURI, attribute.localName);
+    for (const key of Object.keys(element.attributes)) {
+      const segs = key.split(':');
+      const namespace = shaka.util.TXml.getKnownNameSpace(NS);
+      if (segs[0] == namespace) {
+        delete element.attributes[key];
       }
     }
 
@@ -465,7 +471,7 @@ shaka.dash.MpdUtils = class {
           // top-level element.  If there are multiple roots, it will be
           // rejected.
           const rootElem =
-          shaka.util.XmlUtils.parseXml(response.data, element.tagName);
+              TXml.parseXml(response.data, element.tagName);
           if (!rootElem) {
             // It was not valid XML.
             return shaka.util.AbortableOperation.failed(new Error(
@@ -477,20 +483,20 @@ shaka.dash.MpdUtils = class {
           // the element can be changed further.
 
           // Remove the current contents of the node.
-          while (element.childNodes.length) {
-            element.removeChild(element.childNodes[0]);
-          }
+          element.children = [];
 
           // Move the children of the loaded xml into the current element.
-          while (rootElem.childNodes.length) {
-            const child = rootElem.childNodes[0];
-            rootElem.removeChild(child);
-            element.appendChild(child);
+          while (rootElem.children.length) {
+            const child = rootElem.children.shift();
+            if (TXml.isNode(child)) {
+              child.parent = element;
+            }
+            element.children.push(child);
           }
 
           // Move the attributes of the loaded xml into the current element.
-          for (const attribute of Array.from(rootElem.attributes)) {
-            element.setAttributeNode(attribute.cloneNode(/* deep= */ false));
+          for (const key of Object.keys(rootElem.attributes)) {
+            element.attributes[key] = rootElem.attributes[key];
           }
 
           return shaka.dash.MpdUtils.processXlinks(
@@ -503,25 +509,26 @@ shaka.dash.MpdUtils = class {
    * Filter the contents of a node recursively, replacing xlink links
    * with their associated online data.
    *
-   * @param {!Element} element
+   * @param {!shaka.extern.xml.Node} element
    * @param {!shaka.extern.RetryParameters} retryParameters
    * @param {boolean} failGracefully
    * @param {string} baseUri
    * @param {!shaka.net.NetworkingEngine} networkingEngine
    * @param {number=} linkDepth, default set to 0
-   * @return {!shaka.util.AbortableOperation.<!Element>}
+   * @return {!shaka.util.AbortableOperation.<!shaka.extern.xml.Node>}
    */
   static processXlinks(
-      element, retryParameters, failGracefully, baseUri, networkingEngine,
+      element, retryParameters,
+      failGracefully, baseUri, networkingEngine,
       linkDepth = 0) {
     const MpdUtils = shaka.dash.MpdUtils;
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
     const NS = MpdUtils.XlinkNamespaceUri_;
 
-    if (XmlUtils.getAttributeNS(element, NS, 'href')) {
+    if (TXml.getAttributeNS(element, NS, 'href')) {
       let handled = MpdUtils.handleXlinkInElement_(
-          element, retryParameters, failGracefully, baseUri, networkingEngine,
-          linkDepth);
+          element, retryParameters, failGracefully,
+          baseUri, networkingEngine, linkDepth);
       if (failGracefully) {
         // Catch any error and go on.
         handled = handled.chain(undefined, (error) => {
@@ -537,23 +544,23 @@ shaka.dash.MpdUtils = class {
     }
 
     const childOperations = [];
-    for (const child of Array.from(element.childNodes)) {
-      if (child instanceof Element) {
-        const resolveToZeroString = 'urn:mpeg:dash:resolve-to-zero:2013';
-        if (XmlUtils.getAttributeNS(child, NS, 'href') == resolveToZeroString) {
-          // This is a 'resolve to zero' code; it means the element should
-          // be removed, as specified by the mpeg-dash rules for xlink.
-          element.removeChild(child);
-        } else if (child.tagName != 'SegmentTimeline') {
-          // Don't recurse into a SegmentTimeline since xlink attributes
-          // aren't valid in there and looking at each segment can take a long
-          // time with larger manifests.
-
-          // Replace the child with its processed form.
-          childOperations.push(shaka.dash.MpdUtils.processXlinks(
-              /** @type {!Element} */ (child), retryParameters, failGracefully,
-              baseUri, networkingEngine, linkDepth));
-        }
+    for (const child of shaka.util.TXml.getChildNodes(element)) {
+      const resolveToZeroString = 'urn:mpeg:dash:resolve-to-zero:2013';
+      if (TXml.getAttributeNS(child, NS, 'href') == resolveToZeroString) {
+        // This is a 'resolve to zero' code; it means the element should
+        // be removed, as specified by the mpeg-dash rules for xlink.
+        element.children = element.children.filter(
+            (elem) => elem !== child);
+      } else if (child.tagName != 'SegmentTimeline') {
+        // Don't recurse into a SegmentTimeline since xlink attributes
+        // aren't valid in there and looking at each segment can take a long
+        // time with larger manifests.
+
+        // Replace the child with its processed form.
+        childOperations.push(shaka.dash.MpdUtils.processXlinks(
+            /** @type {!shaka.extern.xml.Node} */ (child),
+            retryParameters, failGracefully,
+            baseUri, networkingEngine, linkDepth));
       }
     }
 

package/lib/dash/segment_base.js

@@ -16,7 +16,8 @@ goog.require('shaka.media.WebmSegmentIndexParser');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.ObjectUtils');
-goog.require('shaka.util.XmlUtils');
+goog.require('shaka.util.StringUtils');
+goog.require('shaka.util.TXml');
 goog.requireType('shaka.dash.DashParser');
 goog.requireType('shaka.media.PresentationTimeline');
 goog.requireType('shaka.media.SegmentReference');
@@ -30,14 +31,16 @@ shaka.dash.SegmentBase = class {
    * Creates an init segment reference from a Context object.
    *
    * @param {shaka.dash.DashParser.Context} context
-   * @param {function(?shaka.dash.DashParser.InheritanceFrame):Element} callback
-   * @param {shaka.extern.aes128Key|undefined} aes128Key
+   * @param {function(?shaka.dash.DashParser.InheritanceFrame):
+   *    ?shaka.extern.xml.Node} callback
+   * @param {shaka.extern.aesKey|undefined} aesKey
    * @return {shaka.media.InitSegmentReference}
    */
-  static createInitSegment(context, callback, aes128Key) {
+  static createInitSegment(context, callback, aesKey) {
     const MpdUtils = shaka.dash.MpdUtils;
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
+    const StringUtils = shaka.util.StringUtils;
 
     const initialization =
         MpdUtils.inheritChild(context, callback, 'Initialization');
@@ -46,15 +49,16 @@ shaka.dash.SegmentBase = class {
     }
 
     let resolvedUris = context.representation.getBaseUris();
-    const uri = initialization.getAttribute('sourceURL');
+    const uri = initialization.attributes['sourceURL'];
     if (uri) {
-      resolvedUris = ManifestParserUtils.resolveUris(resolvedUris, [uri]);
+      resolvedUris = ManifestParserUtils.resolveUris(resolvedUris, [
+        StringUtils.htmlUnescape(uri),
+      ]);
     }
 
     let startByte = 0;
     let endByte = null;
-    const range =
-        XmlUtils.parseAttr(initialization, 'range', XmlUtils.parseRange);
+    const range = TXml.parseAttr(initialization, 'range', TXml.parseRange);
     if (range) {
       startByte = range.start;
       endByte = range.end;
@@ -69,7 +73,7 @@ shaka.dash.SegmentBase = class {
         qualityInfo,
         /* timescale= */ null,
         /* segmentData= */ null,
-        aes128Key);
+        aesKey);
     ref.codecs = context.representation.codecs;
     ref.mimeType = context.representation.mimeType;
     return ref;
@@ -80,17 +84,17 @@ shaka.dash.SegmentBase = class {
    *
    * @param {shaka.dash.DashParser.Context} context
    * @param {shaka.dash.DashParser.RequestSegmentCallback} requestSegment
-   * @param {shaka.extern.aes128Key|undefined} aes128Key
+   * @param {shaka.extern.aesKey|undefined} aesKey
    * @return {shaka.dash.DashParser.StreamInfo}
    */
-  static createStreamInfo(context, requestSegment, aes128Key) {
+  static createStreamInfo(context, requestSegment, aesKey) {
     goog.asserts.assert(context.representation.segmentBase,
         'Should only be called with SegmentBase');
     // Since SegmentBase does not need updates, simply treat any call as
     // the initial parse.
     const MpdUtils = shaka.dash.MpdUtils;
     const SegmentBase = shaka.dash.SegmentBase;
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
 
     const unscaledPresentationTimeOffset = Number(MpdUtils.inheritAttribute(
         context, SegmentBase.fromInheritance_, 'presentationTimeOffset')) || 0;
@@ -99,14 +103,14 @@ shaka.dash.SegmentBase = class {
         context, SegmentBase.fromInheritance_, 'timescale');
     let timescale = 1;
     if (timescaleStr) {
-      timescale = XmlUtils.parsePositiveInt(timescaleStr) || 1;
+      timescale = TXml.parsePositiveInt(timescaleStr) || 1;
     }
 
     const scaledPresentationTimeOffset =
         (unscaledPresentationTimeOffset / timescale) || 0;
 
     const initSegmentReference = SegmentBase.createInitSegment(
-        context, SegmentBase.fromInheritance_, aes128Key);
+        context, SegmentBase.fromInheritance_, aesKey);
 
     // Throws an immediate error if the format is unsupported.
     SegmentBase.checkSegmentIndexRangeSupport_(context, initSegmentReference);
@@ -208,7 +212,7 @@ shaka.dash.SegmentBase = class {
 
   /**
    * @param {?shaka.dash.DashParser.InheritanceFrame} frame
-   * @return {Element}
+   * @return {?shaka.extern.xml.Node}
    * @private
    */
   static fromInheritance_(frame) {
@@ -225,17 +229,17 @@ shaka.dash.SegmentBase = class {
   static computeIndexRange_(context) {
     const MpdUtils = shaka.dash.MpdUtils;
     const SegmentBase = shaka.dash.SegmentBase;
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
 
     const representationIndex = MpdUtils.inheritChild(
         context, SegmentBase.fromInheritance_, 'RepresentationIndex');
     const indexRangeElem = MpdUtils.inheritAttribute(
         context, SegmentBase.fromInheritance_, 'indexRange');
 
-    let indexRange = XmlUtils.parseRange(indexRangeElem || '');
+    let indexRange = TXml.parseRange(indexRangeElem || '');
     if (representationIndex) {
-      indexRange = XmlUtils.parseAttr(
-          representationIndex, 'range', XmlUtils.parseRange, indexRange);
+      indexRange = TXml.parseAttr(
+          representationIndex, 'range', TXml.parseRange, indexRange);
     }
     return indexRange;
   }
@@ -251,13 +255,15 @@ shaka.dash.SegmentBase = class {
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
     const MpdUtils = shaka.dash.MpdUtils;
     const SegmentBase = shaka.dash.SegmentBase;
+    const StringUtils = shaka.util.StringUtils;
 
     const representationIndex = MpdUtils.inheritChild(
         context, SegmentBase.fromInheritance_, 'RepresentationIndex');
 
     let indexUris = context.representation.getBaseUris();
     if (representationIndex) {
-      const representationUri = representationIndex.getAttribute('sourceURL');
+      const representationUri =
+        StringUtils.htmlUnescape(representationIndex.attributes['sourceURL']);
       if (representationUri) {
         indexUris = ManifestParserUtils.resolveUris(
             indexUris, [representationUri]);

package/lib/dash/segment_list.js

@@ -16,7 +16,8 @@ goog.require('shaka.media.SegmentReference');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.Functional');
 goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.XmlUtils');
+goog.require('shaka.util.StringUtils');
+goog.require('shaka.util.TXml');
 goog.requireType('shaka.dash.DashParser');
 goog.requireType('shaka.media.PresentationTimeline');
 
@@ -31,16 +32,16 @@ shaka.dash.SegmentList = class {
    *
    * @param {shaka.dash.DashParser.Context} context
    * @param {!Object.<string, !shaka.extern.Stream>} streamMap
-   * @param {shaka.extern.aes128Key|undefined} aes128Key
+   * @param {shaka.extern.aesKey|undefined} aesKey
    * @return {shaka.dash.DashParser.StreamInfo}
    */
-  static createStreamInfo(context, streamMap, aes128Key) {
+  static createStreamInfo(context, streamMap, aesKey) {
     goog.asserts.assert(context.representation.segmentList,
         'Should only be called with SegmentList');
     const SegmentList = shaka.dash.SegmentList;
 
     const initSegmentReference = shaka.dash.SegmentBase.createInitSegment(
-        context, SegmentList.fromInheritance_, aes128Key);
+        context, SegmentList.fromInheritance_, aesKey);
     const info = SegmentList.parseSegmentListInfo_(context);
 
     SegmentList.checkSegmentListInfo_(context, info);
@@ -60,7 +61,7 @@ shaka.dash.SegmentList = class {
     const references = SegmentList.createSegmentReferences_(
         context.periodInfo.start, context.periodInfo.duration,
         info.startNumber, context.representation.getBaseUris, info,
-        initSegmentReference, aes128Key, context.representation.mimeType,
+        initSegmentReference, aesKey, context.representation.mimeType,
         context.representation.codecs);
 
     const isNew = !segmentIndex;
@@ -95,7 +96,7 @@ shaka.dash.SegmentList = class {
 
   /**
    * @param {?shaka.dash.DashParser.InheritanceFrame} frame
-   * @return {Element}
+   * @return {?shaka.extern.xml.Node}
    * @private
    */
   static fromInheritance_(frame) {
@@ -199,7 +200,7 @@ shaka.dash.SegmentList = class {
    * @param {function():!Array.<string>} getBaseUris
    * @param {shaka.dash.SegmentList.SegmentListInfo} info
    * @param {shaka.media.InitSegmentReference} initSegmentReference
-   * @param {shaka.extern.aes128Key|undefined} aes128Key
+   * @param {shaka.extern.aesKey|undefined} aesKey
    * @param {string} mimeType
    * @param {string} codecs
    * @return {!Array.<!shaka.media.SegmentReference>}
@@ -207,7 +208,7 @@ shaka.dash.SegmentList = class {
    */
   static createSegmentReferences_(
       periodStart, periodDuration, startNumber, getBaseUris, info,
-      initSegmentReference, aes128Key, mimeType, codecs) {
+      initSegmentReference, aesKey, mimeType, codecs) {
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
 
     let max = info.mediaSegments.length;
@@ -269,7 +270,7 @@ shaka.dash.SegmentList = class {
           /* tileDuration= */ null,
           /* syncTime= */ null,
           shaka.media.SegmentReference.Status.AVAILABLE,
-          aes128Key);
+          aesKey);
       ref.codecs = codecs;
       ref.mimeType = mimeType;
       references.push(ref);
@@ -288,21 +289,22 @@ shaka.dash.SegmentList = class {
    */
   static parseMediaSegments_(context) {
     const Functional = shaka.util.Functional;
-    /** @type {!Array.<!Element>} */
+    /** @type {!Array.<!shaka.extern.xml.Node>} */
     const segmentLists = [
       context.representation.segmentList,
       context.adaptationSet.segmentList,
       context.period.segmentList,
     ].filter(Functional.isNotNull);
 
-    const XmlUtils = shaka.util.XmlUtils;
+    const TXml = shaka.util.TXml;
+    const StringUtils = shaka.util.StringUtils;
     // Search each SegmentList for one with at least one SegmentURL element,
     // select the first one, and convert each SegmentURL element to a tuple.
     return segmentLists
-        .map((node) => { return XmlUtils.findChildren(node, 'SegmentURL'); })
+        .map((node) => { return TXml.findChildren(node, 'SegmentURL'); })
         .reduce((all, part) => { return all.length > 0 ? all : part; })
         .map((urlNode) => {
-          if (urlNode.getAttribute('indexRange') &&
+          if (urlNode.attributes['indexRange'] &&
               !context.indexRangeWarningGiven) {
             context.indexRangeWarningGiven = true;
             shaka.log.warning(
@@ -311,9 +313,9 @@ shaka.dash.SegmentList = class {
                 'attribute or SegmentTimeline, which must be accurate.');
           }
 
-          const uri = urlNode.getAttribute('media');
-          const range = XmlUtils.parseAttr(
-              urlNode, 'mediaRange', XmlUtils.parseRange,
+          const uri = StringUtils.htmlUnescape(urlNode.attributes['media']);
+          const range = TXml.parseAttr(
+              urlNode, 'mediaRange', TXml.parseRange,
               {start: 0, end: null});
           return {mediaUri: uri, start: range.start, end: range.end};
         });