shaka-player 4.8.8 → 4.9.0

package/lib/util/periods.js

@@ -166,11 +166,12 @@ shaka.util.PeriodCombiner = class {
   /**
    * @param {!Array.<shaka.extern.Period>} periods
    * @param {boolean} isDynamic
+   * @param {boolean=} isPatchUpdate
    * @return {!Promise}
    *
    * @export
    */
-  async combinePeriods(periods, isDynamic) {
+  async combinePeriods(periods, isDynamic, isPatchUpdate = false) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     // Optimization: for single-period VOD, do nothing.  This makes sure
@@ -190,6 +191,8 @@ shaka.util.PeriodCombiner = class {
       this.textStreams_ = Array.from(textStreamsPerPeriod[0].values());
       this.imageStreams_ = Array.from(imageStreamsPerPeriod[0].values());
     } else {
+      // How many periods we've seen before which are not included in this call.
+      const periodsMissing = isPatchUpdate ? this.usedPeriodIds_.size : 0;
       // Find the first period we haven't seen before.  Tag all the periods we
       // see now as "used".
       let firstNewPeriodIndex = -1;
@@ -226,25 +229,29 @@ shaka.util.PeriodCombiner = class {
             audioStreamsPerPeriod,
             firstNewPeriodIndex,
             shaka.util.PeriodCombiner.cloneStream_,
-            shaka.util.PeriodCombiner.concatenateStreams_),
+            shaka.util.PeriodCombiner.concatenateStreams_,
+            periodsMissing),
         this.combine_(
             this.videoStreams_,
             videoStreamsPerPeriod,
             firstNewPeriodIndex,
             shaka.util.PeriodCombiner.cloneStream_,
-            shaka.util.PeriodCombiner.concatenateStreams_),
+            shaka.util.PeriodCombiner.concatenateStreams_,
+            periodsMissing),
         this.combine_(
             this.textStreams_,
             textStreamsPerPeriod,
             firstNewPeriodIndex,
             shaka.util.PeriodCombiner.cloneStream_,
-            shaka.util.PeriodCombiner.concatenateStreams_),
+            shaka.util.PeriodCombiner.concatenateStreams_,
+            periodsMissing),
         this.combine_(
             this.imageStreams_,
             imageStreamsPerPeriod,
             firstNewPeriodIndex,
             shaka.util.PeriodCombiner.cloneStream_,
-            shaka.util.PeriodCombiner.concatenateStreams_),
+            shaka.util.PeriodCombiner.concatenateStreams_,
+            periodsMissing),
       ]);
     }
 
@@ -367,28 +374,32 @@ shaka.util.PeriodCombiner = class {
         audioStreamDbsPerPeriod,
         /* firstNewPeriodIndex= */ 0,
         shaka.util.PeriodCombiner.cloneStreamDB_,
-        shaka.util.PeriodCombiner.concatenateStreamDBs_);
+        shaka.util.PeriodCombiner.concatenateStreamDBs_,
+        /* periodsMissing= */ 0);
 
     const combinedVideoStreamDbs = await periodCombiner.combine_(
         /* outputStreams= */ [],
         videoStreamDbsPerPeriod,
         /* firstNewPeriodIndex= */ 0,
         shaka.util.PeriodCombiner.cloneStreamDB_,
-        shaka.util.PeriodCombiner.concatenateStreamDBs_);
+        shaka.util.PeriodCombiner.concatenateStreamDBs_,
+        /* periodsMissing= */ 0);
 
     const combinedTextStreamDbs = await periodCombiner.combine_(
         /* outputStreams= */ [],
         textStreamDbsPerPeriod,
         /* firstNewPeriodIndex= */ 0,
         shaka.util.PeriodCombiner.cloneStreamDB_,
-        shaka.util.PeriodCombiner.concatenateStreamDBs_);
+        shaka.util.PeriodCombiner.concatenateStreamDBs_,
+        /* periodsMissing= */ 0);
 
     const combinedImageStreamDbs = await periodCombiner.combine_(
         /* outputStreams= */ [],
         imageStreamDbsPerPeriod,
         /* firstNewPeriodIndex= */ 0,
         shaka.util.PeriodCombiner.cloneStreamDB_,
-        shaka.util.PeriodCombiner.concatenateStreamDBs_);
+        shaka.util.PeriodCombiner.concatenateStreamDBs_,
+        /* periodsMissing= */ 0);
 
     // Recreate variantIds from scratch in the output.
     // HLS content is always single-period, so the early return at the top of
@@ -435,6 +446,7 @@ shaka.util.PeriodCombiner = class {
    * @param {function(T):T} clone Make a clone of an input stream.
    * @param {function(T, T)} concat Concatenate the second stream onto the end
    *   of the first.
+   * @param {number} periodsMissing The number of periods missing
    *
    * @return {!Promise.<!Array.<T>>} The same array passed to outputStreams,
    *   modified to include any newly-created streams.
@@ -445,15 +457,18 @@ shaka.util.PeriodCombiner = class {
    * @private
    */
   async combine_(
-      outputStreams, streamsPerPeriod, firstNewPeriodIndex, clone, concat) {
+      outputStreams, streamsPerPeriod, firstNewPeriodIndex, clone, concat,
+      periodsMissing) {
     const unusedStreamsPerPeriod = [];
-    for (let i = 0; i < firstNewPeriodIndex; i++) {
-      // This period's streams have all been used already.
-      unusedStreamsPerPeriod.push(new Set());
-    }
-    for (let i = firstNewPeriodIndex; i < streamsPerPeriod.length; i++) {
-      // This periods streams are all new.
-      unusedStreamsPerPeriod.push(new Set(streamsPerPeriod[i].values()));
+
+    for (let i = 0; i < streamsPerPeriod.length; i++) {
+      if (i >= firstNewPeriodIndex) {
+        // This periods streams are all new.
+        unusedStreamsPerPeriod.push(new Set(streamsPerPeriod[i].values()));
+      } else {
+        // This period's streams have all been used already.
+        unusedStreamsPerPeriod.push(new Set());
+      }
     }
 
     // First, extend all existing output Streams into the new periods.
@@ -461,7 +476,7 @@ shaka.util.PeriodCombiner = class {
       // eslint-disable-next-line no-await-in-loop
       const ok = await this.extendExistingOutputStream_(
           outputStream, streamsPerPeriod, firstNewPeriodIndex, concat,
-          unusedStreamsPerPeriod);
+          unusedStreamsPerPeriod, periodsMissing);
       if (!ok) {
         // This output Stream was not properly extended to include streams from
         // the new period.  This is likely a bug in our algorithm, so throw an
@@ -532,6 +547,7 @@ shaka.util.PeriodCombiner = class {
    *   of the first.
    * @param {!Array.<!Set.<T>>} unusedStreamsPerPeriod An array of sets of
    *   unused streams from each period.
+   * @param {number} periodsMissing How many periods are missing in this update.
    *
    * @return {!Promise.<boolean>}
    *
@@ -543,8 +559,9 @@ shaka.util.PeriodCombiner = class {
    */
   async extendExistingOutputStream_(
       outputStream, streamsPerPeriod, firstNewPeriodIndex, concat,
-      unusedStreamsPerPeriod) {
-    this.findMatchesInAllPeriods_(streamsPerPeriod, outputStream);
+      unusedStreamsPerPeriod, periodsMissing) {
+    this.findMatchesInAllPeriods_(streamsPerPeriod,
+        outputStream, periodsMissing > 0);
 
     // This only exists where T == Stream, and this should only ever be called
     // on Stream types.  StreamDB should not have pre-existing output streams.
@@ -561,11 +578,11 @@ shaka.util.PeriodCombiner = class {
     // the output's MetaSegmentIndex.
     if (outputStream.segmentIndex) {
       await shaka.util.PeriodCombiner.extendOutputSegmentIndex_(outputStream,
-          firstNewPeriodIndex);
+          firstNewPeriodIndex + periodsMissing);
     }
 
     shaka.util.PeriodCombiner.extendOutputStream_(outputStream,
-        firstNewPeriodIndex, concat, unusedStreamsPerPeriod);
+        firstNewPeriodIndex, concat, unusedStreamsPerPeriod, periodsMissing);
     return true;
   }
 
@@ -664,7 +681,8 @@ shaka.util.PeriodCombiner = class {
       return null;
     }
     shaka.util.PeriodCombiner.extendOutputStream_(outputStream,
-        /* firstNewPeriodIndex= */ 0, concat, unusedStreamsPerPeriod);
+        /* firstNewPeriodIndex= */ 0, concat, unusedStreamsPerPeriod,
+        /* periodsMissing= */ 0);
 
     return outputStream;
   }
@@ -678,6 +696,7 @@ shaka.util.PeriodCombiner = class {
    *   of the first.
    * @param {!Array.<!Set.<T>>} unusedStreamsPerPeriod An array of sets of
    *   unused streams from each period.
+   * @param {number} periodsMissing How many periods are missing in this update
    *
    * @template T
    * Accepts either a StreamDB or Stream type.
@@ -685,7 +704,8 @@ shaka.util.PeriodCombiner = class {
    * @private
    */
   static extendOutputStream_(
-      outputStream, firstNewPeriodIndex, concat, unusedStreamsPerPeriod) {
+      outputStream, firstNewPeriodIndex, concat, unusedStreamsPerPeriod,
+      periodsMissing) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const LanguageUtils = shaka.util.LanguageUtils;
     const matches = outputStream.matchedStreams;
@@ -697,7 +717,8 @@ shaka.util.PeriodCombiner = class {
 
     // Concatenate the new matches onto the stream, starting at the first new
     // period.
-    for (let i = firstNewPeriodIndex; i < matches.length; i++) {
+    const start = firstNewPeriodIndex + periodsMissing;
+    for (let i = start; i < matches.length; i++) {
       const match = matches[i];
       concat(outputStream, match);
 
@@ -715,7 +736,7 @@ shaka.util.PeriodCombiner = class {
       }
 
       if (used) {
-        unusedStreamsPerPeriod[i].delete(match);
+        unusedStreamsPerPeriod[i - periodsMissing].delete(match);
         // Add the full mimetypes to the stream.
         if (match.fullMimeTypes) {
           for (const fullMimeType of match.fullMimeTypes.values()) {
@@ -937,14 +958,16 @@ shaka.util.PeriodCombiner = class {
    *
    * @param {!Array<!Map<string, T>>} streamsPerPeriod
    * @param {T} outputStream
+   * @param {boolean=} shouldAppend
    *
    * @template T
    * Accepts either a StreamDB or Stream type.
    *
    * @private
    */
-  findMatchesInAllPeriods_(streamsPerPeriod, outputStream) {
-    const matches = [];
+  findMatchesInAllPeriods_(streamsPerPeriod, outputStream,
+      shouldAppend = false) {
+    const matches = shouldAppend ? outputStream.matchedStreams : [];
     for (const streams of streamsPerPeriod) {
       const match = this.findBestMatchInPeriod_(streams, outputStream);
       if (!match) {

package/lib/util/platform.js

@@ -648,10 +648,12 @@ shaka.util.Platform = class {
   /**
    * Detect the maximum resolution that the platform's hardware can handle.
    *
-   * @return {!Promise.<{width: number, height: number}>}
+   * @return {!Promise.<shaka.extern.Resolution>}
    */
   static async detectMaxHardwareResolution() {
     const Platform = shaka.util.Platform;
+
+    /** @type {shaka.extern.Resolution} */
     const maxResolution = {
       width: Infinity,
       height: Infinity,

package/lib/util/player_configuration.js

@@ -150,6 +150,7 @@ shaka.util.PlayerConfiguration = class {
         multiTypeVariantsAllowed,
         useStreamOnceInPeriodFlattening: false,
         updatePeriod: -1,
+        enableFastSwitching: true,
       },
       hls: {
         ignoreTextStreamFailures: false,
@@ -165,6 +166,7 @@ shaka.util.PlayerConfiguration = class {
         sequenceMode: shaka.util.Platform.supportsSequenceMode(),
         ignoreManifestTimestampsInSegmentsMode: false,
         disableCodecGuessing: false,
+        disableClosedCaptionsDetection: false,
         allowLowLatencyByteRangeOptimization: true,
       },
       mss: {
@@ -221,6 +223,7 @@ shaka.util.PlayerConfiguration = class {
       inaccurateManifestTolerance: 2,
       lowLatencyMode: false,
       autoLowLatencyMode: false,
+      forceHTTP: false,
       forceHTTPS: false,
       preferNativeHls: false,
       updateIntervalSeconds: 1,
@@ -236,6 +239,7 @@ shaka.util.PlayerConfiguration = class {
       disableTextPrefetch: false,
       disableVideoPrefetch: false,
       liveSync: false,
+      liveSyncTargetLatencyTolerance: 0.5,
       liveSyncMaxLatency: 1,
       liveSyncPlaybackRate: 1.1,
       liveSyncMinLatency: 0,
@@ -248,7 +252,10 @@ shaka.util.PlayerConfiguration = class {
       vodDynamicPlaybackRateLowBufferRate: 0.95,
       vodDynamicPlaybackRateBufferRatio: 0.5,
       infiniteLiveStreamDuration: false,
+      preloadNextUrlWindow: 30,
       loadTimeout: 30,
+      clearDecodingCache: shaka.util.Platform.isPS4() ||
+        shaka.util.Platform.isPS5(),
     };
 
     // WebOS, Tizen, Chromecast and Hisense have long hardware pipelines
@@ -317,6 +324,8 @@ shaka.util.PlayerConfiguration = class {
         maxFrameRate: Infinity,
         minBandwidth: 0,
         maxBandwidth: Infinity,
+        minChannelsCount: 0,
+        maxChannelsCount: Infinity,
       },
       advanced: {
         minTotalBytes: 128e3,
@@ -329,6 +338,7 @@ shaka.util.PlayerConfiguration = class {
       ignoreDevicePixelRatio: false,
       clearBufferSwitch: false,
       safeMarginSwitch: 0,
+      cacheLoadThreshold: 20,
     };
 
     const cmcd = {
@@ -369,20 +379,19 @@ shaka.util.PlayerConfiguration = class {
       },
     };
 
+    let customPlayheadTracker = false;
     let skipPlayDetection = false;
-    if (shaka.util.Platform.isWebOS() ||
-        shaka.util.Platform.isTizen() ||
-        shaka.util.Platform.isChromecast() ||
-        shaka.util.Platform.isHisense() ||
-        shaka.util.Platform.isPS5() ||
-        shaka.util.Platform.isPS4() ||
-        shaka.util.Platform.isXboxOne()) {
+    let supportsMultipleMediaElements = true;
+    if (shaka.util.Platform.isSmartTV()) {
+      customPlayheadTracker = true;
       skipPlayDetection = true;
+      supportsMultipleMediaElements = false;
     }
 
     const ads = {
-      customPlayheadTracker: false,
+      customPlayheadTracker,
       skipPlayDetection,
+      supportsMultipleMediaElements,
     };
 
     const textDisplayer = {
@@ -426,6 +435,8 @@ shaka.util.PlayerConfiguration = class {
         maxFrameRate: Infinity,
         minBandwidth: 0,
         maxBandwidth: Infinity,
+        minChannelsCount: 0,
+        maxChannelsCount: Infinity,
       },
       playRangeStart: 0,
       playRangeEnd: Infinity,
@@ -474,6 +485,7 @@ shaka.util.PlayerConfiguration = class {
         serverCertificate: new Uint8Array(0),
         serverCertificateUri: '',
         individualizationServer: '',
+        headers: {},
       },
     };
     return shaka.util.ConfigUtils.mergeConfigObjects(

package/lib/util/stream_utils.js

@@ -232,7 +232,7 @@ shaka.util.StreamUtils = class {
    *
    * @param {!shaka.extern.Manifest} manifest
    * @param {shaka.extern.Restrictions} restrictions
-   * @param {{width: number, height:number}} maxHwResolution
+   * @param {shaka.extern.Resolution} maxHwResolution
    */
   static filterByRestrictions(manifest, restrictions, maxHwResolution) {
     manifest.variants = manifest.variants.filter((variant) => {
@@ -245,7 +245,7 @@ shaka.util.StreamUtils = class {
    * @param {shaka.extern.Variant} variant
    * @param {shaka.extern.Restrictions} restrictions
    *   Configured restrictions from the user.
-   * @param {{width: number, height: number}} maxHwRes
+   * @param {shaka.extern.Resolution} maxHwRes
    *   The maximum resolution the hardware can handle.
    *   This is applied separately from user restrictions because the setting
    *   should not be easily replaced by the user's configuration.
@@ -289,7 +289,7 @@ shaka.util.StreamUtils = class {
       }
     }
 
-    // |variant.frameRate| can be undefined, which breaks
+    // |variant.video.frameRate| can be undefined, which breaks
     // the math, so make sure they are there first.
     if (variant && variant.video && variant.video.frameRate) {
       if (!inRange(variant.video.frameRate,
@@ -299,6 +299,16 @@ shaka.util.StreamUtils = class {
       }
     }
 
+    // |variant.audio.channelsCount| can be undefined, which breaks
+    // the math, so make sure they are there first.
+    if (variant && variant.audio && variant.audio.channelsCount) {
+      if (!inRange(variant.audio.channelsCount,
+          restrictions.minChannelsCount,
+          restrictions.maxChannelsCount)) {
+        return false;
+      }
+    }
+
     if (!inRange(variant.bandwidth,
         restrictions.minBandwidth,
         restrictions.maxBandwidth)) {
@@ -312,7 +322,7 @@ shaka.util.StreamUtils = class {
   /**
    * @param {!Array.<shaka.extern.Variant>} variants
    * @param {shaka.extern.Restrictions} restrictions
-   * @param {{width: number, height: number}} maxHwRes
+   * @param {shaka.extern.Resolution} maxHwRes
    * @return {boolean} Whether the tracks changed.
    */
   static applyRestrictions(variants, restrictions, maxHwRes) {
@@ -813,6 +823,9 @@ shaka.util.StreamUtils = class {
               break;
           }
         }
+        if (video.colorGamut) {
+          videoConfig.colorGamut = video.colorGamut;
+        }
         videoConfigs.push(videoConfig);
       }
     }
@@ -931,38 +944,44 @@ shaka.util.StreamUtils = class {
           }
 
           if (audio) {
-            // See: https://github.com/shaka-project/shaka-player/issues/4659
-            if (info.audioRobustness != '') {
-              if (!keySystemConfig.audio) {
-                // KeySystemTrackConfiguration
-                keySystemConfig.audio = {
-                  robustness: info.audioRobustness,
-                };
-              } else {
-                keySystemConfig.audio.robustness =
-                    keySystemConfig.audio.robustness || info.audioRobustness;
-              }
-            } else if (!keySystemConfig.audio) {
+            if (!keySystemConfig.audio) {
               // KeySystemTrackConfiguration
-              keySystemConfig.audio = {};
+              keySystemConfig.audio = {
+                encryptionScheme: info.encryptionScheme,
+                robustness: info.audioRobustness,
+              };
+            } else {
+              keySystemConfig.audio.encryptionScheme =
+                  keySystemConfig.audio.encryptionScheme ||
+                  info.encryptionScheme;
+              keySystemConfig.audio.robustness =
+                  keySystemConfig.audio.robustness ||
+                  info.audioRobustness;
+            }
+            // See: https://github.com/shaka-project/shaka-player/issues/4659
+            if (keySystemConfig.audio.robustness == '') {
+              delete keySystemConfig.audio.robustness;
             }
           }
 
           if (video) {
-            // See: https://github.com/shaka-project/shaka-player/issues/4659
-            if (info.videoRobustness != '') {
-              if (!keySystemConfig.video) {
-                // KeySystemTrackConfiguration
-                keySystemConfig.video = {
-                  robustness: info.videoRobustness,
-                };
-              } else {
-                keySystemConfig.video.robustness =
-                    keySystemConfig.video.robustness || info.videoRobustness;
-              }
-            } else if (!keySystemConfig.video) {
+            if (!keySystemConfig.video) {
               // KeySystemTrackConfiguration
-              keySystemConfig.video = {};
+              keySystemConfig.video = {
+                encryptionScheme: info.encryptionScheme,
+                robustness: info.videoRobustness,
+              };
+            } else {
+              keySystemConfig.video.encryptionScheme =
+                  keySystemConfig.video.encryptionScheme ||
+                  info.encryptionScheme;
+              keySystemConfig.video.robustness =
+                  keySystemConfig.video.robustness ||
+                  info.videoRobustness;
+            }
+            // See: https://github.com/shaka-project/shaka-player/issues/4659
+            if (keySystemConfig.video.robustness == '') {
+              delete keySystemConfig.video.robustness;
             }
           }
         }
@@ -1277,6 +1296,7 @@ shaka.util.StreamUtils = class {
       frameRate: null,
       pixelAspectRatio: null,
       hdr: null,
+      colorGamut: null,
       videoLayout: null,
       mimeType: mimeType,
       audioMimeType: audioMimeType,
@@ -1313,6 +1333,7 @@ shaka.util.StreamUtils = class {
       track.pixelAspectRatio = video.pixelAspectRatio || null;
       track.videoBandwidth = video.bandwidth || null;
       track.hdr = video.hdr || null;
+      track.colorGamut = video.colorGamut || null;
       track.videoLayout = video.videoLayout || null;
     }
 
@@ -1354,6 +1375,7 @@ shaka.util.StreamUtils = class {
       frameRate: null,
       pixelAspectRatio: null,
       hdr: null,
+      colorGamut: null,
       videoLayout: null,
       mimeType: stream.mimeType,
       audioMimeType: null,
@@ -1431,6 +1453,7 @@ shaka.util.StreamUtils = class {
       frameRate: null,
       pixelAspectRatio: null,
       hdr: null,
+      colorGamut: null,
       videoLayout: null,
       mimeType: stream.mimeType,
       audioMimeType: null,
@@ -1558,6 +1581,7 @@ shaka.util.StreamUtils = class {
       frameRate: null,
       pixelAspectRatio: null,
       hdr: null,
+      colorGamut: null,
       videoLayout: null,
       mimeType: null,
       audioMimeType: null,
@@ -1829,6 +1853,14 @@ shaka.util.StreamUtils = class {
 
     return 'unexpected stream type';
   }
+
+
+  /**
+   * Clears underlying decoding config cache.
+   */
+  static clearDecodingConfigCache() {
+    shaka.util.StreamUtils.decodingConfigCache_ = {};
+  }
 };
 
 

package/lib/util/tXml.js

@@ -741,28 +741,94 @@ shaka.util.TXml = class {
    * @return {!Array<!shaka.util.TXml.PathNode>}
    */
   static parseXpath(exprString) {
+    const StringUtils = shaka.util.StringUtils;
     const returnPaths = [];
     // Split string by paths but ignore '/' in quotes
-    const paths = exprString
+    const paths = StringUtils.htmlUnescape(exprString)
         .split(/\/+(?=(?:[^'"]*['"][^'"]*['"])*[^'"]*$)/);
     for (const path of paths) {
-      const nodeName = path.match(/\b([A-Z])\w+/);
+      const nodeName = path.match(/^([\w]+)/);
 
-      // We only want the id attribute in which case
-      // /'(.*?)'/ will suffice to get it.
-      const idAttr = path.match(/(@id='(.*?)')/);
       if (nodeName) {
+        // We only want the id attribute in which case
+        // /'(.*?)'/ will suffice to get it.
+        const idAttr = path.match(/(@id='(.*?)')/);
+        const position = path.match(/\[(\d+)\]/);
         returnPaths.push({
           name: nodeName[0],
           id: idAttr ?
             idAttr[0].match(/'(.*?)'/)[0].replace(/'/gm, '') : null,
+          // position is counted from 1, so make it readable for devs
+          position: position ? Number(position[1]) - 1 : null,
+          attribute: path.split('/@')[1] || null,
         });
+      } else if (path.startsWith('@') && returnPaths.length) {
+        returnPaths[returnPaths.length - 1].attribute = path.slice(1);
       }
     }
     return returnPaths;
   }
 
 
+  /**
+   * Modifies nodes in specified array by adding or removing nodes
+   * and updating attributes.
+   * @param {!Array<shaka.extern.xml.Node>} nodes
+   * @param {!shaka.extern.xml.Node} patchNode
+   */
+  static modifyNodes(nodes, patchNode) {
+    const TXml = shaka.util.TXml;
+
+    const paths = TXml.parseXpath(patchNode.attributes['sel'] || '');
+    if (!paths.length) {
+      return;
+    }
+    const lastNode = paths[paths.length - 1];
+    const position = patchNode.attributes['pos'] || null;
+
+    let index = lastNode.position;
+    if (index === null) {
+      index = position === 'prepend' ? 0 : nodes.length;
+    } else if (position === 'prepend') {
+      --index;
+    } else if (position === 'after') {
+      ++index;
+    }
+    const action = patchNode.tagName;
+    const attribute = lastNode.attribute;
+
+    // Modify attribute
+    if (attribute) {
+      TXml.modifyNodeAttribute(nodes[index], action, attribute,
+          TXml.getContents(patchNode) || '');
+    // Rearrange nodes
+    } else {
+      if (action === 'remove' || action === 'replace') {
+        nodes.splice(index, 1);
+      }
+      if (action === 'add' || action === 'replace') {
+        const newNodes = patchNode.children;
+        nodes.splice(index, 0, ...newNodes);
+      }
+    }
+  }
+
+
+  /**
+   * @param {!shaka.extern.xml.Node} node
+   * @param {string} action
+   * @param {string} attribute
+   * @param {string} value
+   */
+  static modifyNodeAttribute(node, action, attribute, value) {
+    if (action === 'remove') {
+      delete node.attributes[attribute];
+    } else if (action === 'add' || action === 'replace') {
+      node.attributes[attribute] = value;
+    }
+  }
+
+
   /**
    * Converts a tXml node to DOM element.
    * @param {shaka.extern.xml.Node} node
@@ -808,7 +874,9 @@ shaka.util.TXml.knownNameSpaces_ = new Map([]);
 /**
  * @typedef {{
  *   name: string,
- *   id: ?string
+ *   id: ?string,
+ *   position: ?number,
+ *   attribute: ?string
  * }}
  */
 shaka.util.TXml.PathNode;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.8.8",
+  "version": "4.9.0",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -105,7 +105,7 @@
     "prepublishOnly": "python build/checkversion.py && python build/all.py --force"
   },
   "dependencies": {
-    "eme-encryption-scheme-polyfill": "^2.1.1"
+    "eme-encryption-scheme-polyfill": "^2.1.5"
   },
   "clean-package": {
     "remove": [

package/support.html

@@ -76,6 +76,7 @@
 
       function doTest() {
         shaka.polyfill.installAll();
+
         if (shaka.Player.isBrowserSupported()) {
           shaka.Player.probeSupport().then(function(support) {
             printSupport(JSON.stringify(support, null, '  '));