shaka-player 3.3.2 → 3.3.5

package/test/player_external.js

@@ -4,15 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('ShakaDemoAssetInfo');
-goog.require('shaka.test.Loader');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.util.EventManager');
-goog.requireType('shaka.Player');
-goog.requireType('shaka.net.NetworkingEngine.RequestType');
-
 describe('Player', () => {
   const Util = shaka.test.Util;
   const Feature = shakaAssets.Feature;
@@ -48,6 +39,7 @@ describe('Player', () => {
     // Grab event manager from the uncompiled library:
     eventManager = new shaka.util.EventManager();
     waiter = new shaka.test.Waiter(eventManager);
+    waiter.setPlayer(player);
 
     onErrorSpy = jasmine.createSpy('onError');
     onErrorSpy.and.callFake((event) => fail(event.detail));
@@ -117,7 +109,7 @@ describe('Player', () => {
 
         // Make sure we don't get stuck on gaps that only appear in some
         // browsers (Safari, Firefox).
-        // TODO(https://github.com/google/shaka-player/issues/1702):
+        // TODO(https://github.com/shaka-project/shaka-player/issues/1702):
         // Is this necessary because of a bug in Shaka Player?
         player.configure('streaming.jumpLargeGaps', true);
 
@@ -128,7 +120,13 @@ describe('Player', () => {
         const networkingEngine = player.getNetworkingEngine();
         asset.applyFilters(networkingEngine);
 
-        await player.load(asset.manifestUri);
+        // Rather than awaiting the load() method, catch any load() errors and
+        // wait on the 'canplay' event.  This has the advantage that we will
+        // get better logging of the media state on a timeout, since that
+        // capabilitiy is built into the waiter for media element events.
+        player.load(asset.manifestUri).catch(fail);
+        await waiter.timeoutAfter(60).waitForEvent(video, 'canplay');
+
         if (asset.features) {
           const isLive = asset.features.includes(Feature.LIVE);
           expect(player.isLive()).toBe(isLive);

package/test/player_integration.js

@@ -4,22 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.Uri');
-goog.require('shaka.Player');
-goog.require('shaka.log');
-goog.require('shaka.media.DrmEngine');
-goog.require('shaka.media.TimeRangesUtils');
-goog.require('shaka.test.FakeAbrManager');
-goog.require('shaka.test.FakeTextDisplayer');
-goog.require('shaka.test.Loader');
-goog.require('shaka.test.TestScheme');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.util.EventManager');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
-
 describe('Player', () => {
   /** @type {!jasmine.Spy} */
   let onErrorSpy;
@@ -53,6 +37,7 @@ describe('Player', () => {
     // Grab event manager from the uncompiled library:
     eventManager = new shaka.util.EventManager();
     waiter = new shaka.test.Waiter(eventManager);
+    waiter.setPlayer(player);
 
     onErrorSpy = jasmine.createSpy('onError');
     onErrorSpy.and.callFake((event) => {
@@ -299,7 +284,7 @@ describe('Player', () => {
       expect(variantTrack.language).toBe(textTrack.language);
     });
 
-    // Repro for https://github.com/google/shaka-player/issues/1879.
+    // Repro for https://github.com/shaka-project/shaka-player/issues/1879.
     it('appends cues when enabled initially', async () => {
       let cues = [];
       /** @const {!shaka.test.FakeTextDisplayer} */
@@ -356,7 +341,7 @@ describe('Player', () => {
       expect(cues.length).toBeGreaterThan(0);
     });
 
-    // https://github.com/google/shaka-player/issues/2553
+    // https://github.com/shaka-project/shaka-player/issues/2553
     it('does not change the selected track', async () => {
       player.configure('streaming.alwaysStreamText', false);
       await player.load('test:forced_subs_simulation_compiled');
@@ -482,7 +467,7 @@ describe('Player', () => {
       expect(configuredTextDisplayer).toBe(textDisplayer);
     });
 
-    // Regression test for https://github.com/google/shaka-player/issues/1187
+    // Regression test for https://github.com/shaka-project/shaka-player/issues/1187
     it('does not throw on destroy', async () => {
       await player.load('test:sintel_compiled');
       video.play();
@@ -513,7 +498,7 @@ describe('Player', () => {
     // and the track selection was ignored.  Because this bug involved
     // interactions between Player and StreamingEngine, it is an integration
     // test and not a unit test.
-    // https://github.com/google/shaka-player/issues/1119
+    // https://github.com/shaka-project/shaka-player/issues/1119
     it('allows early selection of specific tracks', async () => {
       /** @type {!jasmine.Spy} */
       const streamingListener = jasmine.createSpy('listener');
@@ -548,7 +533,7 @@ describe('Player', () => {
     // switchingPeriods_ in Player.  Because this bug involved interactions
     // between Player and StreamingEngine, it is an integration test and not a
     // unit test.
-    // https://github.com/google/shaka-player/issues/1119
+    // https://github.com/shaka-project/shaka-player/issues/1119
     it('allows selection of tracks in subsequent loads', async () => {
       /** @type {!jasmine.Spy} */
       const streamingListener = jasmine.createSpy('listener');
@@ -646,7 +631,9 @@ describe('Player', () => {
       eventManager.listen(video, 'waiting', checkOnEvent);
       eventManager.listen(player, 'trackschanged', checkOnEvent);
 
-      const waiter = (new shaka.test.Waiter(eventManager)).timeoutAfter(10);
+      const waiter = new shaka.test.Waiter(eventManager)
+          .setPlayer(player)
+          .timeoutAfter(10);
       const canPlayThrough = waiter.waitForEvent(video, 'canplaythrough');
 
       await player.load('test:sintel_compiled', 5);
@@ -720,6 +707,7 @@ describe('Player', () => {
       player.addEventListener('mediaqualitychanged',
           Util.spyFunc(onQualityChange));
       waiter = new shaka.test.Waiter(eventManager)
+          .setPlayer(player)
           .timeoutAfter(10)
           .failOnTimeout(true);
     });
@@ -777,7 +765,9 @@ describe('Player', () => {
       eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
       /** @type {shaka.test.Waiter} */
       const waiter = new shaka.test.Waiter(eventManager)
-          .timeoutAfter(20).failOnTimeout(true);
+          .setPlayer(player)
+          .timeoutAfter(20)
+          .failOnTimeout(true);
       await waiter.waitForEnd(video);
 
       // The stream should have transitioned to VOD by now.
@@ -785,7 +775,7 @@ describe('Player', () => {
 
       // Check that the final seek range is as expected.
       const seekRange = player.seekRange();
-      expect(seekRange.end).toBe(14);
+      expect(seekRange.end).toBeCloseTo(14);
     });
   });
 
@@ -802,6 +792,7 @@ describe('Player', () => {
       player.addEventListener('buffering', Util.spyFunc(onBuffering));
 
       waiter = new shaka.test.Waiter(eventManager)
+          .setPlayer(player)
           .timeoutAfter(10)
           .failOnTimeout(true);
     });
@@ -915,8 +906,7 @@ describe('Player', () => {
     }
 
     async function waitUntilBuffered(amount) {
-      for (const _ of shaka.util.Iterables.range(25)) {
-        shaka.util.Functional.ignored(_);
+      for (let i = 0; i < 25; i++) {
         // We buffer from an internal segment, so this shouldn't take long to
         // buffer.
         await Util.delay(0.1);  // eslint-disable-line no-await-in-loop
@@ -993,7 +983,9 @@ describe('Player', () => {
 
       /** @type {shaka.test.Waiter} */
       const waiter = new shaka.test.Waiter(eventManager)
-          .timeoutAfter(1).failOnTimeout(true);
+          .setPlayer(player)
+          .timeoutAfter(1)
+          .failOnTimeout(true);
 
       await waiter.waitForPromise(abrEnabled, 'AbrManager enabled');
 
@@ -1013,7 +1005,9 @@ describe('Player', () => {
 
       /** @type {shaka.test.Waiter} */
       const waiter = new shaka.test.Waiter(eventManager)
-          .timeoutAfter(1).failOnTimeout(true);
+          .setPlayer(player)
+          .timeoutAfter(1)
+          .failOnTimeout(true);
 
       await waiter.waitForPromise(abrEnabled, 'AbrManager enabled');
 
@@ -1059,16 +1053,16 @@ describe('Player', () => {
     });
   });  // describe('unloading')
 
-  describe('chapters', () => {
-    it('add external chapters in vtt format', async () => {
+  describe('addChaptersTrack', () => {
+    it('adds external chapters in vtt format', async () => {
       await player.load('test:sintel_no_text_compiled');
       const locationUri = new goog.Uri(location.href);
       const partialUri1 = new goog.Uri('/base/test/test/assets/chapters.vtt');
       const absoluteUri1 = locationUri.resolve(partialUri1);
       await player.addChaptersTrack(absoluteUri1.toString(), 'en');
 
-      await shaka.test.Util.delay(1.5);
-
+      // Data should be available as soon as addChaptersTrack resolves.
+      // See https://github.com/shaka-project/shaka-player/issues/4186
       const chapters = player.getChapters('en');
       expect(chapters.length).toBe(3);
       const chapter1 = chapters[0];
@@ -1088,8 +1082,6 @@ describe('Player', () => {
       const absoluteUri2 = locationUri.resolve(partialUri2);
       await player.addChaptersTrack(absoluteUri2.toString(), 'en');
 
-      await shaka.test.Util.delay(1.5);
-
       const chaptersUpdated = player.getChapters('en');
       expect(chaptersUpdated.length).toBe(6);
       const chapterUpdated1 = chaptersUpdated[0];
@@ -1118,15 +1110,13 @@ describe('Player', () => {
       expect(chapterUpdated6.endTime).toBe(61.349);
     });
 
-    it('add external chapters in srt format', async () => {
+    it('adds external chapters in srt format', async () => {
       await player.load('test:sintel_no_text_compiled');
       const locationUri = new goog.Uri(location.href);
       const partialUri = new goog.Uri('/base/test/test/assets/chapters.srt');
       const absoluteUri = locationUri.resolve(partialUri);
       await player.addChaptersTrack(absoluteUri.toString(), 'es');
 
-      await shaka.test.Util.delay(1.5);
-
       const chapters = player.getChapters('es');
       expect(chapters.length).toBe(3);
       const chapter1 = chapters[0];
@@ -1142,5 +1132,5 @@ describe('Player', () => {
       expect(chapter3.startTime).toBe(30);
       expect(chapter3.endTime).toBe(61.349);
     });
-  });  // describe('chapters')
+  });  // describe('addChaptersTrack')
 });

package/test/player_load_graph_integration.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.Player');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-
 describe('Player Load Graph', () => {
   const SMALL_MP4_CONTENT_URI = '/base/test/test/assets/small.mp4';
 
@@ -124,7 +119,7 @@ describe('Player Load Graph', () => {
 
   // There was a bug when calling unload before calling load would cause
   // the load to continue before the (first) unload was complete.
-  // https://github.com/google/shaka-player/issues/612
+  // https://github.com/shaka-project/shaka-player/issues/612
   it('load will wait for unload to finish', async () => {
     createPlayer(/* attachedTo= */ null);
 

package/test/player_src_equals_external.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.Player');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.util.EventManager');
-
 describe('Player Src Equals', () => {
   // This asset needs to be (1) long and (2) high bitrate so that we can
   // invoke unbuffered seeks.
@@ -88,7 +82,7 @@ describe('Player Src Equals', () => {
     expect(player.isBuffering()).toBeTruthy();
   });
 
-  // A regression test for https://github.com/google/shaka-player/issues/2523
+  // A regression test for https://github.com/shaka-project/shaka-player/issues/2523
   it('detects subtitles in native HLS', async () => {
     const supportsNativeHls =
         video.canPlayType('application/vnd.apple.mpegurl') != '';
@@ -103,8 +97,8 @@ describe('Player Src Equals', () => {
   });
 
   // A regression test for
-  // https://github.com/google/shaka-player/issues/2483#issuecomment-633412527
-  // and https://github.com/google/shaka-player/issues/2593
+  // https://github.com/shaka-project/shaka-player/issues/2483#issuecomment-633412527
+  // and https://github.com/shaka-project/shaka-player/issues/2593
   it('honors preferred audio and text languages', async () => {
     const supportsNativeHls =
         video.canPlayType('application/vnd.apple.mpegurl') != '';

package/test/player_src_equals_integration.js

@@ -4,13 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.Uri');
-goog.require('shaka.Player');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.util.EventManager');
-
 // These tests are for testing Shaka Player's integration with
 // |HTMLMediaElement.src=|. These tests are to verify that all |shaka.Player|
 // public methods behaviour correctly when playing content video |src=|.
@@ -326,90 +319,88 @@ describe('Player Src Equals', () => {
     expect(newTrack).toBeTruthy();
   });
 
-  it('add external chapters in vtt format', async () => {
-    await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
-
-    const locationUri = new goog.Uri(location.href);
-    const partialUri1 = new goog.Uri('/base/test/test/assets/chapters.vtt');
-    const absoluteUri1 = locationUri.resolve(partialUri1);
-    await player.addChaptersTrack(absoluteUri1.toString(), 'en');
-
-    await shaka.test.Util.delay(1.5);
-
-    const chapters = player.getChapters('en');
-    expect(chapters.length).toBe(3);
-    const chapter1 = chapters[0];
-    expect(chapter1.title).toBe('Chapter 1');
-    expect(chapter1.startTime).toBe(0);
-    expect(chapter1.endTime).toBe(5);
-    const chapter2 = chapters[1];
-    expect(chapter2.title).toBe('Chapter 2');
-    expect(chapter2.startTime).toBe(5);
-    expect(chapter2.endTime).toBe(10);
-    const chapter3 = chapters[2];
-    expect(chapter3.title).toBe('Chapter 3');
-    expect(chapter3.startTime).toBe(10);
-    expect(chapter3.endTime).toBe(20);
-
-    const partialUri2 = new goog.Uri('/base/test/test/assets/chapters2.vtt');
-    const absoluteUri2 = locationUri.resolve(partialUri2);
-    await player.addChaptersTrack(absoluteUri2.toString(), 'en');
-
-    await shaka.test.Util.delay(1.5);
-
-    const chaptersUpdated = player.getChapters('en');
-    expect(chaptersUpdated.length).toBe(6);
-    const chapterUpdated1 = chaptersUpdated[0];
-    expect(chapterUpdated1.title).toBe('Chapter 1');
-    expect(chapterUpdated1.startTime).toBe(0);
-    expect(chapterUpdated1.endTime).toBe(5);
-    const chapterUpdated2 = chaptersUpdated[1];
-    expect(chapterUpdated2.title).toBe('Chapter 2');
-    expect(chapterUpdated2.startTime).toBe(5);
-    expect(chapterUpdated2.endTime).toBe(10);
-    const chapterUpdated3 = chaptersUpdated[2];
-    expect(chapterUpdated3.title).toBe('Chapter 3');
-    expect(chapterUpdated3.startTime).toBe(10);
-    expect(chapterUpdated3.endTime).toBe(20);
-    const chapterUpdated4 = chaptersUpdated[3];
-    expect(chapterUpdated4.title).toBe('Chapter 4');
-    expect(chapterUpdated4.startTime).toBe(20);
-    expect(chapterUpdated4.endTime).toBe(30);
-    const chapterUpdated5 = chaptersUpdated[4];
-    expect(chapterUpdated5.title).toBe('Chapter 5');
-    expect(chapterUpdated5.startTime).toBe(30);
-    expect(chapterUpdated5.endTime).toBe(40);
-    const chapterUpdated6 = chaptersUpdated[5];
-    expect(chapterUpdated6.title).toBe('Chapter 6');
-    expect(chapterUpdated6.startTime).toBe(40);
-    expect(chapterUpdated6.endTime).toBe(61.349);
-  });
-
-  it('add external chapters in srt format', async () => {
-    await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
-
-    const locationUri = new goog.Uri(location.href);
-    const partialUri = new goog.Uri('/base/test/test/assets/chapters.srt');
-    const absoluteUri = locationUri.resolve(partialUri);
-    await player.addChaptersTrack(absoluteUri.toString(), 'es');
-
-    await shaka.test.Util.delay(1.5);
+  describe('addChaptersTrack', () => {
+    it('adds external chapters in vtt format', async () => {
+      await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
+
+      const locationUri = new goog.Uri(location.href);
+      const partialUri1 = new goog.Uri('/base/test/test/assets/chapters.vtt');
+      const absoluteUri1 = locationUri.resolve(partialUri1);
+      await player.addChaptersTrack(absoluteUri1.toString(), 'en');
+
+      // Data should be available as soon as addChaptersTrack resolves.
+      // See https://github.com/shaka-project/shaka-player/issues/4186
+      const chapters = player.getChapters('en');
+      expect(chapters.length).toBe(3);
+      const chapter1 = chapters[0];
+      expect(chapter1.title).toBe('Chapter 1');
+      expect(chapter1.startTime).toBe(0);
+      expect(chapter1.endTime).toBe(5);
+      const chapter2 = chapters[1];
+      expect(chapter2.title).toBe('Chapter 2');
+      expect(chapter2.startTime).toBe(5);
+      expect(chapter2.endTime).toBe(10);
+      const chapter3 = chapters[2];
+      expect(chapter3.title).toBe('Chapter 3');
+      expect(chapter3.startTime).toBe(10);
+      expect(chapter3.endTime).toBe(20);
+
+      const partialUri2 = new goog.Uri('/base/test/test/assets/chapters2.vtt');
+      const absoluteUri2 = locationUri.resolve(partialUri2);
+      await player.addChaptersTrack(absoluteUri2.toString(), 'en');
+
+      const chaptersUpdated = player.getChapters('en');
+      expect(chaptersUpdated.length).toBe(6);
+      const chapterUpdated1 = chaptersUpdated[0];
+      expect(chapterUpdated1.title).toBe('Chapter 1');
+      expect(chapterUpdated1.startTime).toBe(0);
+      expect(chapterUpdated1.endTime).toBe(5);
+      const chapterUpdated2 = chaptersUpdated[1];
+      expect(chapterUpdated2.title).toBe('Chapter 2');
+      expect(chapterUpdated2.startTime).toBe(5);
+      expect(chapterUpdated2.endTime).toBe(10);
+      const chapterUpdated3 = chaptersUpdated[2];
+      expect(chapterUpdated3.title).toBe('Chapter 3');
+      expect(chapterUpdated3.startTime).toBe(10);
+      expect(chapterUpdated3.endTime).toBe(20);
+      const chapterUpdated4 = chaptersUpdated[3];
+      expect(chapterUpdated4.title).toBe('Chapter 4');
+      expect(chapterUpdated4.startTime).toBe(20);
+      expect(chapterUpdated4.endTime).toBe(30);
+      const chapterUpdated5 = chaptersUpdated[4];
+      expect(chapterUpdated5.title).toBe('Chapter 5');
+      expect(chapterUpdated5.startTime).toBe(30);
+      expect(chapterUpdated5.endTime).toBe(40);
+      const chapterUpdated6 = chaptersUpdated[5];
+      expect(chapterUpdated6.title).toBe('Chapter 6');
+      expect(chapterUpdated6.startTime).toBe(40);
+      expect(chapterUpdated6.endTime).toBe(61.349);
+    });
 
-    const chapters = player.getChapters('es');
-    expect(chapters.length).toBe(3);
-    const chapter1 = chapters[0];
-    expect(chapter1.title).toBe('Chapter 1');
-    expect(chapter1.startTime).toBe(0);
-    expect(chapter1.endTime).toBe(5);
-    const chapter2 = chapters[1];
-    expect(chapter2.title).toBe('Chapter 2');
-    expect(chapter2.startTime).toBe(5);
-    expect(chapter2.endTime).toBe(30);
-    const chapter3 = chapters[2];
-    expect(chapter3.title).toBe('Chapter 3');
-    expect(chapter3.startTime).toBe(30);
-    expect(chapter3.endTime).toBe(61.349);
-  });
+    it('add external chapters in srt format', async () => {
+      await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
+
+      const locationUri = new goog.Uri(location.href);
+      const partialUri = new goog.Uri('/base/test/test/assets/chapters.srt');
+      const absoluteUri = locationUri.resolve(partialUri);
+      await player.addChaptersTrack(absoluteUri.toString(), 'es');
+
+      const chapters = player.getChapters('es');
+      expect(chapters.length).toBe(3);
+      const chapter1 = chapters[0];
+      expect(chapter1.title).toBe('Chapter 1');
+      expect(chapter1.startTime).toBe(0);
+      expect(chapter1.endTime).toBe(5);
+      const chapter2 = chapters[1];
+      expect(chapter2.title).toBe('Chapter 2');
+      expect(chapter2.startTime).toBe(5);
+      expect(chapter2.endTime).toBe(30);
+      const chapter3 = chapters[2];
+      expect(chapter3.title).toBe('Chapter 3');
+      expect(chapter3.startTime).toBe(30);
+      expect(chapter3.endTime).toBe(61.349);
+    });
+  }); // describe('addChaptersTrack')
 
   // Since we are not in-charge of streaming, calling |retryStreaming| should
   // have no effect.