shaka-player 3.1.5 → 3.1.8

package/test/media/adaptation_set_criteria_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.PreferenceBasedCriteria');
-goog.require('shaka.test.ManifestGenerator');
-goog.requireType('shaka.media.AdaptationSet');
-
 describe('AdaptationSetCriteria', () => {
   describe('preference based selection', () => {
     it('chooses variants in user\'s preferred language', () => {
@@ -84,7 +80,7 @@ describe('AdaptationSetCriteria', () => {
     });
 
     it('chooses only one role, even if none is preferred', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/949
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/949
       const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(1, (variant) => {
           variant.language = 'en';
@@ -136,7 +132,7 @@ describe('AdaptationSetCriteria', () => {
     });
 
     it('chooses only one role, even if all are primary', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/949
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/949
       const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(1, (variant) => {
           variant.language = 'en';
@@ -194,7 +190,7 @@ describe('AdaptationSetCriteria', () => {
     });
 
     it('chooses only one language, even if all are primary', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/918
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/918
       const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(1, (variant) => {
           variant.language = 'en';

package/test/media/adaptation_set_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.AdaptationSet');
-
 describe('AdaptationSet', () => {
   describe('roles', () => {
     const mimeType = 'mime-type';

package/test/media/buffering_observer_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.BufferingObserver');
-goog.require('shaka.util.Iterables');
-
 describe('BufferingObserver', () => {
   const BufferingObserver = shaka.media.BufferingObserver;
   const State = shaka.media.BufferingObserver.State;
@@ -115,7 +112,7 @@ describe('BufferingObserver', () => {
       /** @type {boolean} */
       let changed;
 
-      for (const lead of shaka.util.Iterables.range(5)) {
+      for (let lead = 0; lead < 5; lead++) {
         changed = controller.update(lead, /* toEnd= */ false);
         expect(changed).toBeFalsy();
       }

package/test/media/closed_caption_parser_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.ClosedCaptionParser');
-goog.require('shaka.test.Util');
-
 describe('ClosedCaptionParser', () => {
   it('can handle empty caption packets', async () => {
     const initSegment = await shaka.test.Util.fetch(

package/test/media/drm_engine_integration.js

@@ -4,21 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.DrmEngine');
-goog.require('shaka.media.MediaSourceEngine');
-goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.test.FakeClosedCaptionParser');
-goog.require('shaka.test.FakeTextDisplayer');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.util.EventManager');
-goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.Platform');
-goog.require('shaka.util.PlayerConfiguration');
-goog.require('shaka.util.PublicPromise');
-
 describe('DrmEngine', () => {
   const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
@@ -277,11 +262,12 @@ describe('DrmEngine', () => {
       video.play();
 
       const waiter = new shaka.test.Waiter(eventManager).timeoutAfter(15);
+      waiter.setMediaSourceEngine(mediaSourceEngine);
       await waiter.waitForMovement(video);
 
       // Something should have played by now.
       expect(video.readyState).toBeGreaterThan(1);
       expect(video.currentTime).toBeGreaterThan(0);
-    });
-  }  // describe('basic flow')
+    });  // describe('basic flow')
+  }
 });

package/test/media/drm_engine_unit.js

@@ -4,25 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.log');
-goog.require('shaka.media.DrmEngine');
-goog.require('shaka.media.Transmuxer');
-goog.require('shaka.net.DataUriPlugin');
-goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.test.FakeNetworkingEngine');
-goog.require('shaka.test.FakeVideo');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.AbortableOperation');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.Platform');
-goog.require('shaka.util.PlayerConfiguration');
-goog.require('shaka.util.Platform');
-goog.require('shaka.util.PublicPromise');
-goog.require('shaka.util.StringUtils');
-goog.require('shaka.util.Uint8ArrayUtils');
-
 for (const useMediaCapabilities of [true, false]) {
   const isEnabled = useMediaCapabilities ? 'enabled' : 'disabled';
   describe('DrmEngine with MediaCapabilities ' + isEnabled, () => {
@@ -1054,7 +1035,7 @@ function testDrmEngine(useMediaCapabilities) {
           .toHaveBeenCalledWith('cenc', initData1);
     });
 
-    // https://github.com/google/shaka-player/issues/2754
+    // https://github.com/shaka-project/shaka-player/issues/2754
     it('ignores duplicate init data from newInitData', async () => {
       /** @type {!Uint8Array} */
       const initData = new Uint8Array(1);
@@ -1440,7 +1421,7 @@ function testDrmEngine(useMediaCapabilities) {
         expect(onKeyStatusSpy).toHaveBeenCalled();
       });
 
-      // See https://github.com/google/shaka-player/issues/1541
+      // See https://github.com/shaka-project/shaka-player/issues/1541
       it('does not update public key statuses before callback', async () => {
         await initAndAttach();
 
@@ -1478,7 +1459,7 @@ function testDrmEngine(useMediaCapabilities) {
         expect(keyIds.length).toBe(2);
       });
 
-      // See https://github.com/google/shaka-player/issues/1541
+      // See https://github.com/shaka-project/shaka-player/issues/1541
       it('does not invoke callback until all sessions are loaded', async () => {
         // Set up init data overrides in the manifest so that we get multiple
         // sessions.
@@ -2113,7 +2094,7 @@ function testDrmEngine(useMediaCapabilities) {
       // this doesn't work if the session is not callable (no license request
       // sent).  So |session.closed| should never resolve and |session.close()|
       // should be rejected and destroy() should still succeed.
-      // https://github.com/google/shaka-player/issues/664
+      // https://github.com/shaka-project/shaka-player/issues/664
       await initAndAttach();
       session1.closed = new shaka.util.PublicPromise();
       session2.closed = new shaka.util.PublicPromise();

package/test/media/manifest_parser_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.ManifestParser');
-goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.test.FakeNetworkingEngine');
-
 const testGetMimeType = async (expertedMimeType, contentType) => {
   const netEngine = new shaka.test.FakeNetworkingEngine()
       .setHeaders('dummy://foo', {'content-type': contentType});

package/test/media/media_source_engine_integration.js

@@ -4,13 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.ClosedCaptionParser');
-goog.require('shaka.media.MediaSourceEngine');
-goog.require('shaka.test.FakeTextDisplayer');
-goog.require('shaka.test.TestScheme');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.util.ManifestParserUtils');
-
 describe('MediaSourceEngine', () => {
   const ContentType = shaka.util.ManifestParserUtils.ContentType;
   const presentationDuration = 840;

package/test/media/media_source_engine_unit.js

@@ -4,19 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-goog.require('goog.asserts');
-goog.require('shaka.media.MediaSourceEngine');
-goog.require('shaka.media.Transmuxer');
-goog.require('shaka.test.FakeClosedCaptionParser');
-goog.require('shaka.test.FakeTextDisplayer');
-goog.require('shaka.test.FakeTransmuxer');
-goog.require('shaka.test.StatusPromise');
-goog.require('shaka.test.Util');
-goog.require('shaka.text.TextEngine');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.ManifestParserUtils');
-
 /**
  * @typedef {{
  *   length: number,
@@ -1127,7 +1114,7 @@ describe('MediaSourceEngine', () => {
       expect(mockTextEngine.destroy).toHaveBeenCalled();
     });
 
-    // Regression test for https://github.com/google/shaka-player/issues/984
+    // Regression test for https://github.com/shaka-project/shaka-player/issues/984
     it('destroys TextDisplayer on destroy', async () => {
       await mediaSourceEngine.destroy();
       expect(mockTextDisplayer.destroySpy).toHaveBeenCalled();

package/test/media/mp4_segment_index_parser_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.Mp4SegmentIndexParser');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-
 describe('Mp4SegmentIndexParser', () => {
   const Util = shaka.test.Util;
 

package/test/media/play_rate_controller_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-goog.require('shaka.media.PlayRateController');
-goog.require('shaka.test.Util');
-
 describe('PlayRateController', () => {
   /** @type {!jasmine.Spy} */
   let getPlayRateSpy;

package/test/media/playhead_unit.js

@@ -4,14 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-goog.require('shaka.media.MediaSourcePlayhead');
-goog.require('shaka.test.FakePresentationTimeline');
-goog.require('shaka.test.FakeVideo');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.PlayerConfiguration');
-goog.requireType('shaka.media.Playhead');
-
 /**
  * @typedef {{start: number, end: number}}
  *
@@ -332,8 +324,8 @@ describe('Playhead', () => {
     });
 
     // This is important for recovering from drift.
-    // See: https://github.com/google/shaka-player/issues/1105
-    // TODO: Re-evaluate after https://github.com/google/shaka-player/issues/999
+    // See: https://github.com/shaka-project/shaka-player/issues/1105
+    // TODO: Re-evaluate after https://github.com/shaka-project/shaka-player/issues/999
     it('does not change once the initial position is set', () => {
       timeline.isLive.and.returnValue(true);
       timeline.getDuration.and.returnValue(Infinity);
@@ -781,9 +773,9 @@ describe('Playhead', () => {
   });  // clamps playhead even before seeking completes
 
   // Regression test for:
-  //  - https://github.com/google/shaka-player/pull/2849
-  //  - https://github.com/google/shaka-player/issues/2748
-  //  - https://github.com/google/shaka-player/issues/2848
+  //  - https://github.com/shaka-project/shaka-player/pull/2849
+  //  - https://github.com/shaka-project/shaka-player/issues/2748
+  //  - https://github.com/shaka-project/shaka-player/issues/2848
   it('does not apply seek range before initial seek has completed', () => {
     // These attributes allow the seek range callback to do its thing.
     video.readyState = HTMLMediaElement.HAVE_METADATA;
@@ -1236,7 +1228,7 @@ describe('Playhead', () => {
     it('works with rounding errors when seeking', () => {
       // If the browser sets the time to slightly before where we seek to, we
       // shouldn't get stuck in an infinite loop trying to jump the tiny gap.
-      // https://github.com/google/shaka-player/issues/1309
+      // https://github.com/shaka-project/shaka-player/issues/1309
       const buffered = [{start: 10, end: 20}];
       video.buffered = createFakeBuffered(buffered);
       video.readyState = HTMLMediaElement.HAVE_METADATA;
@@ -1295,7 +1287,7 @@ describe('Playhead', () => {
       expect(video.currentTime).toBe(5);
     });
 
-    // Regression test for https://github.com/google/shaka-player/issues/2987
+    // Regression test for https://github.com/shaka-project/shaka-player/issues/2987
     it('does gap jump if paused at 0 and has autoplay', () => {
       const buffered = [{start: 10, end: 20}];
       video.buffered = createFakeBuffered(buffered);
@@ -1320,7 +1312,7 @@ describe('Playhead', () => {
       expect(video.currentTime).toBe(10);
     });
 
-    // Regression test for https://github.com/google/shaka-player/issues/3451
+    // Regression test for https://github.com/shaka-project/shaka-player/issues/3451
     it('doesn\'t gap jump if paused at 0 and hasn\'t autoplay', () => {
       const buffered = [{start: 10, end: 20}];
       video.buffered = createFakeBuffered(buffered);

package/test/media/presentation_timeline_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.PresentationTimeline');
-goog.require('shaka.test.ManifestParser');
-
 describe('PresentationTimeline', () => {
   const originalDateNow = Date.now;
   const makeSegmentReference = (startTime, endTime) => {
@@ -183,7 +180,7 @@ describe('PresentationTimeline', () => {
 
       // In spite of the current time, the explicit segment times will decide
       // the availability window.
-      // See https://github.com/google/shaka-player/issues/999
+      // See https://github.com/shaka-project/shaka-player/issues/999
       setElapsed(1000);
       timeline.notifySegments([ref1, ref2, ref3, ref4, ref5]);
 
@@ -283,7 +280,7 @@ describe('PresentationTimeline', () => {
 
       // In spite of the current time, the explicit segment times will decide
       // the availability window.
-      // See https://github.com/google/shaka-player/issues/999
+      // See https://github.com/shaka-project/shaka-player/issues/999
       setElapsed(1000);
       timeline.notifySegments([ref1, ref2, ref3, ref4, ref5]);
 
@@ -396,12 +393,12 @@ describe('PresentationTimeline', () => {
       expect(timeline.getSafeSeekRangeStart(25)).toBe(5);
     });
 
-    // Regression test for https://github.com/google/shaka-player/issues/2831
+    // Regression test for https://github.com/shaka-project/shaka-player/issues/2831
     it('will round up to the nearest ms', () => {
       const timeline = makeVodTimeline(/* duration= */ 60);
       // Seeking to this exact number may result in seeking to slightly less
       // than that, due to rounding.
-      timeline.setUserSeekStart(1.458666666666666666666666);
+      timeline.setUserSeekStart(1.458666666666666);
       // So the safe range start should be slightly higher, with fewer digits.
       expect(timeline.getSafeSeekRangeStart(0)).toBe(1.459);
     });

package/test/media/region_observer_unit.js

@@ -4,17 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.RegionObserver');
-goog.require('shaka.media.RegionTimeline');
-goog.require('shaka.test.Util');
-goog.requireType('shaka.media.IPlayheadObserver');
-
 describe('RegionObserver', () => {
   /** @type {!shaka.media.RegionTimeline} */
   let timeline;
   /** @type {!shaka.media.RegionObserver} */
   let observer;
 
+  /** @type {!jasmine.Spy} */
+  let onSeekRange;
+
   /** @type {!jasmine.Spy} */
   let onEnterRegion;
   /** @type {!jasmine.Spy} */
@@ -23,18 +21,26 @@ describe('RegionObserver', () => {
   let onSkipRegion;
 
   beforeEach(() => {
+    onSeekRange = jasmine.createSpy('onSeekRange');
+    onSeekRange.and.returnValue({start: 0, end: 100});
+
     onEnterRegion = jasmine.createSpy('onEnterRegion');
     onExitRegion = jasmine.createSpy('onExitRegion');
     onSkipRegion = jasmine.createSpy('onSkipRegion');
 
     timeline = new shaka.media.RegionTimeline(
-        () => { return {start: 0, end: 100}; });
+        shaka.test.Util.spyFunc(onSeekRange));
 
     observer = new shaka.media.RegionObserver(timeline);
-    observer.setListeners(
-        /* onEnter= */ shaka.test.Util.spyFunc(onEnterRegion),
-        /* onExit= */ shaka.test.Util.spyFunc(onExitRegion),
-        /* onSkip= */ shaka.test.Util.spyFunc(onSkipRegion));
+    observer.addEventListener('enter', (event) => {
+      shaka.test.Util.spyFunc(onEnterRegion)(event['region'], event['seeking']);
+    });
+    observer.addEventListener('exit', (event) => {
+      shaka.test.Util.spyFunc(onExitRegion)(event['region'], event['seeking']);
+    });
+    observer.addEventListener('skip', (event) => {
+      shaka.test.Util.spyFunc(onSkipRegion)(event['region'], event['seeking']);
+    });
   });
 
   it('fires enter event when adding a region the playhead is in', () => {
@@ -313,6 +319,30 @@ describe('RegionObserver', () => {
     expect(onSkipRegion).not.toHaveBeenCalled();
   });
 
+  // See https://github.com/shaka-project/shaka-player/issues/3949
+  it('cleans up references to regions', async () => {
+    const region = createRegion('my-region', 0, 10);
+    timeline.addRegion(region);
+
+    // Poll so that RegionObserver will store regions.
+    poll(observer,
+        /* timeInSeconds= */ 5,
+        /* seeking= */ false);
+
+    // Hack to get a private member without the compiler complaining:
+    /** @type {Map} */
+    const regionMap = (/** @type {?} */(observer))['oldPosition_'];
+    expect(regionMap.size).not.toBe(0);
+
+    // Move the seek range so that the region will be removed.
+    onSeekRange.and.returnValue({start: 20, end: 100});
+    // Give the timeline time to filter regions
+    await shaka.test.Util.delay(
+        shaka.media.RegionTimeline.REGION_FILTER_INTERVAL * 2);
+
+    expect(regionMap.size).toBe(0);
+  });
+
   /**
    * @param {string} id
    * @param {number} startTimeSeconds

package/test/media/region_timeline_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.RegionTimeline');
-goog.require('shaka.test.Util');
-
 describe('RegionTimeline', () => {
   /** @type {!shaka.media.RegionTimeline} */
   let timeline;
@@ -14,18 +11,27 @@ describe('RegionTimeline', () => {
   /** @type {!jasmine.Spy} */
   let onNewRegion;
 
+  /** @type {!jasmine.Spy} */
+  let onRemoveRegion;
+
   /** @type {!jasmine.Spy} */
   let onSeekRange;
 
   beforeEach(() => {
-    onNewRegion = jasmine.createSpy('onNewRegion');
-
     onSeekRange = jasmine.createSpy('onSeekRange');
     onSeekRange.and.returnValue({start: 0, end: 100});
-
     timeline = new shaka.media.RegionTimeline(
         shaka.test.Util.spyFunc(onSeekRange));
-    timeline.setListeners(shaka.test.Util.spyFunc(onNewRegion));
+
+    onNewRegion = jasmine.createSpy('onNewRegion');
+    timeline.addEventListener('regionadd', (event) => {
+      shaka.test.Util.spyFunc(onNewRegion)(event['region']);
+    });
+
+    onRemoveRegion = jasmine.createSpy('onRemoveRegion');
+    timeline.addEventListener('regionremove', (event) => {
+      shaka.test.Util.spyFunc(onRemoveRegion)(event['region']);
+    });
   });
 
   afterEach(() => {
@@ -85,24 +91,33 @@ describe('RegionTimeline', () => {
     ]);
   });
 
-  it('filters out regions that end before the start of the seek range',
-      async () => {
-        onSeekRange.and.returnValue({start: 5, end: 100});
-        const region1 = createRegion('urn:foo', 'my-region', 0, 3);
-        const region2 = createRegion('urn:foo', 'my-region', 3, 10);
-        const region3 = createRegion('urn:foo', 'my-region', 5, 10);
-        timeline.addRegion(region1);
-        timeline.addRegion(region2);
-        timeline.addRegion(region3);
-        expect(onNewRegion).toHaveBeenCalledTimes(3);
-        let regions = Array.from(timeline.regions());
-        expect(regions.length).toBe(3);
-        // Give the timeline time to filter regions
-        await shaka.test.Util.delay(
-            shaka.media.RegionTimeline.REGION_FILTER_INTERVAL * 2);
-        regions = Array.from(timeline.regions());
-        expect(regions).toEqual([region2, region3]);
-      });
+  it('filters regions that end before the seek range', async () => {
+    onSeekRange.and.returnValue({start: 5, end: 100});
+
+    const region1 = createRegion('urn:foo', 'my-region', 0, 3);
+    const region2 = createRegion('urn:foo', 'my-region', 3, 10);
+    const region3 = createRegion('urn:foo', 'my-region', 5, 10);
+
+    timeline.addRegion(region1);
+    timeline.addRegion(region2);
+    timeline.addRegion(region3);
+    expect(onNewRegion).toHaveBeenCalledTimes(3);
+    expect(onNewRegion).toHaveBeenCalledWith(region1);
+    expect(onNewRegion).toHaveBeenCalledWith(region2);
+    expect(onNewRegion).toHaveBeenCalledWith(region3);
+
+    let regions = Array.from(timeline.regions());
+    expect(regions.length).toBe(3);
+
+    // Give the timeline time to filter regions
+    await shaka.test.Util.delay(
+        shaka.media.RegionTimeline.REGION_FILTER_INTERVAL * 2);
+
+    regions = Array.from(timeline.regions());
+    expect(regions).toEqual([region2, region3]);
+
+    expect(onRemoveRegion).toHaveBeenCalledWith(region1);
+  });
 
   /**
    * @param {string} schemeIdUri

package/test/media/segment_index_unit.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.media.MetaSegmentIndex');
-goog.require('shaka.media.SegmentIndex');
-goog.require('shaka.media.SegmentReference');
-goog.require('shaka.test.Util');
-
 describe('SegmentIndex', /** @suppress {accessControls} */ () => {
   const actual1 = makeReference(uri(0), 0, 10);
   const actual2 = makeReference(uri(20), 10, 20);

package/test/media/segment_reference_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.InitSegmentReference');
-goog.require('shaka.media.SegmentReference');
-
 describe('SegmentReference', () => {
   it('returns in getters values from constructor parameters', () => {
     const initSegmentReference = new shaka.media.InitSegmentReference(

package/test/media/stall_detector_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-goog.require('shaka.media.StallDetector');
-goog.require('shaka.media.StallDetector.Implementation');
-goog.require('shaka.test.Util');
-
 describe('StallDetector', () => {
   /**
    * @implements {shaka.media.StallDetector.Implementation}

package/test/media/streaming_engine_integration.js

@@ -4,31 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.InitSegmentReference');
-goog.require('shaka.media.MediaSourceEngine');
-goog.require('shaka.media.MediaSourcePlayhead');
-goog.require('shaka.media.SegmentIndex');
-goog.require('shaka.media.SegmentReference');
-goog.require('shaka.media.StreamingEngine');
-goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.test.FakeClosedCaptionParser');
-goog.require('shaka.test.FakeTextDisplayer');
-goog.require('shaka.test.Mp4LiveStreamGenerator');
-goog.require('shaka.test.Mp4VodStreamGenerator');
-goog.require('shaka.test.StreamingEngineUtil');
-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.ManifestParserUtils');
-goog.require('shaka.util.Platform');
-goog.require('shaka.util.PlayerConfiguration');
-goog.requireType('shaka.media.Playhead');
-goog.requireType('shaka.media.PresentationTimeline');
-goog.requireType('shaka.test.FakeNetworkingEngine');
-goog.requireType('shaka.test.FakePresentationTimeline');
-
 describe('StreamingEngine', () => {
   const ContentType = shaka.util.ManifestParserUtils.ContentType;
   const Util = shaka.test.Util;
@@ -94,6 +69,7 @@ describe('StreamingEngine', () => {
         video,
         new shaka.test.FakeClosedCaptionParser(),
         new shaka.test.FakeTextDisplayer());
+    waiter.setMediaSourceEngine(mediaSourceEngine);
   });
 
   afterEach(async () => {
@@ -286,7 +262,11 @@ describe('StreamingEngine', () => {
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
       video.play();
-      await waiter.timeoutAfter(90).waitForEnd(video);
+      // The overall test timeout is 120 seconds, and the content is 60
+      // seconds.  It should be possible to complete this test in 100 seconds,
+      // and if not, we want the error thrown to be within the overall test's
+      // timeout window.
+      await waiter.timeoutAfter(100).waitForEnd(video);
     });
 
     it('plays at high playback rates', async () => {
@@ -307,14 +287,7 @@ describe('StreamingEngine', () => {
       await waiter.timeoutAfter(10).waitForMovement(video);
       video.playbackRate = 10;
 
-      // Something weird happens on some platforms (variously Chromecast, legacy
-      // Edge, and Safari) where the playhead can go past duration.
-      // To cope with this, don't fail on timeout.  If the video never got
-      // flagged as "ended", check for the playhead to be near or past the end.
-      await waiter.timeoutAfter(30).failOnTimeout(false).waitForEnd(video);
-      if (!video.ended) {
-        expect(video.currentTime).toBeGreaterThan(video.duration - 0.1);
-      }
+      await waiter.timeoutAfter(30).waitForEnd(video);
     });
 
     it('can handle buffered seeks', async () => {
@@ -324,9 +297,9 @@ describe('StreamingEngine', () => {
       video.play();
 
       // After 35 seconds seek back 10 seconds into the first Period.
-      await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 35);
+      await waiter.timeoutAfter(80).waitUntilPlayheadReaches(video, 35);
       video.currentTime = 25;
-      await waiter.timeoutAfter(60).waitForEnd(video);
+      await waiter.timeoutAfter(80).waitForEnd(video);
     });
 
     it('can handle unbuffered seeks', async () => {