shaka-player 3.2.12 → 3.2.14

package/docs/jsdoc-template/publish.js

@@ -440,6 +440,7 @@ function buildNav(members) {
       [members.externals, 'Externals', seen, linktoExternal],
       [members.namespaces, 'Namespaces', seen, linkto],
       [members.classes, 'Classes', seen, linkto],
+      [members.enums, 'Enums', seen, linkto],
       [members.interfaces, 'Interfaces', seen, linkto],
       [members.events, 'Events', seen, linkto],
       [members.mixins, 'Mixins', seen, linkto],
@@ -484,6 +485,7 @@ function fixUpType(type) {
 exports.publish = (taffyData, opts, tutorials) => {
     let classes;
     let conf;
+    let enums;
     let externals;
     let files;
     let fromDir;
@@ -733,6 +735,31 @@ exports.publish = (taffyData, opts, tutorials) => {
     });
 
     members = helper.getMembers(data);
+    members.enums = [];
+
+    data().each(doclet => {
+        if (doclet.isEnum) {
+            const hasParent = !!docletMap[doclet.memberof];
+
+            // Enums without parents (not attached to a class, but directly to a
+            // namespace) aren't recognized by jsdoc by default and need to be
+            // massaged into the docs separately.
+            if (!hasParent) {
+                // Temporarily call this a "class", so that we can fix the URL.
+                doclet.kind = 'class';
+                // Regenerate the URL, so that this enum gets its own page
+                // instead of a URL that links to an ID within a non-existent
+                // parent page.
+                delete helper.longnameToUrl[doclet.longname];
+                helper.createLink(doclet);
+                // Mark this as an enum (custom type), so that it doesn't get
+                // slotted with the classes.
+                doclet.kind = 'enum';
+                members.enums.push(doclet);
+            }
+        }
+    });
+
     members.tutorials = tutorials.children;
     if (conf.default.sortTutorialsByConfigOrder) {
         members.tutorials.sort((a, b) => {
@@ -778,6 +805,7 @@ exports.publish = (taffyData, opts, tutorials) => {
 
     // set up the lists that we'll use to generate pages
     classes = taffy(members.classes);
+    enums = taffy(members.enums);
     modules = taffy(members.modules);
     namespaces = taffy(members.namespaces);
     mixins = taffy(members.mixins);
@@ -786,6 +814,7 @@ exports.publish = (taffyData, opts, tutorials) => {
 
     Object.keys(helper.longnameToUrl).forEach(longname => {
         const myClasses = helper.find(classes, {longname: longname});
+        const myEnums = helper.find(enums, {longname: longname});
         const myExternals = helper.find(externals, {longname: longname});
         const myInterfaces = helper.find(interfaces, {longname: longname});
         const myMixins = helper.find(mixins, {longname: longname});
@@ -800,6 +829,10 @@ exports.publish = (taffyData, opts, tutorials) => {
             generate(`Class: ${myClasses[0].longname}`, myClasses, helper.longnameToUrl[longname]);
         }
 
+        if (myEnums.length) {
+            generate(`Enum: ${myEnums[0].longname}`, myEnums, helper.longnameToUrl[longname]);
+        }
+
         if (myNamespaces.length) {
             generate(`Namespace: ${myNamespaces[0].longname}`, myNamespaces, helper.longnameToUrl[longname]);
         }

package/docs/jsdoc-template/tmpl/container.tmpl

@@ -144,7 +144,10 @@
                 return m.longname && m.longname.indexOf('module:') !== 0;
             });
         }
-        if (members && members.length && members.forEach) {
+
+        // Skip enums, since they already have their values listed under
+        // "Properties".
+        if (members && members.length && members.forEach && doc.kind != 'enum') {
     ?>
         <h3 class="subsection-title">Members</h3>
 

package/docs/jsdoc.conf.json

@@ -16,6 +16,7 @@
       "navOrder": [
         "Tutorials",
         "Classes",
+        "Enums",
         "Interfaces",
         "Events"
       ]

package/docs/tutorials/welcome.md

@@ -66,8 +66,8 @@ python build/all.py
 
 Alternatively you can use a docker container:
 ```sh
-cd build/docker
-docker-compose run --rm shaka-compiler
+docker build -t shaka-player-build build/docker
+docker run -v $(pwd):/usr/src --user $(id -u):$(id -g) shaka-player-build
 ```
 
 The output is:

package/lib/ads/client_side_ad_manager.js

@@ -15,7 +15,6 @@ goog.require('goog.asserts');
 goog.require('shaka.ads.ClientSideAd');
 goog.require('shaka.util.IReleasable');
 
-
 /**
  * A class responsible for client-side ad interactions.
  * @implements {shaka.util.IReleasable}
@@ -211,7 +210,11 @@ shaka.ads.ClientSideAdManager = class {
       // TODO (ismena): Need a better inderstanding of what this does.
       // The docs say it's called to 'start playing the ads,' but I haven't
       // seen the ads actually play until requestAds() is called.
-      this.imaAdsManager_.start();
+      // Note: We listen for a play event to avoid autoplay issues that might
+      // crash IMA.
+      this.video_.addEventListener('play', () => {
+        this.imaAdsManager_.start();
+      }, {once: true});
     } catch (adError) {
       // If there was a problem with the VAST response,
       // we we won't be getting an ad. Hide ad UI if we showed it already

package/lib/cast/cast_sender.js

@@ -186,21 +186,14 @@ shaka.cast.CastSender = class {
       // If the API becomes available before this instance dies, init will be
       // called again.
 
-      // A note about this value: In our testing environment, we load both
-      // uncompiled and compiled code.  This global callback in uncompiled mode
-      // can be overwritten by the same in compiled mode.  The two versions will
-      // each have their own instances_ map.  Therefore the callback must have a
-      // name, as opposed to being anonymous.  This way, the CastSender tests
-      // can invoke the named static method instead of using a global that could
-      // be overwritten.
-      if (!window.__onGCastApiAvailable) {
-        window.__onGCastApiAvailable = shaka.cast.CastSender.onSdkLoaded_;
-      }
-      if (window.__onGCastApiAvailable != shaka.cast.CastSender.onSdkLoaded_) {
-        shaka.log.alwaysWarn('A global Cast SDK hook is already installed! ' +
-          'Shaka Player will be unable to receive a notification when the ' +
-          'Cast SDK is ready.');
+      // Check if our callback is already installed.
+      if (window.__onGCastApiAvailable !== CastSender.onGCastApiAvailable_) {
+        // Save pre-existing __onGCastApiAvailable in order to restore later.
+        CastSender.__onGCastApiAvailable_ =
+          window.__onGCastApiAvailable || null;
+        window.__onGCastApiAvailable = CastSender.onGCastApiAvailable_;
       }
+
       return;
     }
 
@@ -747,6 +740,9 @@ shaka.cast.CastSender.hasReceivers_ = false;
 /** @private {chrome.cast.Session} */
 shaka.cast.CastSender.session_ = null;
 
+/** @private {?function(boolean)} */
+shaka.cast.CastSender.__onGCastApiAvailable_ = null;
+
 /**
  * A set of all living CastSender instances.  The constructor and destroy
  * methods will add and remove instances from this set.
@@ -774,3 +770,32 @@ shaka.cast.CastSender.onSdkLoaded_ = (loaded) => {
     }
   }
 };
+
+/**
+ * @param {boolean} available
+ * @private
+ */
+shaka.cast.CastSender.onGCastApiAvailable_ = (available) => {
+  // Restore callback from saved.
+  if (shaka.cast.CastSender.__onGCastApiAvailable_) {
+    window.__onGCastApiAvailable =
+      shaka.cast.CastSender.__onGCastApiAvailable_;
+  } else {
+    delete window.__onGCastApiAvailable;
+  }
+  shaka.cast.CastSender.__onGCastApiAvailable_ = null;
+
+  // A note about this value: In our testing environment, we load both
+  // uncompiled and compiled code.  This global callback in uncompiled mode
+  // can be overwritten by the same in compiled mode.  The two versions will
+  // each have their own instances_ map.  Therefore the callback must have a
+  // name, as opposed to being anonymous.  This way, the CastSender tests
+  // can invoke the named static method instead of using a global that could
+  // be overwritten.
+  shaka.cast.CastSender.onSdkLoaded_(available);
+
+  // call restored callback (if any)
+  if (typeof window.__onGCastApiAvailable === 'function') {
+    window.__onGCastApiAvailable(available);
+  }
+};

package/lib/cea/cea608_memory.js

@@ -184,6 +184,10 @@ shaka.cea.Cea608Memory = class {
    * @param {number} count Count of rows to move.
    */
   moveRows(dst, src, count) {
+    if (src < 0 || dst < 0) {
+      return;
+    }
+
     if (dst >= src) {
       for (let i = count-1; i >= 0; i--) {
         this.rows_[dst + i] = this.rows_[src + i].map((e) => e);

package/lib/media/drm_engine.js

@@ -27,6 +27,7 @@ goog.require('shaka.util.StreamUtils');
 goog.require('shaka.util.StringUtils');
 goog.require('shaka.util.Timer');
 goog.require('shaka.util.Uint8ArrayUtils');
+goog.require('shaka.util.XmlUtils');
 
 
 /** @implements {shaka.util.IDestroyable} */
@@ -1439,7 +1440,8 @@ shaka.media.DrmEngine = class {
       return;
     }
     shaka.log.debug('Unwrapping PlayReady request.');
-    const dom = new DOMParser().parseFromString(xml, 'application/xml');
+    const dom = shaka.util.XmlUtils.parseXmlString(xml, 'PlayReadyKeyMessage');
+    goog.asserts.assert(dom, 'Failed to parse PlayReady XML!');
 
     // Set request headers.
     const headers = dom.getElementsByTagName('HttpHeader');
@@ -1523,7 +1525,7 @@ shaka.media.DrmEngine = class {
         hasExpiredKeys = true;
       }
 
-      const keyIdHex = shaka.util.Uint8ArrayUtils.toHex(keyId);
+      const keyIdHex = shaka.util.Uint8ArrayUtils.toHex(keyId).slice(0, 32);
 
       this.keyStatusByKeyId_.set(keyIdHex, status);
     });

package/lib/media/streaming_engine.js

@@ -980,7 +980,11 @@ shaka.media.StreamingEngine = class {
     const timeUntilEnd =
         this.manifest_.presentationTimeline.getDuration() - timeNeeded;
     const oneMicrosecond = 1e-6;
-    if (timeUntilEnd < oneMicrosecond) {
+
+    const bufferEnd =
+      this.playerInterface_.mediaSourceEngine.bufferEnd(mediaState.type);
+
+    if (timeUntilEnd < oneMicrosecond && !!bufferEnd) {
       // We shouldn't rebuffer if the playhead is close to the end of the
       // presentation.
       shaka.log.debug(logPrefix, 'buffered to end of presentation');
@@ -1010,8 +1014,6 @@ shaka.media.StreamingEngine = class {
       return this.config_.updateIntervalSeconds / 2;
     }
 
-    const bufferEnd =
-        this.playerInterface_.mediaSourceEngine.bufferEnd(mediaState.type);
     const reference = this.getSegmentReferenceNeeded_(
         mediaState, presentationTime, bufferEnd);
     if (!reference) {
@@ -1207,7 +1209,16 @@ shaka.media.StreamingEngine = class {
       // Enable MP4 low latency streaming with ReadableStream chunked data.
       if (this.config_.lowLatencyMode && isReadableStreamSupported && isMP4) {
         let remaining = new Uint8Array(0);
+        let processingResult = false;
+        let callbackCalled = false;
         const streamDataCallback = async (data) => {
+          if (processingResult) {
+            // If the fallback result processing was triggered, don't also
+            // append the buffer here.  In theory this should never happen,
+            // but it does on some older TVs.
+            return;
+          }
+          callbackCalled = true;
           this.destroyer_.ensureNotDestroyed();
           if (this.fatalError_) {
             return;
@@ -1238,7 +1249,33 @@ shaka.media.StreamingEngine = class {
           }
         };
 
-        await this.fetch_(mediaState, reference, streamDataCallback);
+        const result =
+            await this.fetch_(mediaState, reference, streamDataCallback);
+        if (!callbackCalled) {
+          // In some environments, we might be forced to use network plugins
+          // that don't support streamDataCallback. In those cases, as a
+          // fallback, append the buffer here.
+          processingResult = true;
+          this.destroyer_.ensureNotDestroyed();
+          if (this.fatalError_) {
+            return;
+          }
+
+          // If the text stream gets switched between fetch_() and append_(),
+          // the new text parser is initialized, but the new init segment is
+          // not fetched yet.  That would cause an error in
+          // TextParser.parseMedia().
+          // See http://b/168253400
+          if (mediaState.waitingToClearBuffer) {
+            shaka.log.info(logPrefix, 'waitingToClearBuffer, skip append');
+            mediaState.performingUpdate = false;
+            this.scheduleUpdate_(mediaState, 0);
+            return;
+          }
+
+          await this.append_(
+              mediaState, presentationTime, stream, reference, result);
+        }
       } else {
         if (this.config_.lowLatencyMode && !isReadableStreamSupported) {
           shaka.log.warning('Low latency streaming mode is enabled, but ' +

package/lib/offline/indexeddb/storage_mechanism.js

@@ -16,6 +16,7 @@ goog.require('shaka.offline.indexeddb.V5StorageCell');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.PublicPromise');
 goog.require('shaka.util.Platform');
+goog.require('shaka.util.Timer');
 
 
 /**
@@ -55,8 +56,25 @@ shaka.offline.indexeddb.StorageMechanism = class {
     const version = shaka.offline.indexeddb.StorageMechanism.VERSION;
 
     const p = new shaka.util.PublicPromise();
+
+    // Add a timeout mechanism, for the (rare?) case where no callbacks are
+    // called at all, so that this method doesn't hang forever.
+    let timedOut = false;
+    const timeOutTimer = new shaka.util.Timer(() => {
+      timedOut = true;
+      p.reject(new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.STORAGE,
+          shaka.util.Error.Code.INDEXED_DB_INIT_TIMED_OUT));
+    });
+    timeOutTimer.tickAfter(2);
+
     const open = window.indexedDB.open(name, version);
     open.onsuccess = (event) => {
+      if (timedOut) {
+        // Too late, we have already given up on opening the storage mechanism.
+        return;
+      }
       const db = open.result;
       this.db_ = db;
       this.v1_ = shaka.offline.indexeddb.StorageMechanism.createV1_(db);
@@ -68,6 +86,7 @@ shaka.offline.indexeddb.StorageMechanism = class {
       this.v5_ = shaka.offline.indexeddb.StorageMechanism.createV5_(db);
       this.sessions_ =
           shaka.offline.indexeddb.StorageMechanism.createEmeSessionCell_(db);
+      timeOutTimer.stop();
       p.resolve();
     };
     open.onupgradeneeded = (event) => {
@@ -75,11 +94,16 @@ shaka.offline.indexeddb.StorageMechanism = class {
       this.createStores_(open.result);
     };
     open.onerror = (event) => {
+      if (timedOut) {
+        // Too late, we have already given up on opening the storage mechanism.
+        return;
+      }
       p.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.STORAGE,
           shaka.util.Error.Code.INDEXED_DB_ERROR,
           open.error));
+      timeOutTimer.stop();
 
       // Firefox will raise an error on the main thread unless we stop it here.
       event.preventDefault();

package/lib/player.js

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

package/lib/polyfill/media_capabilities.js

@@ -43,6 +43,7 @@ shaka.polyfill.MediaCapabilities = class {
         !shaka.util.Platform.isPS5() &&
         !shaka.util.Platform.isWebOS() &&
         !shaka.util.Platform.isTizen() &&
+        !shaka.util.Platform.isEOS() &&
         navigator.mediaCapabilities) {
       shaka.log.info(
           'MediaCapabilities: Native mediaCapabilities support found.');

package/lib/text/ttml_text_parser.js

@@ -41,8 +41,6 @@ shaka.text.TtmlTextParser = class {
     const ttsNs = TtmlTextParser.styleNs_;
     const str = shaka.util.StringUtils.fromUTF8(data);
     const cues = [];
-    const parser = new DOMParser();
-    let xml = null;
 
     // dont try to parse empty string as
     // DOMParser will not throw error but return an errored xml
@@ -50,9 +48,8 @@ shaka.text.TtmlTextParser = class {
       return cues;
     }
 
-    try {
-      xml = parser.parseFromString(str, 'text/xml');
-    } catch (exception) {
+    const tt = XmlUtils.parseXmlString(str, 'tt');
+    if (!tt) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.TEXT,
@@ -60,104 +57,89 @@ shaka.text.TtmlTextParser = class {
           'Failed to parse TTML.');
     }
 
-    if (xml) {
-      const parserError = xml.getElementsByTagName('parsererror')[0];
-      if (parserError) {
-        throw new shaka.util.Error(
-            shaka.util.Error.Severity.CRITICAL,
-            shaka.util.Error.Category.TEXT,
-            shaka.util.Error.Code.INVALID_XML,
-            parserError.textContent);
-      }
-
-      const tt = xml.getElementsByTagName('tt')[0];
-      // TTML should always have tt element.
-      if (!tt) {
-        throw new shaka.util.Error(
-            shaka.util.Error.Severity.CRITICAL,
-            shaka.util.Error.Category.TEXT,
-            shaka.util.Error.Code.INVALID_XML,
-            'TTML does not contain <tt> tag.');
-      }
-
-      const body = tt.getElementsByTagName('body')[0];
-      if (!body) {
-        return [];
-      }
+    const body = tt.getElementsByTagName('body')[0];
+    if (!body) {
+      return [];
+    }
 
-      // Get the framerate, subFrameRate and frameRateMultiplier if applicable.
-      const frameRate = XmlUtils.getAttributeNSList(tt, ttpNs, 'frameRate');
-      const subFrameRate = XmlUtils.getAttributeNSList(
-          tt, ttpNs, 'subFrameRate');
-      const frameRateMultiplier =
-          XmlUtils.getAttributeNSList(tt, ttpNs, 'frameRateMultiplier');
-      const tickRate = XmlUtils.getAttributeNSList(tt, ttpNs, 'tickRate');
+    // Get the framerate, subFrameRate and frameRateMultiplier if applicable.
+    const frameRate = XmlUtils.getAttributeNSList(tt, ttpNs, 'frameRate');
+    const subFrameRate = XmlUtils.getAttributeNSList(
+        tt, ttpNs, 'subFrameRate');
+    const frameRateMultiplier =
+        XmlUtils.getAttributeNSList(tt, ttpNs, 'frameRateMultiplier');
+    const tickRate = XmlUtils.getAttributeNSList(tt, ttpNs, 'tickRate');
 
-      const cellResolution = XmlUtils.getAttributeNSList(
-          tt, ttpNs, 'cellResolution');
-      const spaceStyle = tt.getAttribute('xml:space') || 'default';
-      const extent = XmlUtils.getAttributeNSList(tt, ttsNs, 'extent');
+    const cellResolution = XmlUtils.getAttributeNSList(
+        tt, ttpNs, 'cellResolution');
+    const spaceStyle = tt.getAttribute('xml:space') || 'default';
+    const extent = XmlUtils.getAttributeNSList(tt, ttsNs, 'extent');
 
-      if (spaceStyle != 'default' && spaceStyle != 'preserve') {
-        throw new shaka.util.Error(
-            shaka.util.Error.Severity.CRITICAL,
-            shaka.util.Error.Category.TEXT,
-            shaka.util.Error.Code.INVALID_XML,
-            'Invalid xml:space value: ' + spaceStyle);
-      }
-      const whitespaceTrim = spaceStyle == 'default';
+    if (spaceStyle != 'default' && spaceStyle != 'preserve') {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.TEXT,
+          shaka.util.Error.Code.INVALID_XML,
+          'Invalid xml:space value: ' + spaceStyle);
+    }
+    const whitespaceTrim = spaceStyle == 'default';
 
-      const rateInfo = new TtmlTextParser.RateInfo_(
-          frameRate, subFrameRate, frameRateMultiplier, tickRate);
+    const rateInfo = new TtmlTextParser.RateInfo_(
+        frameRate, subFrameRate, frameRateMultiplier, tickRate);
 
-      const cellResolutionInfo =
-        TtmlTextParser.getCellResolution_(cellResolution);
+    const cellResolutionInfo =
+      TtmlTextParser.getCellResolution_(cellResolution);
 
-      const metadata = tt.getElementsByTagName('metadata')[0];
-      const metadataElements = metadata ? XmlUtils.getChildren(metadata) : [];
-      const styles = Array.from(tt.getElementsByTagName('style'));
-      const regionElements = Array.from(tt.getElementsByTagName('region'));
+    const metadata = tt.getElementsByTagName('metadata')[0];
+    const metadataElements = metadata ? XmlUtils.getChildren(metadata) : [];
+    const styles = Array.from(tt.getElementsByTagName('style'));
+    const regionElements = Array.from(tt.getElementsByTagName('region'));
 
-      const cueRegions = [];
-      for (const region of regionElements) {
-        const cueRegion =
-            TtmlTextParser.parseCueRegion_(region, styles, extent);
-        if (cueRegion) {
-          cueRegions.push(cueRegion);
-        }
+    const cueRegions = [];
+    for (const region of regionElements) {
+      const cueRegion =
+          TtmlTextParser.parseCueRegion_(region, styles, extent);
+      if (cueRegion) {
+        cueRegions.push(cueRegion);
       }
+    }
+
+    // A <body> element should only contain <div> elements, not <p> or <span>
+    // elements.  We used to allow this, but it is non-compliant, and the
+    // loose nature of our previous parser made it difficult to implement TTML
+    // nesting more fully.
+    if (XmlUtils.findChildren(body, 'p').length) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.TEXT,
+          shaka.util.Error.Code.INVALID_TEXT_CUE,
+          '<p> can only be inside <div> in TTML');
+    }
 
-      // A <body> element should only contain <div> elements, not <p> or <span>
-      // elements.  We used to allow this, but it is non-compliant, and the
-      // loose nature of our previous parser made it difficult to implement TTML
-      // nesting more fully.
-      if (XmlUtils.findChildren(body, 'p').length) {
+    for (const div of XmlUtils.findChildren(body, 'div')) {
+      // A <div> element should only contain <p>, not <span>.
+      if (XmlUtils.findChildren(div, 'span').length) {
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.TEXT,
             shaka.util.Error.Code.INVALID_TEXT_CUE,
-            '<p> can only be inside <div> in TTML');
-      }
-
-      for (const div of XmlUtils.findChildren(body, 'div')) {
-        // A <div> element should only contain <p>, not <span>.
-        if (XmlUtils.findChildren(div, 'span').length) {
-          throw new shaka.util.Error(
-              shaka.util.Error.Severity.CRITICAL,
-              shaka.util.Error.Category.TEXT,
-              shaka.util.Error.Code.INVALID_TEXT_CUE,
-              '<span> can only be inside <p> in TTML');
-        }
+            '<span> can only be inside <p> in TTML');
       }
+    }
 
-      const cue = TtmlTextParser.parseCue_(
-          body, time.periodStart, rateInfo, metadataElements, styles,
-          regionElements, cueRegions, whitespaceTrim,
-          cellResolutionInfo, /* parentCueElement= */ null,
-          /* isContent= */ false);
-      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) {
+      // According to the TTML spec, backgrounds default to transparent.
+      // So default the background of the top-level element to transparent.
+      // Nested elements may override that background color already.
+      if (!cue.backgroundColor) {
+        cue.backgroundColor = 'transparent';
       }
+      cues.push(cue);
     }
 
     return cues;

package/lib/util/error.js

@@ -993,6 +993,13 @@ shaka.util.Error.Code = {
    */
   'DOWNLOAD_SIZE_CALLBACK_ERROR': 9015,
 
+  /**
+   * When attempting to open an indexedDB instance, nothing happened for long
+   * enough for us to time out.  This keeps the storage mechanism from hanging
+   * indefinitely, if neither the success nor error callbacks are called.
+   */
+  'INDEXED_DB_INIT_TIMED_OUT': 9017,
+
   /**
    * CS IMA SDK, required for ad insertion, has not been included on the page.
    */

package/lib/util/periods.js

@@ -1146,15 +1146,6 @@ shaka.util.PeriodCombiner = class {
       return false;
     }
 
-    // If the language doesn't match, but the candidate is the "primary"
-    // language, then that should be preferred as a fallback.
-    if (!best.primary && candidate.primary) {
-      return true;
-    }
-    if (best.primary && !candidate.primary) {
-      return false;
-    }
-
     // If language-based differences haven't decided this, look at roles.  If
     // the candidate has more roles in common with the output, upgrade to the
     // candidate.
@@ -1188,6 +1179,15 @@ shaka.util.PeriodCombiner = class {
       return false;
     }
 
+    // If the language doesn't match, but the candidate is the "primary"
+    // language, then that should be preferred as a fallback.
+    if (!best.primary && candidate.primary) {
+      return true;
+    }
+    if (best.primary && !candidate.primary) {
+      return false;
+    }
+
     // If language-based and role-based features are equivalent, take the audio
     // with the closes channel count to the output.
     const channelsBetterOrWorse =