shaka-player 3.1.4 → 3.1.5

package/externs/shaka/text.js

@@ -349,6 +349,16 @@ shaka.extern.Cue = class {
      */
     this.nestedCues;
 
+    /**
+     * If true, this represents a container element that is "above" the main
+     * cues. For example, the <body> and <div> tags that contain the <p> tags
+     * in a TTML file. This controls the flow of the final cues; any nested cues
+     * within an "isContainer" cue will be laid out as separate lines.
+     * @type {boolean}
+     * @exportDoc
+     */
+    this.isContainer;
+
     /**
      * Whether or not the cue only acts as a line break between two nested cues.
      * Should only appear in nested cues.

package/lib/dash/dash_parser.js

@@ -1215,8 +1215,10 @@ shaka.dash.DashParser = class {
 
     let forced = false;
     if (isText) {
-      // See: https://github.com/google/shaka-player/issues/2122
-      forced = roles.includes('forced_subtitle');
+      // See: https://github.com/google/shaka-player/issues/2122 and
+      // https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/165
+      forced = roles.includes('forced_subtitle') ||
+          roles.includes('forced-subtitle');
     }
 
     let tilesLayout;

package/lib/media/streaming_engine.js

@@ -623,7 +623,7 @@ shaka.media.StreamingEngine = class {
 
         // Don't clear the buffer unless something is buffered.  This extra
         // check prevents extra, useless calls to clear the buffer.
-        if (somethingBuffered) {
+        if (somethingBuffered || mediaState.performingUpdate) {
           this.forceClearBuffer_(mediaState);
           streamCleared = true;
         }
@@ -977,7 +977,10 @@ shaka.media.StreamingEngine = class {
         unscaledBufferingGoal * this.bufferingGoalScale_;
 
     // Check if we've buffered to the end of the presentation.
-    if (timeNeeded >= this.manifest_.presentationTimeline.getDuration()) {
+    const timeUntilEnd =
+        this.manifest_.presentationTimeline.getDuration() - timeNeeded;
+    const oneMicrosecond = 1e-6;
+    if (timeUntilEnd < oneMicrosecond) {
       // We shouldn't rebuffer if the playhead is close to the end of the
       // presentation.
       shaka.log.debug(logPrefix, 'buffered to end of presentation');

package/lib/player.js

@@ -6102,7 +6102,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v3.1.4-uncompiled';
+shaka.Player.version = 'v3.1.5-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -24,8 +24,6 @@ shaka.polyfill.MediaCapabilities = class {
    * @export
    */
   static install() {
-    shaka.log.debug('MediaCapabilities: install');
-
     // Since MediaCapabilities is not fully supported on Chromecast yet, we
     // should always install polyfill for Chromecast.
     // TODO: re-evaluate MediaCapabilities in the future versions of Chromecast.
@@ -40,21 +38,28 @@ shaka.polyfill.MediaCapabilities = class {
     // TODO: re-evaluate MediaCapabilities in the future versions of PS5
     // Browsers.
     if (!shaka.util.Platform.isChromecast() &&
-      !shaka.util.Platform.isApple() &&
-      !shaka.util.Platform.isPS5() &&
-      navigator.mediaCapabilities) {
-      shaka.log.debug(
+        !shaka.util.Platform.isApple() &&
+        !shaka.util.Platform.isPS5() &&
+        navigator.mediaCapabilities) {
+      shaka.log.info(
           'MediaCapabilities: Native mediaCapabilities support found.');
-    } else {
-      if (!navigator.mediaCapabilities) {
-        navigator.mediaCapabilities = /** @type {!MediaCapabilities} */ ({});
-      }
-      navigator.mediaCapabilities.decodingInfo =
-          shaka.polyfill.MediaCapabilities.decodingInfo_;
+      return;
+    }
+
+    shaka.log.info('MediaCapabilities: install');
+
+    if (!navigator.mediaCapabilities) {
+      navigator.mediaCapabilities = /** @type {!MediaCapabilities} */ ({});
     }
-    // Workaround because in Apple browsers there is no way to overwrite
-    // MediaCapabilities.
-    window.shakaMediaCapabilities = navigator.mediaCapabilities;
+
+    // Keep the patched MediaCapabilities object from being garbage-collected in
+    // Safari.
+    // See https://github.com/google/shaka-player/issues/3696#issuecomment-1009472718
+    shaka.polyfill.MediaCapabilities.originalMcap =
+        navigator.mediaCapabilities;
+
+    navigator.mediaCapabilities.decodingInfo =
+        shaka.polyfill.MediaCapabilities.decodingInfo_;
   }
 
   /**
@@ -182,6 +187,16 @@ shaka.polyfill.MediaCapabilities = class {
   }
 };
 
+/**
+ * A copy of the MediaCapabilities instance, to prevent Safari from
+ * garbage-collecting the polyfilled method on it.  We make it public and export
+ * it to ensure that it is not stripped out by the compiler.
+ *
+ * @type {MediaCapabilities}
+ * @export
+ */
+shaka.polyfill.MediaCapabilities.originalMcap = null;
+
 // Install at a lower priority than MediaSource polyfill, so that we have
 // MediaSource available first.
 shaka.polyfill.register(shaka.polyfill.MediaCapabilities.install, -1);

package/lib/text/cue.js

@@ -210,6 +210,12 @@ shaka.text.Cue = class {
      */
     this.nestedCues = [];
 
+    /**
+     * @override
+     * @exportInterface
+     */
+    this.isContainer = false;
+
     /**
      * @override
      * @exportInterface

package/lib/text/ttml_text_parser.js

@@ -86,16 +86,17 @@ shaka.text.TtmlTextParser = class {
       }
 
       // Get the framerate, subFrameRate and frameRateMultiplier if applicable.
-      const frameRate = XmlUtils.getAttributeNS(tt, ttpNs, 'frameRate');
-      const subFrameRate = XmlUtils.getAttributeNS(tt, ttpNs, 'subFrameRate');
+      const frameRate = XmlUtils.getAttributeNSList(tt, ttpNs, 'frameRate');
+      const subFrameRate = XmlUtils.getAttributeNSList(
+          tt, ttpNs, 'subFrameRate');
       const frameRateMultiplier =
-          XmlUtils.getAttributeNS(tt, ttpNs, 'frameRateMultiplier');
-      const tickRate = XmlUtils.getAttributeNS(tt, ttpNs, 'tickRate');
+          XmlUtils.getAttributeNSList(tt, ttpNs, 'frameRateMultiplier');
+      const tickRate = XmlUtils.getAttributeNSList(tt, ttpNs, 'tickRate');
 
-      const cellResolution = XmlUtils.getAttributeNS(
+      const cellResolution = XmlUtils.getAttributeNSList(
           tt, ttpNs, 'cellResolution');
       const spaceStyle = tt.getAttribute('xml:space') || 'default';
-      const extent = XmlUtils.getAttributeNS(tt, ttsNs, 'extent');
+      const extent = XmlUtils.getAttributeNSList(tt, ttsNs, 'extent');
 
       if (spaceStyle != 'default' && spaceStyle != 'preserve') {
         throw new shaka.util.Error(
@@ -147,28 +148,15 @@ shaka.text.TtmlTextParser = class {
               shaka.util.Error.Code.INVALID_TEXT_CUE,
               '<span> can only be inside <p> in TTML');
         }
+      }
 
-        const pChildren = XmlUtils.findChildren(div, 'p');
-        if (pChildren && pChildren.length) {
-          for (const p of pChildren) {
-            const cue = TtmlTextParser.parseCue_(
-                p, time.periodStart, rateInfo, metadataElements, styles,
-                regionElements, cueRegions, whitespaceTrim,
-                /* isNested= */ false, cellResolutionInfo);
-            if (cue) {
-              cues.push(cue);
-            }
-          }
-        } else {
-          // Only used for parsing the background image
-          const cue = TtmlTextParser.parseCue_(
-              div, time.periodStart, rateInfo, metadataElements, styles,
-              regionElements, cueRegions, whitespaceTrim,
-              /* isNested= */ false, cellResolutionInfo);
-          if (cue) {
-            cues.push(cue);
-          }
-        }
+      const cue = TtmlTextParser.parseCue_(
+          body, time.periodStart, rateInfo, metadataElements, styles,
+          regionElements, cueRegions, whitespaceTrim,
+          cellResolutionInfo, /* parentCueElement= */ null,
+          /* isContent= */ false);
+      if (cue) {
+        cues.push(cue);
       }
     }
 
@@ -186,18 +174,19 @@ shaka.text.TtmlTextParser = class {
    * @param {!Array.<!Element>} regionElements
    * @param {!Array.<!shaka.text.CueRegion>} cueRegions
    * @param {boolean} whitespaceTrim
-   * @param {boolean} isNested
    * @param {?{columns: number, rows: number}} cellResolution
+   * @param {?Element} parentCueElement
+   * @param {boolean} isContent
    * @return {shaka.text.Cue}
    * @private
    */
   static parseCue_(
       cueNode, offset, rateInfo, metadataElements, styles, regionElements,
-      cueRegions, whitespaceTrim, isNested, cellResolution) {
+      cueRegions, whitespaceTrim, cellResolution, parentCueElement, isContent) {
     /** @type {Element} */
     let cueElement;
     /** @type {Element} */
-    let parentElement = /** @type {Element} */(cueNode.parentNode);
+    let parentElement = /** @type {Element} */ (cueNode.parentNode);
 
     if (cueNode.nodeType == Node.COMMENT_NODE) {
       // The comments do not contain information that interests us here.
@@ -205,6 +194,12 @@ shaka.text.TtmlTextParser = class {
     }
 
     if (cueNode.nodeType == Node.TEXT_NODE) {
+      if (!isContent) {
+        // Ignore text elements outside the content. For example, whitespace
+        // on the same lexical level as the <p> elements, in a document with
+        // xml:space="preserve", should not be renderer.
+        return null;
+      }
       // This should generate an "anonymous span" according to the TTML spec.
       // So pretend the element was a <span>.  parentElement was set above, so
       // we should still be able to correctly traverse up for timing
@@ -219,6 +214,21 @@ shaka.text.TtmlTextParser = class {
     }
     goog.asserts.assert(cueElement, 'cueElement should be non-null!');
 
+    let imageElement = null;
+    for (const nameSpace of shaka.text.TtmlTextParser.smpteNsList_) {
+      imageElement = shaka.text.TtmlTextParser.getElementsFromCollection_(
+          cueElement, 'backgroundImage', metadataElements, '#',
+          nameSpace)[0];
+      if (imageElement) {
+        break;
+      }
+    }
+
+    const parentIsContent = isContent;
+    if (cueNode.nodeName == 'p' || imageElement) {
+      isContent = true;
+    }
+
     const spaceStyle = cueElement.getAttribute('xml:space') ||
         (whitespaceTrim ? 'default' : 'preserve');
 
@@ -243,8 +253,9 @@ shaka.text.TtmlTextParser = class {
             regionElements,
             cueRegions,
             localWhitespaceTrim,
-            /* isNested= */ true,
             cellResolution,
+            cueElement,
+            isContent,
         );
 
         // This node may or may not generate a nested cue.
@@ -254,6 +265,8 @@ shaka.text.TtmlTextParser = class {
       }
     }
 
+    const isNested = /** @type {boolean} */ (parentCueElement != null);
+
     // In this regex, "\S" means "non-whitespace character".
     const hasTextContent = /\S/.test(cueElement.textContent);
     const hasTimeAttributes =
@@ -334,6 +347,13 @@ shaka.text.TtmlTextParser = class {
     const cue = new shaka.text.Cue(start, end, payload);
     cue.nestedCues = nestedCues;
 
+    if (!isContent) {
+      // If this is not a <p> element or a <div> with images, and it has no
+      // parent that was a <p> element, then it's part of the outer containers
+      // (e.g. the <body> or a normal <div> element within it).
+      cue.isContainer = true;
+    }
+
     if (cellResolution) {
       cue.cellResolution = cellResolution;
     }
@@ -341,31 +361,32 @@ shaka.text.TtmlTextParser = class {
     // Get other properties if available.
     const regionElement = shaka.text.TtmlTextParser.getElementsFromCollection_(
         cueElement, 'region', regionElements, /* prefix= */ '')[0];
-    if (regionElement && regionElement.getAttribute('xml:id')) {
-      const regionId = regionElement.getAttribute('xml:id');
-      cue.region = cueRegions.filter((region) => region.id == regionId)[0];
-    }
-
-    let imageElement = null;
-    for (const nameSpace of shaka.text.TtmlTextParser.smpteNsList_) {
-      imageElement = shaka.text.TtmlTextParser.getElementsFromCollection_(
-          cueElement, 'backgroundImage', metadataElements, '#',
-          nameSpace)[0];
-      if (imageElement) {
-        break;
+    // Do not actually apply that region unless it is non-inherited, though.
+    // This makes it so that, if a parent element has a region, the children
+    // don't also all independently apply the positioning of that region.
+    if (cueElement.hasAttribute('region')) {
+      if (regionElement && regionElement.getAttribute('xml:id')) {
+        const regionId = regionElement.getAttribute('xml:id');
+        cue.region = cueRegions.filter((region) => region.id == regionId)[0];
       }
     }
 
-    const isLeaf = nestedCues.length == 0;
+    let regionElementForStyle = regionElement;
+    if (parentCueElement && isNested && !cueElement.getAttribute('region') &&
+      !cueElement.getAttribute('style')) {
+      regionElementForStyle =
+          shaka.text.TtmlTextParser.getElementsFromCollection_(
+              parentCueElement, 'region', regionElements, /* prefix= */ '')[0];
+    }
 
     shaka.text.TtmlTextParser.addStyle_(
         cue,
         cueElement,
-        regionElement,
+        regionElementForStyle,
         imageElement,
         styles,
-        isNested,
-        isLeaf);
+        /** isNested= */ parentIsContent, // "nested in a <div>" doesn't count.
+        /** isLeaf= */ (nestedCues.length == 0));
 
     return cue;
   }
@@ -505,14 +526,13 @@ shaka.text.TtmlTextParser = class {
     }
 
     const align = TtmlTextParser.getStyleAttribute_(
-        cueElement, region, styles, 'textAlign', shouldInheritRegionStyles);
+        cueElement, region, styles, 'textAlign', true);
     if (align) {
       cue.positionAlign = TtmlTextParser.textAlignToPositionAlign_[align];
       cue.lineAlign = TtmlTextParser.textAlignToLineAlign_[align];
 
       goog.asserts.assert(align.toUpperCase() in Cue.textAlign,
-          align.toUpperCase() +
-                          ' Should be in Cue.textAlign values!');
+          align.toUpperCase() + ' Should be in Cue.textAlign values!');
 
       cue.textAlign = Cue.textAlign[align.toUpperCase()];
     } else {
@@ -521,7 +541,7 @@ shaka.text.TtmlTextParser = class {
     }
 
     const displayAlign = TtmlTextParser.getStyleAttribute_(
-        cueElement, region, styles, 'displayAlign', shouldInheritRegionStyles);
+        cueElement, region, styles, 'displayAlign', true);
     if (displayAlign) {
       goog.asserts.assert(displayAlign.toUpperCase() in Cue.displayAlign,
           displayAlign.toUpperCase() +
@@ -753,7 +773,7 @@ shaka.text.TtmlTextParser = class {
       return null;
     }
 
-    const attr = XmlUtils.getAttributeNS(region, ttsNs, attribute);
+    const attr = XmlUtils.getAttributeNSList(region, ttsNs, attribute);
     if (attr) {
       return attr;
     }
@@ -778,7 +798,7 @@ shaka.text.TtmlTextParser = class {
 
     // Styling on elements should take precedence
     // over the main styling attributes
-    const elementAttribute = XmlUtils.getAttributeNS(
+    const elementAttribute = XmlUtils.getAttributeNSList(
         cueElement,
         ttsNs,
         attribute);
@@ -821,7 +841,7 @@ shaka.text.TtmlTextParser = class {
 
       if (!styleAttributeValue) {
         // Fall back to tts namespace.
-        styleAttributeValue = XmlUtils.getAttributeNS(
+        styleAttributeValue = XmlUtils.getAttributeNSList(
             inheritedStyles[i],
             ttsNs,
             attribute);
@@ -1276,20 +1296,26 @@ shaka.text.TtmlTextParser.textAlignToPositionAlign_ = {
  * document, not just "ttp:", so we use this with getAttributeNS() to ensure
  * that we support arbitrary namespace names.
  *
- * @const {string}
+ * @const {!Array.<string>}
  * @private
  */
-shaka.text.TtmlTextParser.parameterNs_ = 'http://www.w3.org/ns/ttml#parameter';
+shaka.text.TtmlTextParser.parameterNs_ = [
+  'http://www.w3.org/ns/ttml#parameter',
+  'http://www.w3.org/2006/10/ttaf1#parameter',
+];
 
 /**
  * The namespace URL for TTML styles.  Can be assigned any name in the TTML
  * document, not just "tts:", so we use this with getAttributeNS() to ensure
  * that we support arbitrary namespace names.
  *
- * @const {string}
+ * @const {!Array.<string>}
  * @private
  */
-shaka.text.TtmlTextParser.styleNs_ = 'http://www.w3.org/ns/ttml#styling';
+shaka.text.TtmlTextParser.styleNs_ = [
+  'http://www.w3.org/ns/ttml#styling',
+  'http://www.w3.org/2006/10/ttaf1#styling',
+];
 
 /**
  * The namespace URL for EBU TTML styles.  Can be assigned any name in the TTML

package/lib/text/ui_text_displayer.js

@@ -352,19 +352,22 @@ shaka.text.UITextDisplayer = class {
       type = 'br';
     }
 
+    const needWrapper = !isNested && cue.nestedCues.length > 0;
+
     // Nested cues are inline elements.  Top-level cues are block elements.
     const cueElement = shaka.util.Dom.createHTMLElement(type);
     if (type != 'br') {
-      this.setCaptionStyles_(cueElement, cue, parents);
+      this.setCaptionStyles_(cueElement, cue, parents, needWrapper);
     }
 
     let wrapper = cueElement;
-    if (!isNested && cue.nestedCues.length) {
+    if (needWrapper) {
       // Create a wrapper element which will serve to contain all children into
       // a single item.  This ensures that nested span elements appear
       // horizontally and br elements occupy no vertical space.
       wrapper = shaka.util.Dom.createHTMLElement('span');
       wrapper.classList.add('shaka-text-wrapper');
+      wrapper.style.backgroundColor = cue.backgroundColor;
       cueElement.appendChild(wrapper);
     }
 
@@ -375,9 +378,10 @@ shaka.text.UITextDisplayer = class {
    * @param {!HTMLElement} cueElement
    * @param {!shaka.extern.Cue} cue
    * @param {!Array.<!shaka.extern.Cue>} parents
+   * @param {boolean} hasWrapper
    * @private
    */
-  setCaptionStyles_(cueElement, cue, parents) {
+  setCaptionStyles_(cueElement, cue, parents, hasWrapper) {
     const Cue = shaka.text.Cue;
     const inherit =
         (cb) => shaka.text.UITextDisplayer.inheritProperty_(parents, cb);
@@ -434,13 +438,15 @@ shaka.text.UITextDisplayer = class {
       if (cue.border) {
         elem.style.border = cue.border;
       }
-      const bgColor = inherit((c) => c.backgroundColor);
-      if (bgColor) {
-        elem.style.backgroundColor = bgColor;
-      } else if (text) {
-        // If there is no background, default to a semi-transparent black.
-        // Only do this for the text itself.
-        elem.style.backgroundColor = 'rgba(0, 0, 0, 0.8)';
+      if (!hasWrapper) {
+        const bgColor = inherit((c) => c.backgroundColor);
+        if (bgColor) {
+          elem.style.backgroundColor = bgColor;
+        } else if (text) {
+          // If there is no background, default to a semi-transparent black.
+          // Only do this for the text itself.
+          elem.style.backgroundColor = 'rgba(0, 0, 0, 0.8)';
+        }
       }
       if (text) {
         elem.textContent = text;
@@ -450,7 +456,7 @@ shaka.text.UITextDisplayer = class {
     // The displayAlign attribute specifies the vertical alignment of the
     // captions inside the text container. Before means at the top of the
     // text container, and after means at the bottom.
-    if (isNested) {
+    if (isNested && !parents[parents.length - 1].isContainer) {
       style.display = 'inline';
     } else {
       style.display = 'flex';

package/lib/util/stream_utils.js

@@ -333,13 +333,48 @@ shaka.util.StreamUtils = class {
    */
   static async filterManifestByMediaCapabilities(
       manifest, usePersistentLicenses) {
-    goog.asserts.assert(window.shakaMediaCapabilities,
+    goog.asserts.assert(navigator.mediaCapabilities,
         'MediaCapabilities should be valid.');
 
     await shaka.util.StreamUtils.getDecodingInfosForVariants(
         manifest.variants, usePersistentLicenses, /* srcEquals= */ false);
     manifest.variants = manifest.variants.filter((variant) => {
+      // See: https://github.com/google/shaka-player/issues/3860
       const video = variant.video;
+      const ContentType = shaka.util.ManifestParserUtils.ContentType;
+      if (video) {
+        let videoCodecs = shaka.util.StreamUtils.patchVp9(video.codecs);
+        // For multiplexed streams. Here we must check the audio of the
+        // stream to see if it is compatible.
+        if (video.codecs.includes(',')) {
+          const allCodecs = video.codecs.split(',');
+          videoCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+              ContentType.VIDEO, allCodecs);
+          const audioCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+              ContentType.AUDIO, allCodecs);
+          const audioFullType = shaka.util.MimeUtils.getFullOrConvertedType(
+              video.mimeType, audioCodecs, ContentType.AUDIO);
+          if (!MediaSource.isTypeSupported(audioFullType)) {
+            return false;
+          }
+        }
+        const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
+            video.mimeType, videoCodecs, ContentType.VIDEO);
+        if (!MediaSource.isTypeSupported(fullType)) {
+          return false;
+        }
+      }
+      const audio = variant.audio;
+      if (audio) {
+        const codecs =
+            shaka.util.StreamUtils.getCorrectAudioCodecs_(audio.codecs);
+        const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
+            audio.mimeType, codecs, ContentType.AUDIO);
+        if (!MediaSource.isTypeSupported(fullType)) {
+          return false;
+        }
+      }
+
       // See: https://github.com/google/shaka-player/issues/3380
       if (shaka.util.Platform.isXboxOne() && video &&
           ((video.width && video.width > 1920) ||
@@ -422,7 +457,7 @@ shaka.util.StreamUtils = class {
       return;
     }
 
-    const mediaCapabilities = window.shakaMediaCapabilities;
+    const mediaCapabilities = navigator.mediaCapabilities;
 
     const operations = [];
     const getVariantDecodingInfos = (async (variant, decodingConfig) => {
@@ -516,12 +551,8 @@ shaka.util.StreamUtils = class {
       }
     }
     if (audio) {
-      // Some Tizen devices seem to misreport AC-3 support, but correctly
-      // report EC-3 support.  So query EC-3 as a fallback for AC-3.
-      // See https://github.com/google/shaka-player/issues/2989 for details.
       const codecs =
-          (audio.codecs.toLowerCase() == 'ac-3' &&
-          shaka.util.Platform.isTizen()) ? 'ec-3' : audio.codecs;
+          shaka.util.StreamUtils.getCorrectAudioCodecs_(audio.codecs);
       const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
           audio.mimeType, codecs, ContentType.AUDIO);
 
@@ -632,6 +663,26 @@ shaka.util.StreamUtils = class {
     return configs;
   }
 
+
+  /**
+   * Generates the correct audio codec for MediaDecodingConfiguration and
+   * for MediaSource.isTypeSupported.
+   * @param {string} codecs
+   * @return {string}
+   * @private
+   */
+  static getCorrectAudioCodecs_(codecs) {
+    // Some Tizen devices seem to misreport AC-3 support, but correctly
+    // report EC-3 support.  So query EC-3 as a fallback for AC-3.
+    // See https://github.com/google/shaka-player/issues/2989 for details.
+    if (shaka.util.Platform.isTizen()) {
+      return codecs.toLowerCase() == 'ac-3' ? 'ec-3' : codecs;
+    } else {
+      return codecs;
+    }
+  }
+
+
   /**
    * MediaCapabilities supports 'vp09...' codecs, but not 'vp9'. Translate vp9
    * codec strings into 'vp09...', to allow such content to play with

package/lib/util/xml_utils.js

@@ -102,6 +102,25 @@ shaka.util.XmlUtils = class {
   }
 
 
+  /**
+   * Gets a namespace-qualified attribute.
+   * @param {!Element} elem The element to get from.
+   * @param {!Array.<string>} nsList The lis of namespace URIs.
+   * @param {string} name The local name of the attribute.
+   * @return {?string} The attribute's value, or null if not present.
+   */
+  static getAttributeNSList(elem, nsList, name) {
+    // Some browsers return the empty string when the attribute is missing,
+    // so check if it exists first.  See: https://mzl.la/2L7F0UK
+    for (const ns of nsList) {
+      if (elem.hasAttributeNS(ns, name)) {
+        return elem.getAttributeNS(ns, name);
+      }
+    }
+    return null;
+  }
+
+
   /**
    * Gets the text contents of a node.
    * @param {!Node} elem The XML element.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "homepage": "https://github.com/google/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -12,6 +12,7 @@
   ],
   "devDependencies": {
     "@chiragrupani/karma-chromium-edge-launcher": "^2.1.0",
+    "@onslip/karma-safari-launcher": "^1.0.1",
     "@teppeis/clutz": "^1.0.29-4c95e12.v20190929",
     "awesomplete": "^1.1.4",
     "babel-core": "^6.26.3",
@@ -44,7 +45,6 @@
     "karma-jasmine": "^3.3.1",
     "karma-jasmine-ajax": "^0.1.13",
     "karma-opera-launcher": "^1.0.0",
-    "karma-safari-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.32",
     "karma-webdriver-launcher": "^1.0.8",