shaka-player 4.4.3 → 4.6.0

package/test/media/play_rate_controller_unit.js

@@ -57,54 +57,6 @@ describe('PlayRateController', () => {
     expect(setPlayRateSpy).toHaveBeenCalledWith(0);
   });
 
-  it('buffering state sets rate to zero', () => {
-    controller.setBuffering(true);
-    expect(setPlayRateSpy).toHaveBeenCalledWith(0);
-
-    setPlayRateSpy.calls.reset();
-
-    controller.setBuffering(false);
-    expect(setPlayRateSpy).toHaveBeenCalledWith(1);
-  });
-
-  it('entering buffering state twice has no effect', () => {
-    controller.setBuffering(true);
-    expect(setPlayRateSpy).toHaveBeenCalledWith(0);
-
-    // Reset the calls so that we can make sure it was not called again.
-    setPlayRateSpy.calls.reset();
-
-    controller.setBuffering(true);
-    expect(setPlayRateSpy).not.toHaveBeenCalled();
-  });
-
-  it('leaving buffering state twice has no effect', () => {
-    controller.setBuffering(true);
-    controller.setBuffering(false);
-
-    // Reset the calls so that we can make sure it was not called again.
-    setPlayRateSpy.calls.reset();
-
-    controller.setBuffering(false);
-    expect(setPlayRateSpy).not.toHaveBeenCalled();
-  });
-
-  // When we set the rate while in a buffering state, we should see the new
-  // rate be used once we leave the buffering state.
-  it('set takes effect after buffering state ends', () => {
-    controller.setBuffering(true);
-    expect(setPlayRateSpy).toHaveBeenCalledWith(0);
-
-    // Reset so that we can make sure it was not called after we call |set(4)|.
-    setPlayRateSpy.calls.reset();
-
-    controller.set(4);
-    expect(setPlayRateSpy).not.toHaveBeenCalled();
-
-    controller.setBuffering(false);
-    expect(setPlayRateSpy).toHaveBeenCalledWith(4);
-  });
-
   // Make sure that when the playback rate set, if the new rate matches the
   // current rate, the controller will not set the rate on the media element.
   it('does not redundently set the playrate', () => {

package/test/media/segment_index_unit.js

@@ -223,7 +223,7 @@ describe('SegmentIndex', /** @suppress {accessControls} */ () => {
 
       index.fit(/* windowStart= */ 0, /* windowEnd= */ 10);
       expect(
-          index.references[index.references.length - 1].hlsAes128Key,
+          index.references[index.references.length - 1].aes128Key,
       ).toEqual({method: 'AES-128', firstMediaSequenceNumber: 0});
     });
   });
@@ -1054,11 +1054,11 @@ describe('SegmentIndex', /** @suppress {accessControls} */ () => {
    * @param {number} startTime
    * @param {number} endTime
    * @param {!Array.<!shaka.media.SegmentReference>=} partialReferences
-   * @param {?shaka.extern.HlsAes128Key=} hlsAes128Key
+   * @param {?shaka.extern.aes128Key=} aes128Key
    * @return {shaka.media.SegmentReference}
    */
   function makeReference(uri, startTime, endTime, partialReferences = [],
-      hlsAes128Key = null) {
+      aes128Key = null) {
     return new shaka.media.SegmentReference(
         startTime,
         endTime,
@@ -1074,6 +1074,7 @@ describe('SegmentIndex', /** @suppress {accessControls} */ () => {
         /* tileDuration= */ undefined,
         /* syncTime= */ undefined,
         /* status= */ undefined,
-        /* hlsAes128Key= */ hlsAes128Key);
+        /* aes128Key= */ aes128Key,
+        /* allPartialSegments= */ partialReferences.length > 0);
   }
 });

package/test/media/segment_prefetch_unit.js

@@ -201,7 +201,7 @@ describe('SegmentPrefetch', () => {
         /* tileDuration= */ undefined,
         /* syncTime= */ undefined,
         /* status= */ undefined,
-        /* hlsAes128Key= */ null);
+        /* aes128Key= */ null);
   }
 
   /**

package/test/media/streaming_engine_unit.js

@@ -109,10 +109,10 @@ describe('StreamingEngine', () => {
   /**
    * @param {boolean=} trickMode
    * @param {number=} mediaOffset The offset from 0 for the segment start times
-   * @param {shaka.extern.HlsAes128Key=} hlsAes128Key The AES-128 key to put in
+   * @param {shaka.extern.aes128Key=} aes128Key The AES-128 key to put in
    *   the manifest, if one should exist
    */
-  function setupVod(trickMode, mediaOffset, hlsAes128Key) {
+  function setupVod(trickMode, mediaOffset, aes128Key) {
     // For VOD, we fake a presentation that has 2 Periods of equal duration
     // (20 seconds), where each Period has 1 Variant and 1 text stream.
     //
@@ -219,7 +219,7 @@ describe('StreamingEngine', () => {
         /* firstPeriodStartTime= */ 0,
         /* secondPeriodStartTime= */ 20,
         /* presentationDuration= */ 40,
-        hlsAes128Key);
+        aes128Key);
   }
 
   function setupLive() {
@@ -370,11 +370,11 @@ describe('StreamingEngine', () => {
    * @param {number} firstPeriodStartTime
    * @param {number} secondPeriodStartTime
    * @param {number} presentationDuration
-   * @param {shaka.extern.HlsAes128Key=} hlsAes128Key
+   * @param {shaka.extern.aes128Key=} aes128Key
    */
   function setupManifest(
       firstPeriodStartTime, secondPeriodStartTime, presentationDuration,
-      hlsAes128Key) {
+      aes128Key) {
     const segmentDurations = {
       audio: segmentData[ContentType.AUDIO].segmentDuration,
       video: segmentData[ContentType.VIDEO].segmentDuration,
@@ -397,7 +397,7 @@ describe('StreamingEngine', () => {
         /** @type {!shaka.media.PresentationTimeline} */(timeline),
         [firstPeriodStartTime, secondPeriodStartTime],
         presentationDuration, segmentDurations, initSegmentRanges,
-        timestampOffsets, hlsAes128Key);
+        timestampOffsets, aes128Key);
 
     audioStream = manifest.variants[0].audio;
     videoStream = manifest.variants[0].video;
@@ -3809,8 +3809,8 @@ describe('StreamingEngine', () => {
 
   describe('AES-128', () => {
     let key;
-    /** @type {!shaka.extern.HlsAes128Key} */
-    let hlsAes128Key;
+    /** @type {!shaka.extern.aes128Key} */
+    let aes128Key;
 
     beforeEach(async () => {
       // Get a key.
@@ -3823,10 +3823,10 @@ describe('StreamingEngine', () => {
       // Set up a manifest with AES-128 key info.
       // We don't actually provide the imported key OR the key fetching function
       // here, though, so that the individual tests can choose what the starting
-      // state of the hlsAes128Key object is.
-      hlsAes128Key = {method: 'AES-128', firstMediaSequenceNumber: 0};
+      // state of the aes128Key object is.
+      aes128Key = {method: 'AES-128', firstMediaSequenceNumber: 0};
 
-      setupVod(false, 0, hlsAes128Key);
+      setupVod(false, 0, aes128Key);
       mediaSourceEngine = new shaka.test.FakeMediaSourceEngine(segmentData);
       presentationTimeInSeconds = 0;
       createStreamingEngine();
@@ -3851,22 +3851,22 @@ describe('StreamingEngine', () => {
     }
 
     it('decrypts segments', async () => {
-      hlsAes128Key.cryptoKey = key;
+      aes128Key.cryptoKey = key;
       await runTest();
     });
 
     it('downloads key if not pre-filled', async () => {
-      hlsAes128Key.fetchKey = () => {
-        hlsAes128Key.cryptoKey = key;
-        hlsAes128Key.fetchKey = undefined;
+      aes128Key.fetchKey = () => {
+        aes128Key.cryptoKey = key;
+        aes128Key.fetchKey = undefined;
         return Promise.resolve();
       };
 
       await runTest();
 
       // The key should have been fetched.
-      expect(hlsAes128Key.cryptoKey).not.toBeUndefined();
-      expect(hlsAes128Key.fetchKey).toBeUndefined();
+      expect(aes128Key.cryptoKey).not.toBeUndefined();
+      expect(aes128Key.fetchKey).toBeUndefined();
     });
   });
 

package/test/mss/mss_parser_unit.js

@@ -79,6 +79,8 @@ describe('MssParser Manifest', () => {
       enableLowLatencyMode: () => {},
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
+      onManifestUpdated: () => {},
+      getBandwidthEstimate: () => 1e6,
     };
   });
 

package/test/mss/mss_player_integration.js

@@ -38,8 +38,9 @@ describe('MSS Player', () => {
         await shaka.test.Loader.loadShaka(getClientArg('uncompiled'));
   });
 
-  beforeEach(() => {
-    player = new compiledShaka.Player(video);
+  beforeEach(async () => {
+    player = new compiledShaka.Player();
+    await player.attach(video);
 
     // Make sure we are playing the lowest res available to avoid test flake
     // based on network issues.  Note that disabling ABR and setting a low

package/test/net/networking_engine_unit.js

@@ -1166,14 +1166,14 @@ describe('NetworkingEngine', /** @suppress {accessControls} */ () => {
           requestType, createRequest('resolve://'));
       await Util.shortDelay();  // Allow Promises to resolve.
       expect(onProgress).toHaveBeenCalledTimes(2);
-      expect(onProgress).toHaveBeenCalledWith(1, 2);
-      expect(onProgress).toHaveBeenCalledWith(4, 5);
+      expect(onProgress).toHaveBeenCalledWith(1, 2, true);
+      expect(onProgress).toHaveBeenCalledWith(4, 5, true);
       onProgress.calls.reset();
 
       delay.resolve();
       await resp.promise;
       expect(onProgress).toHaveBeenCalledTimes(1);
-      expect(onProgress).toHaveBeenCalledWith(7, 8);
+      expect(onProgress).toHaveBeenCalledWith(7, 8, true);
     });
 
     it('doesn\'t forward progress events for non-SEGMENT', async () => {

package/test/{media/manifest_parser_unit.js → net/networking_utils_unit.js}

@@ -7,13 +7,13 @@
 const testGetMimeType = async (expertedMimeType, contentType) => {
   const netEngine = new shaka.test.FakeNetworkingEngine()
       .setHeaders('dummy://foo', {'content-type': contentType});
-  const mimeType = await shaka.media.ManifestParser
+  const mimeType = await shaka.net.NetworkingUtils
       .getMimeType('dummy://foo', netEngine,
           shaka.net.NetworkingEngine.defaultRetryParameters());
   expect(mimeType).toBe(expertedMimeType);
 };
 
-describe('ManifestParser', () => {
+describe('NetworkingUtils', () => {
   describe('getMimeType', () => {
     it('test correct mimeType', () => {
       testGetMimeType('application/dash+xml', 'application/dash+xml');

package/test/offline/manifest_convert_unit.js

@@ -298,6 +298,7 @@ describe('ManifestConverter', () => {
     const streamDB = {
       id,
       originalId: id.toString(),
+      groupId: null,
       primary: false,
       type,
       mimeType: '',
@@ -318,6 +319,7 @@ describe('ManifestConverter', () => {
       spatialAudio: false,
       closedCaptions: null,
       external: false,
+      fastSwitching: false,
     };
 
     return streamDB;
@@ -355,6 +357,7 @@ describe('ManifestConverter', () => {
     return {
       id,
       originalId: id.toString(),
+      groupId: null,
       primary: false,
       type: ContentType.VIDEO,
       mimeType: 'video/mp4',
@@ -362,6 +365,7 @@ describe('ManifestConverter', () => {
       frameRate: 22,
       pixelAspectRatio: '59:54',
       hdr: undefined,
+      videoLayout: undefined,
       kind: undefined,
       language: '',
       originalLanguage: null,
@@ -394,6 +398,7 @@ describe('ManifestConverter', () => {
       tilesLayout: undefined,
       accessibilityPurpose: null,
       external: false,
+      fastSwitching: false,
     };
   }
 
@@ -407,6 +412,7 @@ describe('ManifestConverter', () => {
     return {
       id,
       originalId: id.toString(),
+      groupId: null,
       primary: false,
       type: ContentType.AUDIO,
       mimeType: 'audio/mp4',
@@ -414,6 +420,7 @@ describe('ManifestConverter', () => {
       frameRate: undefined,
       pixelAspectRatio: undefined,
       hdr: undefined,
+      videoLayout: undefined,
       kind: undefined,
       language: 'en',
       originalLanguage: 'en',
@@ -446,6 +453,7 @@ describe('ManifestConverter', () => {
       tilesLayout: undefined,
       accessibilityPurpose: null,
       external: false,
+      fastSwitching: false,
     };
   }
 
@@ -458,6 +466,7 @@ describe('ManifestConverter', () => {
     return {
       id,
       originalId: id.toString(),
+      groupId: null,
       primary: false,
       type: ContentType.TEXT,
       mimeType: 'text/vtt',
@@ -465,6 +474,7 @@ describe('ManifestConverter', () => {
       frameRate: undefined,
       pixelAspectRatio: undefined,
       hdr: undefined,
+      videoLayout: undefined,
       kind: undefined,
       language: 'en',
       originalLanguage: 'en',
@@ -497,6 +507,7 @@ describe('ManifestConverter', () => {
       tilesLayout: undefined,
       accessibilityPurpose: null,
       external: false,
+      fastSwitching: false,
     };
   }
 
@@ -516,6 +527,7 @@ describe('ManifestConverter', () => {
     const expectedStream = {
       id: jasmine.any(Number),
       originalId: jasmine.any(String),
+      groupId: streamDb.groupId,
       createSegmentIndex: jasmine.any(Function),
       segmentIndex: jasmine.any(shaka.media.SegmentIndex),
       mimeType: streamDb.mimeType,
@@ -523,6 +535,7 @@ describe('ManifestConverter', () => {
       frameRate: streamDb.frameRate,
       pixelAspectRatio: streamDb.pixelAspectRatio,
       hdr: streamDb.hdr,
+      videoLayout: streamDb.videoLayout,
       width: streamDb.width || undefined,
       height: streamDb.height || undefined,
       kind: streamDb.kind,
@@ -545,6 +558,7 @@ describe('ManifestConverter', () => {
       tilesLayout: streamDb.tilesLayout,
       accessibilityPurpose: null,
       external: streamDb.external,
+      fastSwitching: streamDb.fastSwitching,
     };
 
     expect(stream).toEqual(expectedStream);

package/test/offline/offline_integration.js

@@ -30,7 +30,8 @@ filterDescribe('Offline', supportsStorage, () => {
   });
 
   beforeEach(async () => {
-    player = new shaka.Player(video);
+    player = new shaka.Player();
+    await player.attach(video);
     player.addEventListener('error', fail);
 
     // Disable stall detection, which can interfere with playback tests.

package/test/offline/storage_integration.js

@@ -269,7 +269,7 @@ filterDescribe('Storage', storageSupport, () => {
       ];
 
       const selected =
-          PlayerConfiguration.defaultTrackSelect(tracks, englishUS);
+          PlayerConfiguration.defaultTrackSelect(tracks, englishUS, 'SDR');
       expect(selected).toBeTruthy();
       expect(selected.length).toBe(1);
       expect(selected[0]).toBeTruthy();
@@ -285,7 +285,7 @@ filterDescribe('Storage', storageSupport, () => {
       ];
 
       const selected =
-          PlayerConfiguration.defaultTrackSelect(tracks, englishUS);
+          PlayerConfiguration.defaultTrackSelect(tracks, englishUS, 'SDR');
       expect(selected).toBeTruthy();
       expect(selected.length).toBe(2);
       for (const track of tracks) {
@@ -302,7 +302,7 @@ filterDescribe('Storage', storageSupport, () => {
         ];
 
         const selected =
-            PlayerConfiguration.defaultTrackSelect(tracks, 'eng-us');
+            PlayerConfiguration.defaultTrackSelect(tracks, 'eng-us', 'SDR');
         expect(selected).toBeTruthy();
         expect(selected.length).toBe(1);
         expect(selected[0]).toBeTruthy();
@@ -317,7 +317,8 @@ filterDescribe('Storage', storageSupport, () => {
           variantTrack(3, 480, 'eng', kbps(1)),
         ];
 
-        const selected = PlayerConfiguration.defaultTrackSelect(tracks, 'eng');
+        const selected =
+            PlayerConfiguration.defaultTrackSelect(tracks, 'eng', 'SDR');
         expect(selected).toBeTruthy();
         expect(selected.length).toBe(1);
         expect(selected[0]).toBeTruthy();
@@ -331,7 +332,8 @@ filterDescribe('Storage', storageSupport, () => {
           variantTrack(2, 480, 'eng-ca', kbps(1)),
         ];
 
-        const selected = PlayerConfiguration.defaultTrackSelect(tracks, 'fr');
+        const selected =
+            PlayerConfiguration.defaultTrackSelect(tracks, 'fr', 'SDR');
         expect(selected).toBeTruthy();
         expect(selected.length).toBe(1);
         expect(selected[0]).toBeTruthy();
@@ -346,7 +348,7 @@ filterDescribe('Storage', storageSupport, () => {
         ];
 
         const selected =
-            PlayerConfiguration.defaultTrackSelect(tracks, 'fr-uk');
+            PlayerConfiguration.defaultTrackSelect(tracks, 'fr-uk', 'SDR');
         expect(selected).toBeTruthy();
         expect(selected.length).toBe(1);
         expect(selected[0]).toBeTruthy();
@@ -362,7 +364,8 @@ filterDescribe('Storage', storageSupport, () => {
 
         tracks[0].primary = true;
 
-        const selected = PlayerConfiguration.defaultTrackSelect(tracks, 'de');
+        const selected =
+            PlayerConfiguration.defaultTrackSelect(tracks, 'de', 'SDR');
         expect(selected).toBeTruthy();
         expect(selected.length).toBe(1);
         expect(selected[0]).toBeTruthy();
@@ -736,15 +739,16 @@ filterDescribe('Storage', storageSupport, () => {
     const videoElement = /** @type {!HTMLVideoElement} */(
       document.createElement('video'));
 
-    beforeEach(() => {
+    beforeEach(async () => {
       netEngine = makeNetworkEngine();
 
       // Use a real Player since Storage only uses the configuration and
       // networking engine.  This allows us to use Player.configure in these
       // tests.
-      player = new shaka.Player(videoElement, ((player) => {
+      player = new shaka.Player(null, ((player) => {
         player.createNetworkingEngine = () => netEngine;
       }));
+      await player.attach(videoElement);
 
       storage = new shaka.offline.Storage(player);
 
@@ -1382,6 +1386,7 @@ filterDescribe('Storage', storageSupport, () => {
       frameRate: 30,
       pixelAspectRatio: '59:54',
       hdr: null,
+      videoLayout: null,
       mimeType: 'video/mp4,audio/mp4',
       audioMimeType: 'audio/mp4',
       videoMimeType: 'video/mp4',
@@ -1428,6 +1433,7 @@ filterDescribe('Storage', storageSupport, () => {
       frameRate: null,
       pixelAspectRatio: null,
       hdr: null,
+      videoLayout: null,
       mimeType: 'text/vtt',
       audioMimeType: null,
       videoMimeType: null,
@@ -1530,10 +1536,7 @@ filterDescribe('Storage', storageSupport, () => {
       manifest.addVariant(3, (variant) => {
         variant.language = frenchCanadian;
         variant.bandwidth = kbps(13);
-        variant.addVideo(4, (stream) => {
-          stream.bandwidth = kbps(10);
-          stream.size(100, 200);
-        });
+        variant.addExistingStream(1);
         variant.addAudio(5, (stream) => {
           stream.language = frenchCanadian;
           stream.bandwidth = kbps(3);
@@ -1745,6 +1748,12 @@ filterDescribe('Storage', storageSupport, () => {
 
     /** @override */
     onExpirationUpdated(session, number) {}
+
+    /** @override */
+    onInitialVariantChosen(variant) {}
+
+    /** @override */
+    banLocation(uri) {}
   };
 
   /**

package/test/player_external.js

@@ -33,8 +33,9 @@ describe('Player', () => {
     support = await compiledShaka.Player.probeSupport();
   });
 
-  beforeEach(() => {
-    player = new compiledShaka.Player(video);
+  beforeEach(async () => {
+    player = new compiledShaka.Player();
+    await player.attach(video);
 
     // Make sure we are playing the lowest res available to avoid test flake
     // based on network issues.  Note that disabling ABR and setting a low
@@ -68,6 +69,7 @@ describe('Player', () => {
     eventManager.release();
 
     await player.destroy();
+    player.releaseAllMutexes();
   });
 
   afterAll(() => {

package/test/player_integration.js

@@ -32,7 +32,8 @@ describe('Player', () => {
 
   beforeEach(async () => {
     await shaka.test.TestScheme.createManifests(compiledShaka, '_compiled');
-    player = new compiledShaka.Player(video);
+    player = new compiledShaka.Player();
+    await player.attach(video);
 
     // Disable stall detection, which can interfere with playback tests.
     player.configure('streaming.stallEnabled', false);
@@ -53,6 +54,7 @@ describe('Player', () => {
     eventManager.release();
 
     await player.destroy();
+    player.releaseAllMutexes();
   });
 
   afterAll(() => {
@@ -83,7 +85,8 @@ describe('Player', () => {
 
       // Unlike the other tests in this file, this uses an uncompiled build of
       // Shaka, so that we don't need to expose shaka.util.Timer.activeTimers.
-      player = new shaka.Player(video);
+      player = new shaka.Player();
+      await player.attach(video);
 
       // Disable stall detection, which can interfere with playback tests.
       player.configure('streaming.stallEnabled', false);
@@ -672,7 +675,8 @@ describe('Player', () => {
       // uncompiled version.  Then we will get assertions.
       eventManager.unlisten(player, 'error');
       await player.destroy();
-      player = new shaka.Player(video);  // NOTE: MUST BE UNCOMPILED
+      player = new shaka.Player();  // NOTE: MUST BE UNCOMPILED
+      await player.attach(video);
       player.configure({abr: {enabled: false}});
       eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
 
@@ -707,7 +711,8 @@ describe('Player', () => {
       // uncompiled version.  Then we will get assertions.
       eventManager.unlisten(player, 'error');
       await player.destroy();
-      player = new shaka.Player(video);  // NOTE: MUST BE UNCOMPILED
+      player = new shaka.Player();  // NOTE: MUST BE UNCOMPILED
+      await player.attach(video);
       player.configure({abr: {enabled: false}});
       eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
 
@@ -1332,6 +1337,9 @@ describe('Player', () => {
           expect(thumbnail3.positionX).toBe(160);
           expect(thumbnail3.positionY).toBe(90);
           expect(thumbnail3.width).toBe(160);
+
+          const thumbnails = await player.getAllThumbnails(newTrack.id);
+          expect(thumbnails.length).toBe(3);
         });
 
     it('appends thumbnails for external thumbnails without sprites',
@@ -1355,6 +1363,9 @@ describe('Player', () => {
           const thumbnail3 = await player.getThumbnails(newTrack.id, 40);
           expect(thumbnail3.startTime).toBe(30);
           expect(thumbnail3.duration).toBe(30);
+
+          const thumbnails = await player.getAllThumbnails(newTrack.id);
+          expect(thumbnails.length).toBe(3);
         });
   });  // describe('addThumbnailsTrack')
 });