shaka-player 4.0.4 → 4.1.2

package/lib/util/fake_event.js

@@ -144,3 +144,42 @@ shaka.util.FakeEvent = class {
    */
   stopPropagation() {}
 };
+
+
+/**
+ * An internal enum that contains the string values of all of the player events.
+ * This exists primarily to act as an implicit list of events, for tests.
+ *
+ * @enum {string}
+ */
+shaka.util.FakeEvent.EventName = {
+  AbrStatusChanged: 'abrstatuschanged',
+  Adaptation: 'adaptation',
+  Buffering: 'buffering',
+  DownloadFailed: 'downloadfailed',
+  DownloadHeadersReceived: 'downloadheadersreceived',
+  DrmSessionUpdate: 'drmsessionupdate',
+  Emsg: 'emsg',
+  Error: 'error',
+  ExpirationUpdated: 'expirationupdated',
+  GapJumped: 'gapjumped',
+  Loaded: 'loaded',
+  Loading: 'loading',
+  ManifestParsed: 'manifestparsed',
+  MediaQualityChanged: 'mediaqualitychanged',
+  Metadata: 'metadata',
+  OnStateChange: 'onstatechange',
+  OnStateIdle: 'onstateidle',
+  RateChange: 'ratechange',
+  SessionDataEvent: 'sessiondata',
+  StallDetected: 'stalldetected',
+  Streaming: 'streaming',
+  TextChanged: 'textchanged',
+  TextTrackVisibility: 'texttrackvisibility',
+  TimelineRegionAdded: 'timelineregionadded',
+  TimelineRegionEnter: 'timelineregionenter',
+  TimelineRegionExit: 'timelineregionexit',
+  TracksChanged: 'trackschanged',
+  Unloading: 'unloading',
+  VariantChanged: 'variantchanged',
+};

package/lib/util/player_configuration.js

@@ -74,6 +74,7 @@ shaka.util.PlayerConfiguration = class {
       logLicenseExchange: false,
       updateExpirationTime: 1,
       preferredKeySystems: [],
+      keySystemsMapping: {},
     };
 
     const manifest = {
@@ -169,6 +170,7 @@ shaka.util.PlayerConfiguration = class {
       updateIntervalSeconds: 1,
       dispatchAllEmsgBoxes: false,
       observeQualityChanges: false,
+      maxDisabledTime: 30,
     };
 
     // Some browsers will stop earlier than others before a gap (e.g., Edge

package/lib/util/stats.js

@@ -31,6 +31,11 @@ shaka.util.Stats = class {
     /** @private {number} */
     this.totalCorruptedFrames_ = NaN;
 
+    /** @private {number} */
+    this.totalStallsDetected_ = NaN;
+    /** @private {number} */
+    this.totalGapsJumped_ = NaN;
+
     /** @private {number} */
     this.completionPercent_ = NaN;
 
@@ -76,7 +81,6 @@ shaka.util.Stats = class {
     this.totalDecodedFrames_ = decoded;
   }
 
-
   /**
    * Update corrupted frames. This will replace the previous values.
    *
@@ -86,6 +90,25 @@ shaka.util.Stats = class {
     this.totalCorruptedFrames_ = corrupted;
   }
 
+  /**
+   * Update number of stalls detected. This will replace the previous value.
+   *
+   * @param {number} stallsDetected
+   */
+  setStallsDetected(stallsDetected) {
+    this.totalStallsDetected_ = stallsDetected;
+  }
+
+  /**
+   * Update number of playback gaps jumped over. This will replace the previous
+   * value.
+   *
+   * @param {number} gapsJumped
+   */
+  setGapsJumped(gapsJumped) {
+    this.totalGapsJumped_ = gapsJumped;
+  }
+
   /**
    * Set the width and height of the video we are currently playing.
    *
@@ -208,6 +231,8 @@ shaka.util.Stats = class {
       decodedFrames: this.totalDecodedFrames_,
       droppedFrames: this.totalDroppedFrames_,
       corruptedFrames: this.totalCorruptedFrames_,
+      stallsDetected: this.totalStallsDetected_,
+      gapsJumped: this.totalGapsJumped_,
       estimatedBandwidth: this.bandwidthEstimate_,
       completionPercent: this.completionPercent_,
       loadLatency: this.loadLatencySeconds_,
@@ -238,6 +263,8 @@ shaka.util.Stats = class {
       decodedFrames: NaN,
       droppedFrames: NaN,
       corruptedFrames: NaN,
+      stallsDetected: NaN,
+      gapsJumped: NaN,
       estimatedBandwidth: NaN,
       completionPercent: NaN,
       loadLatency: NaN,

package/lib/util/stream_utils.js

@@ -329,6 +329,13 @@ shaka.util.StreamUtils = class {
 
     const video = variant.video;
 
+    if (variant.disabledUntilTime != 0) {
+      if (variant.disabledUntilTime > Date.now() / 1000) {
+        return false;
+      }
+      variant.disabledUntilTime = 0;
+    }
+
     // |video.width| and |video.height| can be undefined, which breaks
     // the math, so make sure they are there first.
     if (video && video.width && video.height) {

package/package.json

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

package/test/cast/cast_proxy_unit.js

@@ -11,6 +11,7 @@ describe('CastProxy', () => {
 
   const originalCastSender = shaka.cast.CastSender;
   const fakeAppId = 'fake app ID';
+  const fakeAndroidReceiverCompatible = false;
 
   let mockPlayer;
   let mockSender;
@@ -31,7 +32,8 @@ describe('CastProxy', () => {
     mockPlayer = createMockPlayer();
     mockSender = null;
 
-    proxy = new CastProxy(mockVideo, mockPlayer, fakeAppId);
+    proxy = new CastProxy(mockVideo, mockPlayer, fakeAppId,
+        fakeAndroidReceiverCompatible);
   });
 
   afterEach(async () => {

package/test/cast/cast_sender_unit.js

@@ -13,6 +13,7 @@ describe('CastSender', () => {
   const originalStatusDelay = shaka.cast.CastSender.STATUS_DELAY;
 
   const fakeAppId = 'asdf';
+  const fakeAndroidReceiverCompatible = false;
   const fakeInitState = {
     manifest: null,
     player: null,
@@ -52,7 +53,8 @@ describe('CastSender', () => {
     sender = new CastSender(
         fakeAppId, Util.spyFunc(onStatusChanged),
         Util.spyFunc(onFirstCastStateUpdate), Util.spyFunc(onRemoteEvent),
-        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired));
+        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired),
+        fakeAndroidReceiverCompatible);
   });
 
   afterEach(async () => {
@@ -87,7 +89,12 @@ describe('CastSender', () => {
       expect(sender.apiReady()).toBe(true);
       expect(sender.hasReceivers()).toBe(false);
       expect(onStatusChanged).toHaveBeenCalled();
-      expect(mockCastApi.SessionRequest).toHaveBeenCalledWith(fakeAppId);
+      expect(mockCastApi.SessionRequest).toHaveBeenCalledWith(
+          fakeAppId,
+          /* capabilities= */ [],
+          /* timeout= */ null,
+          fakeAndroidReceiverCompatible,
+          /* credentialsData= */ null);
       expect(mockCastApi.initialize).toHaveBeenCalled();
     });
 
@@ -97,7 +104,12 @@ describe('CastSender', () => {
       expect(sender.apiReady()).toBe(true);
       expect(sender.hasReceivers()).toBe(false);
       expect(onStatusChanged).toHaveBeenCalled();
-      expect(mockCastApi.SessionRequest).toHaveBeenCalledWith(fakeAppId);
+      expect(mockCastApi.SessionRequest).toHaveBeenCalledWith(
+          fakeAppId,
+          /* capabilities= */ [],
+          /* timeout= */ null,
+          fakeAndroidReceiverCompatible,
+          /* credentialsData= */ null);
       expect(mockCastApi.initialize).toHaveBeenCalled();
     });
   });
@@ -122,7 +134,8 @@ describe('CastSender', () => {
       sender = new CastSender(
           fakeAppId, Util.spyFunc(onStatusChanged),
           Util.spyFunc(onFirstCastStateUpdate), Util.spyFunc(onRemoteEvent),
-          Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired));
+          Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired),
+          /* androidReceiverCompatible= */ false);
       sender.init();
       // You get an initial call to onStatusChanged when it initializes.
       expect(onStatusChanged).toHaveBeenCalledTimes(3);
@@ -256,7 +269,8 @@ describe('CastSender', () => {
     sender = new CastSender(
         fakeAppId, Util.spyFunc(onStatusChanged),
         Util.spyFunc(onFirstCastStateUpdate), Util.spyFunc(onRemoteEvent),
-        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired));
+        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired),
+        /* androidReceiverCompatible= */ false);
     sender.init();
 
     // The sender should automatically rejoin the session, without needing
@@ -288,7 +302,8 @@ describe('CastSender', () => {
     sender = new CastSender(
         fakeAppId, Util.spyFunc(onStatusChanged),
         Util.spyFunc(onFirstCastStateUpdate), Util.spyFunc(onRemoteEvent),
-        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired));
+        Util.spyFunc(onResumeLocal), Util.spyFunc(onInitStateRequired),
+        /* androidReceiverCompatible= */ false);
     sender.init();
 
     expect(sender.isCasting()).toBe(false);

package/test/demo/demo_unit.js

@@ -94,7 +94,8 @@ describe('Demo', () => {
           .add('playRangeStart')
           .add('playRangeEnd')
           .add('manifest.dash.keySystemsByURI')
-          .add('manifest.hls.mediaPlaylistFullMimeType');
+          .add('manifest.hls.mediaPlaylistFullMimeType')
+          .add('drm.keySystemsMapping');
 
       /**
        * @param {!Object} section

package/test/media/adaptation_set_unit.js

@@ -179,6 +179,7 @@ describe('AdaptationSet', () => {
       audio: audio,
       bandwidth: 1024,
       id: id,
+      disabledUntilTime: 0,
       language: '',
       primary: false,
       video: video,