shaka-player 4.9.1 → 4.9.3

package/lib/abr/simple_abr_manager.js

@@ -268,7 +268,8 @@ shaka.abr.SimpleAbrManager = class {
 
       if (currentBandwidth >= minBandwidth &&
           currentBandwidth <= maxBandwidth &&
-          chosen.bandwidth != item.bandwidth) {
+          (chosen.bandwidth != item.bandwidth ||
+          this.isSameBandwidthAndHigherResolution_(chosen, item))) {
         chosen = item;
       }
     }
@@ -537,6 +538,23 @@ shaka.abr.SimpleAbrManager = class {
       return v1.width - v2.width;
     });
   }
+
+  /**
+   * @param {shaka.extern.Variant} chosenVariant
+   * @param {shaka.extern.Variant} newVariant
+   * @return {boolean}
+   * @private
+   */
+  isSameBandwidthAndHigherResolution_(chosenVariant, newVariant) {
+    if (chosenVariant.bandwidth != newVariant.bandwidth) {
+      return false;
+    }
+    if (!chosenVariant.video || !newVariant.video) {
+      return false;
+    }
+    return chosenVariant.video.width < newVariant.video.width ||
+        chosenVariant.video.height < newVariant.video.height;
+  }
 };
 
 

package/lib/hls/hls_parser.js

@@ -489,7 +489,7 @@ shaka.hls.HlsParser = class {
           mediaSequenceNumber);
       stream.segmentIndex.evict(playlistStartTime);
     }
-    const oldSegment = segments[0];
+    const oldSegment = stream.segmentIndex.earliestReference();
     goog.asserts.assert(oldSegment, 'Should have segments!');
 
     streamInfo.minTimestamp = oldSegment.startTime;
@@ -4282,7 +4282,7 @@ shaka.hls.HlsParser = class {
     }
 
     const uri = drmTag.getRequiredAttrValue('URI');
-    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri);
+    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri.split('?')[0]);
 
     // The data encoded in the URI is a PSSH box to be used as init data.
     const pssh = shaka.util.BufferUtils.toUint8(parsedData.data);
@@ -4325,7 +4325,7 @@ shaka.hls.HlsParser = class {
     }
 
     const uri = drmTag.getRequiredAttrValue('URI');
-    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri);
+    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri.split('?')[0]);
 
     // The data encoded in the URI is a PlayReady Pro Object, so we need
     // convert it to pssh.

package/lib/media/drm_engine.js

@@ -393,7 +393,6 @@ shaka.media.DrmEngine = class {
           this.config_.keySystemsMapping);
     }
 
-
     /** @type {!Map.<string, MediaKeySystemConfiguration>} */
     let configsByKeySystem;
 
@@ -402,6 +401,7 @@ shaka.media.DrmEngine = class {
     await shaka.util.StreamUtils.getDecodingInfosForVariants(variants,
         this.usePersistentLicenses_, this.srcEquals_,
         this.config_.preferredKeySystems);
+    this.destroyer_.ensureNotDestroyed();
 
     const hasDrmInfo = hadDrmInfo || Object.keys(this.config_.servers).length;
     // An unencrypted content is initialized.

package/lib/media/preload_manager.js

@@ -132,19 +132,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     this.stats_ = new shaka.util.Stats();
 
     /** @private {!shaka.util.PublicPromise} */
-    this.manifestPromise_ = new shaka.util.PublicPromise();
-
-    /** @private {!shaka.util.PublicPromise} */
-    this.drmPromise_ = new shaka.util.PublicPromise();
-
-    /** @private {!shaka.util.PublicPromise} */
-    this.chooseInitialVariantPromise_ = new shaka.util.PublicPromise();
-
-    /** @private {!shaka.util.PublicPromise} */
-    this.destroyPromise_ = new shaka.util.PublicPromise();
-
-    // Silence promise failures, in case nobody is catching this.destroyPromise_
-    this.destroyPromise_.catch((error) => {});
+    this.successPromise_ = new shaka.util.PublicPromise();
 
     /** @private {?shaka.util.FakeEventTarget} */
     this.eventHandoffTarget_ = null;
@@ -353,21 +341,6 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     return this.segmentPrefetchById_;
   }
 
-  /** @return {!Promise} */
-  waitForManifest() {
-    return this.manifestPromise_;
-  }
-
-  /** @return {!Promise} */
-  waitForDrm() {
-    return this.drmPromise_;
-  }
-
-  /** @return {!Promise} */
-  waitForChooseInitialVariant() {
-    return this.chooseInitialVariantPromise_;
-  }
-
   /**
    * @param {?shaka.extern.AbrManager} abrManager
    * @param {?shaka.extern.AbrManager.Factory} abrFactory
@@ -397,34 +370,30 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
   /**
    * Starts the process of loading the asset.
-   * @return {!Promise}
+   * Success or failure will be measured through waitForFinish()
    */
-  async start() {
-    // Force a context switch, to give the player a chance to hook up events
-    // immediately if desired.
-    await Promise.resolve();
-
-    // Perform the preloading process.
-    try {
-      await this.parseManifestInner_();
-      if (this.isDestroyed()) {
-        return;
-      }
-      this.manifestPromise_.resolve();
-      await this.initializeDrmInner_();
-      if (this.isDestroyed()) {
-        return;
-      }
-      this.drmPromise_.resolve();
-      await this.chooseInitialVariantInner_();
-      if (this.isDestroyed()) {
-        return;
+  start() {
+    (async () => {
+      // Force a context switch, to give the player a chance to hook up events
+      // immediately if desired.
+      await Promise.resolve();
+
+      // Perform the preloading process.
+      try {
+        await this.parseManifestInner_();
+        this.throwIfDestroyed_();
+
+        await this.initializeDrmInner_();
+        this.throwIfDestroyed_();
+
+        await this.chooseInitialVariantInner_();
+        this.throwIfDestroyed_();
+
+        this.successPromise_.resolve();
+      } catch (error) {
+        this.successPromise_.reject(error);
       }
-      this.chooseInitialVariantPromise_.resolve();
-    } catch (error) {
-      this.destroyPromise_.reject(error);
-      throw error;
-    }
+    })();
   }
 
   /**
@@ -446,7 +415,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
   onError(error) {
     if (error.severity === shaka.util.Error.Severity.CRITICAL) {
       // Cancel the loading process.
-      this.destroyPromise_.reject(error);
+      this.successPromise_.reject(error);
       this.destroy();
     }
 
@@ -458,6 +427,20 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     }
   }
 
+  /**
+   * Throw if destroyed, to interrupt processes with a recognizable error.
+   *
+   * @private
+   */
+  throwIfDestroyed_() {
+    if (this.isDestroyed()) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.PLAYER,
+          shaka.util.Error.Code.OBJECT_DESTROYED);
+    }
+  }
+
   /**
    * Makes a fires an event corresponding to entering a state of the loading
    * process.
@@ -553,12 +536,11 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
     const tracksChangedInitial = this.manifestFilterer_.applyRestrictions(
         this.manifest_);
-    const tracksChangedBefore = await this.manifestFilterer_.filterManifest(
-        this.manifest_);
-    if (tracksChangedInitial || tracksChangedBefore) {
+    if (tracksChangedInitial) {
       const event = this.makeEvent_(
           shaka.util.FakeEvent.EventName.TracksChanged);
       await Promise.resolve();
+      this.throwIfDestroyed_();
       this.dispatchEvent(event);
     }
 
@@ -567,6 +549,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     await this.drmEngine_.initForPlayback(
         playableVariants,
         this.manifest_.offlineSessionIds);
+    this.throwIfDestroyed_();
 
     // Now that we have drm information, filter the manifest (again) so that
     // we can ensure we only use variants with the selected key system.
@@ -717,10 +700,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
    * @export
    */
   waitForFinish() {
-    return Promise.race([
-      this.chooseInitialVariantPromise_,
-      this.destroyPromise_,
-    ]);
+    return this.successPromise_;
   }
 
   /**

package/lib/player.js

@@ -1607,7 +1607,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         if (preloadManager) {
           preloadManager.setEventHandoffTarget(this);
           this.stats_ = preloadManager.getStats();
-          await mutexWrapOperation(() => preloadManager.start(), 'preload');
+          preloadManager.start();
+          // Silence "uncaught error" warnings from this. Unless we are
+          // interrupted, we will check the result of this process and respond
+          // appropriately. If we are interrupted, we can ignore any error
+          // there.
+          preloadManager.waitForFinish().catch(() => {});
         } else {
           this.stats_ = new shaka.util.Stats();
         }
@@ -1648,9 +1653,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           }, 'initializeMediaSourceEngineInner_');
         }
 
+        // Wait for the preload manager to do all of the loading it can do.
+        await mutexWrapOperation(async () => {
+          await preloadManager.waitForFinish();
+        }, 'waitForFinish');
+
         // Get manifest and associated values from preloader.
-        await mutexWrapOperation(
-            () => preloadManager.waitForManifest(), 'waitForManifest');
         this.config_ = preloadManager.getConfiguration();
         this.manifestFilterer_ = preloadManager.getManifestFilterer();
         this.parserFactory_ = preloadManager.getParserFactory();
@@ -1674,18 +1682,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         }
 
         // Get drm engine from preloader, then finalize it.
-        await mutexWrapOperation(
-            () => preloadManager.waitForDrm(), 'waitForDrm');
         this.drmEngine_ = preloadManager.receiveDrmEngine();
         await mutexWrapOperation(async () => {
           await this.drmEngine_.attach(this.video_);
         }, 'drmEngine_.attach');
 
-        // Choose an initial variant.
-        await mutexWrapOperation(
-            () => preloadManager.waitForChooseInitialVariant(),
-            'waitForChooseInitialVariant');
-
         // Also get the ABR manager, which has special logic related to being
         // received.
         const abrManagerFactory = preloadManager.getAbrManagerFactory();
@@ -1873,7 +1874,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           shaka.util.Error.Category.PLAYER,
           shaka.util.Error.Code.SRC_EQUALS_PRELOAD_NOT_SUPPORTED));
     } else {
-      preloadManager.start().catch((error) => {}); // Catch errors.
+      preloadManager.start();
     }
     return preloadManager;
   }
@@ -7103,7 +7104,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         shaka.util.FakeEvent.EventName.KeyStatusChanged);
     this.dispatchEvent(event);
 
-    const keyIds = Object.keys(keyStatusMap);
+    let keyIds = Object.keys(keyStatusMap);
     if (keyIds.length == 0) {
       shaka.log.warning(
           'Got a key status event without any key statuses, so we don\'t ' +
@@ -7111,6 +7112,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           'you\'ll need to set restrictions so we don\'t select those tracks.');
     }
 
+    // Non-standard version of global key status. Modify it to match standard
+    // behavior.
+    if (keyIds.length == 1 && keyIds[0] == '') {
+      keyIds = ['00'];
+      keyStatusMap = {'00': keyStatusMap['']};
+    }
+
     // If EME is using a synthetic key ID, the only key ID is '00' (a single 0
     // byte).  In this case, it is only used to report global success/failure.
     // See note about old platforms in: https://bit.ly/2tpez5Z
@@ -7446,7 +7454,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.9.1' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.3' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/mediasource.js

@@ -67,6 +67,18 @@ shaka.polyfill.MediaSource = class {
         // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=165342
         shaka.polyfill.MediaSource.stubAbort_();
       }
+    } else if (shaka.util.Platform.isZenterio()) {
+      // Zenterio uses WPE based on Webkit 607.x.x which do not correctly
+      // implement abort() on SourceBuffer.
+      // Calling abort() before appending a segment causes that segment to be
+      // incomplete in the buffer.
+      // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=165342
+      shaka.polyfill.MediaSource.stubAbort_();
+      // If you remove up to a keyframe, Webkit 607.x.x incorrectly will also
+      // remove that keyframe and the content up to the next.
+      // Offsetting the end of the removal range seems to help.
+      // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=177884
+      shaka.polyfill.MediaSource.patchRemovalRange_();
     } else if (shaka.util.Platform.isTizen2() ||
         shaka.util.Platform.isTizen3() ||
         shaka.util.Platform.isTizen4()) {

package/lib/util/config_utils.js

@@ -211,6 +211,8 @@ shaka.util.ConfigUtils = class {
           delete obj[key];
         } else if (isArrayEmpty(obj[key])) {
           delete obj[key];
+        } else if (typeof obj[key] == 'function') {
+          delete obj[key];
         } else if (isObject(obj[key])) {
           removeEmpty(obj[key]);
         }

package/lib/util/platform.js

@@ -299,7 +299,8 @@ shaka.util.Platform = class {
         !shaka.util.Platform.isOrange() &&
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV() &&
-        !shaka.util.Platform.isWPE();
+        !shaka.util.Platform.isWPE() &&
+        !shaka.util.Platform.isZenterio();
   }
 
   /**
@@ -362,6 +363,14 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('WPE');
   }
 
+  /**
+   * Check if the current platform is Deutsche Telecom Zenterio STB.
+   * @return {boolean}
+   */
+  static isZenterio() {
+    return shaka.util.Platform.userAgentContains_('DT_STB_BCM');
+  }
+
   /**
    * Returns a major version number for Safari, or Safari-based iOS browsers.
    *
@@ -519,7 +528,7 @@ shaka.util.Platform = class {
         Platform.isEOS() || Platform.isAPL() ||
         Platform.isVirginMedia() || Platform.isOrange() ||
         Platform.isWPE() || Platform.isChromecast() ||
-        Platform.isHisense()) {
+        Platform.isHisense() || Platform.isZenterio()) {
       return true;
     }
     return false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.9.1",
+  "version": "4.9.3",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/ui/presentation_time.js

@@ -7,6 +7,7 @@
 
 goog.provide('shaka.ui.PresentationTimeTracker');
 
+goog.require('shaka.ads.AdManager');
 goog.require('shaka.ui.Controls');
 goog.require('shaka.ui.Element');
 goog.require('shaka.ui.Locales');
@@ -40,6 +41,10 @@ shaka.ui.PresentationTimeTracker = class extends shaka.ui.Element {
       }
     });
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      shaka.ui.Utils.setDisplay(this.currentTime_, true);
+    });
+
     this.eventManager.listen(this.controls, 'timeandseekrangeupdated', () => {
       this.updateTime_();
     });
@@ -47,6 +52,16 @@ shaka.ui.PresentationTimeTracker = class extends shaka.ui.Element {
     this.eventManager.listen(this.player, 'trackschanged', () => {
       this.onTracksChanged_();
     });
+
+    this.eventManager.listen(
+        this.adManager, shaka.ads.AdManager.AD_STARTED, () => {
+          shaka.ui.Utils.setDisplay(this.currentTime_, false);
+        });
+
+    this.eventManager.listen(
+        this.adManager, shaka.ads.AdManager.AD_STOPPED, () => {
+          shaka.ui.Utils.setDisplay(this.currentTime_, true);
+        });
   }
 
   /** @private */

package/ui/resolution_selection.js

@@ -140,6 +140,9 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
       tracks.sort((t1, t2) => {
         goog.asserts.assert(t1.height != null, 'Null height');
         goog.asserts.assert(t2.height != null, 'Null height');
+        if (t2.height == t1.height) {
+          return t2.bandwidth - t1.bandwidth;
+        }
         return t2.height - t1.height;
       });
     }