shaka-player 4.9.4 → 4.9.5

package/lib/media/time_ranges_utils.js

@@ -11,6 +11,19 @@ goog.provide('shaka.media.TimeRangesUtils');
  * @summary A set of utility functions for dealing with TimeRanges objects.
  */
 shaka.media.TimeRangesUtils = class {
+  /**
+   * Returns whether the buffer is small enough to be ignored.
+   *
+   * @param {TimeRanges} b
+   * @return {boolean}
+   * @private
+   */
+  static isBufferNegligible_(b) {
+    // Workaround Safari bug: https://bit.ly/2trx6O8
+    // Firefox may leave <1e-4s of data in buffer after clearing all content
+    return b.length == 1 && b.end(0) - b.start(0) < 1e-4;
+  }
+
   /**
    * Gets the first timestamp in the buffer.
    *
@@ -22,8 +35,7 @@ shaka.media.TimeRangesUtils = class {
     if (!b) {
       return null;
     }
-    // Workaround Safari bug: https://bit.ly/2trx6O8
-    if (b.length == 1 && b.end(0) - b.start(0) < 1e-6) {
+    if (shaka.media.TimeRangesUtils.isBufferNegligible_(b)) {
       return null;
     }
     // Workaround Edge bug: https://bit.ly/2JYLPeB
@@ -45,8 +57,7 @@ shaka.media.TimeRangesUtils = class {
     if (!b) {
       return null;
     }
-    // Workaround Safari bug: https://bit.ly/2trx6O8
-    if (b.length == 1 && b.end(0) - b.start(0) < 1e-6) {
+    if (shaka.media.TimeRangesUtils.isBufferNegligible_(b)) {
       return null;
     }
     return b.length ? b.end(b.length - 1) : null;
@@ -64,8 +75,7 @@ shaka.media.TimeRangesUtils = class {
     if (!b || !b.length) {
       return false;
     }
-    // Workaround Safari bug: https://bit.ly/2trx6O8
-    if (b.length == 1 && b.end(0) - b.start(0) < 1e-6) {
+    if (shaka.media.TimeRangesUtils.isBufferNegligible_(b)) {
       return false;
     }
 
@@ -92,8 +102,7 @@ shaka.media.TimeRangesUtils = class {
     if (!b || !b.length) {
       return 0;
     }
-    // Workaround Safari bug: https://bit.ly/2trx6O8
-    if (b.length == 1 && b.end(0) - b.start(0) < 1e-6) {
+    if (shaka.media.TimeRangesUtils.isBufferNegligible_(b)) {
       return 0;
     }
 
@@ -128,8 +137,7 @@ shaka.media.TimeRangesUtils = class {
     if (!b || !b.length) {
       return null;
     }
-    // Workaround Safari bug: https://bit.ly/2trx6O8
-    if (b.length == 1 && b.end(0) - b.start(0) < 1e-6) {
+    if (shaka.media.TimeRangesUtils.isBufferNegligible_(b)) {
       return null;
     }
 

package/lib/player.js

@@ -1384,6 +1384,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.preloadDueAdManagerTimer_.stop();
       }
 
+      if (this.cmcdManager_) {
+        this.cmcdManager_.reset();
+      }
+
       if (this.cmsdManager_) {
         this.cmsdManager_.reset();
       }
@@ -6573,6 +6577,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // This will reset the "enabled" of other tracks to false.
     track.enabled = true;
 
+    if (!currentTrack) {
+      return;
+    }
+
     // AirPlay does not reset the "enabled" of other tracks to false, so
     // it must be changed by hand.
     if (track.id !== currentTrack.id) {
@@ -7449,7 +7457,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.9.4' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.5' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/cmcd_manager.js

@@ -63,6 +63,16 @@ shaka.util.CmcdManager = class {
     this.config_ = config;
   }
 
+
+  /**
+   * Resets the CmcdManager.
+   */
+  reset() {
+    this.playbackStarted_ = false;
+    this.buffering_ = true;
+    this.starved_ = false;
+  }
+
   /**
    * Set the buffering state
    *

package/lib/util/manifest_parser_utils.js

@@ -295,7 +295,7 @@ shaka.util.ManifestParserUtils.AUDIO_CODEC_REGEXPS_ = [
   /^flac$/, // some manifests wrongfully use this
   /^mp4a/,
   /^[ae]c-3$/,
-  /^ac-4$/,
+  /^ac-4/,
   /^dts[cex]$/, // DTS Digital Surround (dtsc), DTS Express (dtse), DTS:X (dtsx)
   /^iamf/,
 ];

package/package.json

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