shaka-player 3.3.4 → 4.0.1

package/test/media/playhead_unit.js

@@ -21,16 +21,12 @@ let TimeRange;
  *   start: number,
  *   waitingAt: number,
  *   expectedEndTime: number,
- *   expectEvent: boolean,
- *   jumpLargeGaps: (boolean|undefined),
- *   preventDefault: (boolean|undefined)
  * }}
  *
  * @description
  * Parameters for a test where we start playing inside a buffered range and play
  * until the end of the buffer.  Then, if we expect it, Playhead should jump
- * to the expected time.  Also, if the gap is large, we should get a 'largegap'
- * event from the Playhead, which we may optionally suppress.
+ * to the expected time.
  *
  * @property {!Array.<TimeRange>} buffered
  *   The buffered ranges for the test.
@@ -40,12 +36,6 @@ let TimeRange;
  *   The time to pause at and fire a 'waiting' event.
  * @property {number} expectedEndTime
  *   The expected time at the end of the test.
- * @property {boolean} expectEvent
- *   If true, expect the 'largegap' event to be fired.
- * @property {(boolean|undefined)} jumpLargeGaps
- *   If given, set this field of the Playhead configuration.
- * @property {(boolean|undefined)} preventDefault
- *   If true, call preventDefault() on the 'largegap' event.
  */
 let PlayingTestInfo;
 
@@ -57,17 +47,12 @@ let PlayingTestInfo;
  *   start: number,
  *   seekTo: number,
  *   expectedEndTime: number,
- *   expectEvent: boolean,
- *   jumpLargeGaps: (boolean|undefined),
- *   preventDefault: (boolean|undefined)
  * }}
  *
  * @description
  * Parameters for a test where we start playing inside a buffered range and seek
  * to a given time, which may have different buffered ranges.  If we are in a
- * gap, Playhead should jump the gap to the expected time.  Also, if the gap is
- * large, we should get a 'largegap' event from the Playhead, which we may
- * optionally suppress.
+ * gap, Playhead should jump the gap to the expected time.
  *
  * @property {!Array.<TimeRange>} buffered
  *   The buffered ranges for the test.
@@ -80,12 +65,6 @@ let PlayingTestInfo;
  *   The time to seek to.
  * @property {number} expectedEndTime
  *   The expected time at the end of the test.
- * @property {boolean} expectEvent
- *   If true, expect the 'largegap' event to be fired.
- * @property {(boolean|undefined)} jumpLargeGaps
- *   If given, set this field of the Playhead configuration.
- * @property {(boolean|undefined)} preventDefault
- *   If true, call preventDefault() on the 'largegap' event.
  */
 let SeekTestInfo;
 
@@ -108,10 +87,6 @@ describe('Playhead', () => {
   /** @type {!jasmine.Spy} */
   let onSeek;
 
-  // Callback to us from Playhead when an event should be sent to the app.
-  /** @type {!jasmine.Spy} */
-  let onEvent;
-
   beforeAll(() => {
     jasmine.clock().install();
   });
@@ -125,7 +100,6 @@ describe('Playhead', () => {
     timeline = new shaka.test.FakePresentationTimeline();
 
     onSeek = jasmine.createSpy('onSeek');
-    onEvent = jasmine.createSpy('onEvent');
 
     timeline.isLive.and.returnValue(false);
     timeline.getSeekRangeStart.and.returnValue(5);
@@ -144,6 +118,7 @@ describe('Playhead', () => {
       presentationTimeline: timeline,
       minBufferTime: 10,
       offlineSessionIds: [],
+      sequenceMode: false,
     };
 
     config = shaka.util.PlayerConfiguration.createDefault().streaming;
@@ -168,8 +143,7 @@ describe('Playhead', () => {
           manifest,
           config,
           /* startTime= */ 5,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       expect(video.currentTime).toBe(5);
       expect(playhead.getTime()).toBe(5);
@@ -189,8 +163,7 @@ describe('Playhead', () => {
           manifest,
           config,
           /* startTime= */ 5,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       expect(video.addEventListener).toHaveBeenCalledWith(
           'loadedmetadata', jasmine.any(Function), jasmine.anything());
@@ -230,8 +203,7 @@ describe('Playhead', () => {
           manifest,
           config,
           /* startTime= */ 5,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       video.on['seeking']();
       expect(playhead.getTime()).toBe(5);
@@ -249,8 +221,7 @@ describe('Playhead', () => {
       timeline.getSeekRangeEnd.and.returnValue(60);
 
       playhead = new shaka.media.MediaSourcePlayhead(
-          video, manifest, config, /* startTime= */ 0, Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          video, manifest, config, /* startTime= */ 0, Util.spyFunc(onSeek));
 
       expect(playhead.getTime()).toBe(0);
     });
@@ -263,8 +234,7 @@ describe('Playhead', () => {
       timeline.getDuration.and.returnValue(60);
 
       playhead = new shaka.media.MediaSourcePlayhead(
-          video, manifest, config, /* startTime= */ 60, Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          video, manifest, config, /* startTime= */ 60, Util.spyFunc(onSeek));
 
       expect(playhead.getTime()).toBe(59);  // duration - durationBackoff
       expect(video.currentTime).toBe(59);  // duration - durationBackoff
@@ -278,8 +248,7 @@ describe('Playhead', () => {
       timeline.getSeekRangeEnd.and.returnValue(60);
 
       playhead = new shaka.media.MediaSourcePlayhead(
-          video, manifest, config, /* startTime= */ -15, Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          video, manifest, config, /* startTime= */ -15, Util.spyFunc(onSeek));
 
       expect(playhead.getTime()).toBe(45);
     });
@@ -293,8 +262,7 @@ describe('Playhead', () => {
       // If the live stream's playback offset time is not available, start
       // playing from the seek range start time.
       playhead = new shaka.media.MediaSourcePlayhead(
-          video, manifest, config, /* startTime= */ -40, Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          video, manifest, config, /* startTime= */ -40, Util.spyFunc(onSeek));
 
       expect(playhead.getTime()).toBe(30);
     });
@@ -305,8 +273,7 @@ describe('Playhead', () => {
           manifest,
           config,
           /* startTime= */ 5,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       expect(video.addEventListener).toHaveBeenCalledWith(
           'loadedmetadata', jasmine.any(Function), jasmine.anything());
@@ -338,8 +305,7 @@ describe('Playhead', () => {
           manifest,
           config,
           /* startTime= */ null,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       expect(video.addEventListener).toHaveBeenCalledWith(
           'loadedmetadata', jasmine.any(Function), jasmine.anything());
@@ -371,8 +337,7 @@ describe('Playhead', () => {
         manifest,
         config,
         /* startTime= */ 5,
-        Util.spyFunc(onSeek),
-        Util.spyFunc(onEvent));
+        Util.spyFunc(onSeek));
 
     // This has to periodically increment the mock date to allow the onSeeking_
     // handler to seek, if appropriate.
@@ -531,8 +496,7 @@ describe('Playhead', () => {
         manifest,
         config,
         /* startTime= */ 5,
-        Util.spyFunc(onSeek),
-        Util.spyFunc(onEvent));
+        Util.spyFunc(onSeek));
 
     setMockDate(0);
     video.on['seeking']();
@@ -580,8 +544,7 @@ describe('Playhead', () => {
         manifest,
         config,
         /* startTime= */ 5,
-        Util.spyFunc(onSeek),
-        Util.spyFunc(onEvent));
+        Util.spyFunc(onSeek));
 
     // First, seek to start time.
     video.currentTime = 0;
@@ -641,8 +604,7 @@ describe('Playhead', () => {
         manifest,
         config,
         /* startTime= */ 5,
-        Util.spyFunc(onSeek),
-        Util.spyFunc(onEvent));
+        Util.spyFunc(onSeek));
     expect(currentTime).toBe(1000);
     seekCount = 0;
 
@@ -687,8 +649,7 @@ describe('Playhead', () => {
           manifest,
           config,
           /* startTime= */ 5,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       video.on['seeking']();
       expect(video.currentTime).toBe(5);
@@ -719,8 +680,7 @@ describe('Playhead', () => {
           manifest,
           config,
           /* startTime= */ 5,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       video.on['seeking']();
       expect(video.currentTime).toBe(5);
@@ -754,8 +714,7 @@ describe('Playhead', () => {
         manifest,
         config,
         /* startTime= */ 30,
-        Util.spyFunc(onSeek),
-        Util.spyFunc(onEvent));
+        Util.spyFunc(onSeek));
 
     video.currentTime = 0;
     video.seeking = true;
@@ -800,8 +759,7 @@ describe('Playhead', () => {
         manifest,
         config,
         /* startTime= */ 30,
-        Util.spyFunc(onSeek),
-        Util.spyFunc(onEvent));
+        Util.spyFunc(onSeek));
 
     /**
      * Prevent retries on the initial start time seek.  This will ensure that
@@ -832,8 +790,6 @@ describe('Playhead', () => {
       timeline.getSeekRangeStart.and.returnValue(0);
       timeline.getSeekRangeEnd.and.returnValue(60);
       timeline.getDuration.and.returnValue(60);
-
-      config.smallGapLimit = 1;
     });
 
     describe('when playing', () => {
@@ -842,7 +798,6 @@ describe('Playhead', () => {
           buffered: [{start: 0, end: 10}],
           start: 3,
           waitingAt: 10,
-          expectEvent: false,
           expectedEndTime: 10,
         });
 
@@ -850,7 +805,6 @@ describe('Playhead', () => {
           buffered: [{start: 0, end: 10}, {start: 20, end: 30}],
           start: 24,
           waitingAt: 30,
-          expectEvent: false,
           expectedEndTime: 30,
         });
 
@@ -858,7 +812,6 @@ describe('Playhead', () => {
           buffered: [{start: 0, end: 10}, {start: 11, end: 20}],
           start: 5,
           waitingAt: 10,
-          expectEvent: false,
           expectedEndTime: 11,
         });
 
@@ -867,7 +820,6 @@ describe('Playhead', () => {
               [{start: 0, end: 10}, {start: 11, end: 20}, {start: 21, end: 30}],
           start: 5,
           waitingAt: 10,
-          expectEvent: false,
           expectedEndTime: 11,
         });
 
@@ -876,26 +828,15 @@ describe('Playhead', () => {
               [{start: 0, end: 10}, {start: 11, end: 20}, {start: 21, end: 30}],
           start: 15,
           waitingAt: 20,
-          expectEvent: false,
           expectedEndTime: 21,
         });
       });  // with small gaps
 
       describe('with large gaps', () => {
-        playingTest('will fire an event', {
-          buffered: [{start: 0, end: 10}, {start: 30, end: 40}],
-          start: 5,
-          waitingAt: 10,
-          expectEvent: true,
-          expectedEndTime: 10,
-        });
-
         playingTest('will jump large gaps if set', {
           buffered: [{start: 0, end: 10}, {start: 30, end: 40}],
           start: 5,
           waitingAt: 10,
-          jumpLargeGaps: true,
-          expectEvent: true,
           expectedEndTime: 30,
         });
 
@@ -904,8 +845,6 @@ describe('Playhead', () => {
               [{start: 0, end: 10}, {start: 30, end: 40}, {start: 50, end: 60}],
           start: 5,
           waitingAt: 10,
-          jumpLargeGaps: true,
-          expectEvent: true,
           expectedEndTime: 30,
         });
 
@@ -914,20 +853,8 @@ describe('Playhead', () => {
               [{start: 0, end: 10}, {start: 20, end: 30}, {start: 50, end: 60}],
           start: 24,
           waitingAt: 30,
-          jumpLargeGaps: true,
-          expectEvent: true,
           expectedEndTime: 50,
         });
-
-        playingTest('won\'t jump gaps when preventDefault() is called', {
-          buffered: [{start: 0, end: 10}, {start: 30, end: 40}],
-          start: 5,
-          waitingAt: 10,
-          jumpLargeGaps: true,
-          preventDefault: true,
-          expectEvent: true,
-          expectedEndTime: 10,
-        });
       });  // with large gaps
 
       /**
@@ -940,20 +867,12 @@ describe('Playhead', () => {
           video.currentTime = data.start;
           video.readyState = HTMLMediaElement.HAVE_ENOUGH_DATA;
 
-          onEvent.and.callFake((event) => {
-            if (data.preventDefault) {
-              event.preventDefault();
-            }
-          });
-
-          config.jumpLargeGaps = !!data.jumpLargeGaps;
           playhead = new shaka.media.MediaSourcePlayhead(
               video,
               manifest,
               config,
               /* startTime= */ data.start,
-              Util.spyFunc(onSeek),
-              Util.spyFunc(onEvent));
+              Util.spyFunc(onSeek));
 
           jasmine.clock().tick(500);
           for (let time = data.start; time < data.waitingAt; time++) {
@@ -974,14 +893,11 @@ describe('Playhead', () => {
             expect(video.currentTime).toBe(time + 0.4);
           }
 
-          expect(onEvent).not.toHaveBeenCalled();
-
           video.currentTime = data.waitingAt;
           video.readyState = HTMLMediaElement.HAVE_CURRENT_DATA;
           video.on['waiting']();
           jasmine.clock().tick(500);
 
-          expect(onEvent).toHaveBeenCalledTimes(data.expectEvent ? 1 : 0);
           expect(video.currentTime).toBe(data.expectedEndTime);
         });
       }
@@ -994,7 +910,6 @@ describe('Playhead', () => {
           start: 4,
           seekTo: 14,
           expectedEndTime: 14,
-          expectEvent: false,
         });
 
         seekTest('will jump when seeking into gap', {
@@ -1002,7 +917,6 @@ describe('Playhead', () => {
           start: 3,
           seekTo: 10.4,
           expectedEndTime: 11,
-          expectEvent: false,
         });
 
         seekTest('won\'t jump multiple buffers', {
@@ -1011,7 +925,6 @@ describe('Playhead', () => {
           start: 3,
           seekTo: 10.4,
           expectedEndTime: 11,
-          expectEvent: false,
         });
 
         seekTest('will jump into last range with seeking', {
@@ -1020,7 +933,6 @@ describe('Playhead', () => {
           start: 3,
           seekTo: 20.5,
           expectedEndTime: 21,
-          expectEvent: false,
         });
 
         seekTest('treats large gaps as small if playhead near end', {
@@ -1028,36 +940,15 @@ describe('Playhead', () => {
           start: 3,
           seekTo: 29.2,
           expectedEndTime: 30,
-          expectEvent: false,
         });
       });  // with small gaps
 
       describe('with large gaps', () => {
-        seekTest('will raise event', {
-          buffered: [{start: 0, end: 10}, {start: 30, end: 40}],
-          start: 5,
-          seekTo: 12,
-          expectedEndTime: 12,
-          expectEvent: true,
-        });
-
         seekTest('will jump large gaps', {
           buffered: [{start: 0, end: 10}, {start: 30, end: 40}],
           start: 5,
           seekTo: 12,
-          jumpLargeGaps: true,
           expectedEndTime: 30,
-          expectEvent: true,
-        });
-
-        seekTest('won\'t jump if preventDefault() is called', {
-          buffered: [{start: 0, end: 10}, {start: 30, end: 40}],
-          start: 5,
-          seekTo: 12,
-          jumpLargeGaps: true,
-          preventDefault: true,
-          expectedEndTime: 12,
-          expectEvent: true,
         });
       });  // with large gaps
     });  // with buffered seeks
@@ -1071,7 +962,6 @@ describe('Playhead', () => {
           start: 3,
           seekTo: 22,
           expectedEndTime: 22,
-          expectEvent: false,
         });
 
         // Seeking to the beginning is considered an unbuffered seek even if
@@ -1082,7 +972,6 @@ describe('Playhead', () => {
           start: 4,
           seekTo: 0,
           expectedEndTime: 0.2,
-          expectEvent: false,
         });
 
         seekTest('will jump when seeking into gap', {
@@ -1092,7 +981,6 @@ describe('Playhead', () => {
           start: 3,
           seekTo: 30.2,
           expectedEndTime: 31,
-          expectEvent: false,
         });
 
         seekTest('will jump when seeking to the end of a range', {
@@ -1102,7 +990,6 @@ describe('Playhead', () => {
           start: 3,
           seekTo: 30,
           expectedEndTime: 31,
-          expectEvent: false,
         });
 
         seekTest('won\'t jump when past end', {
@@ -1112,7 +999,6 @@ describe('Playhead', () => {
           start: 3,
           seekTo: 34,
           expectedEndTime: 34,
-          expectEvent: false,
         });
 
         seekTest('won\'t jump when seeking backwards into buffered range', {
@@ -1122,7 +1008,6 @@ describe('Playhead', () => {
           start: 24,
           seekTo: 4,
           expectedEndTime: 4,
-          expectEvent: false,
         });
 
         seekTest('will wait to jump when seeking backwards', {
@@ -1133,7 +1018,6 @@ describe('Playhead', () => {
           start: 24,
           seekTo: 4,
           expectedEndTime: 4,
-          expectEvent: false,
         });
 
         seekTest('will jump when seeking backwards into gap', {
@@ -1143,7 +1027,6 @@ describe('Playhead', () => {
           start: 24,
           seekTo: 1.6,
           expectedEndTime: 2,
-          expectEvent: false,
         });
       });  // with small gaps
 
@@ -1153,19 +1036,7 @@ describe('Playhead', () => {
           newBuffered: [{start: 20, end: 30}],
           start: 25,
           seekTo: 0,
-          jumpLargeGaps: true,
           expectedEndTime: 20,
-          expectEvent: true,
-        });
-
-        seekTest('will raise event', {
-          // [0-10], [20-30], [40-50]
-          buffered: [{start: 0, end: 10}],
-          newBuffered: [{start: 20, end: 30}, {start: 40, end: 50}],
-          start: 3,
-          seekTo: 32,
-          expectedEndTime: 32,
-          expectEvent: true,
         });
 
         seekTest('will jump large gaps', {
@@ -1175,20 +1046,6 @@ describe('Playhead', () => {
           start: 3,
           seekTo: 32,
           expectedEndTime: 40,
-          jumpLargeGaps: true,
-          expectEvent: true,
-        });
-
-        seekTest('will jump large gaps', {
-          // [0-10], [20-30], [40-50]
-          buffered: [{start: 0, end: 10}],
-          newBuffered: [{start: 20, end: 30}, {start: 40, end: 50}],
-          start: 3,
-          seekTo: 32,
-          expectedEndTime: 32,
-          jumpLargeGaps: true,
-          preventDefault: true,
-          expectEvent: true,
         });
       });  // with large gaps
     });  // with unbuffered seeks
@@ -1199,17 +1056,14 @@ describe('Playhead', () => {
       video.currentTime = 12;
       video.readyState = HTMLMediaElement.HAVE_ENOUGH_DATA;
 
-      config.jumpLargeGaps = true;
       playhead = new shaka.media.MediaSourcePlayhead(
           video,
           manifest,
           config,
           /* startTime= */ 12,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       jasmine.clock().tick(500);
-      expect(onEvent).not.toHaveBeenCalled();
 
       // Append a segment before seeking.
       playhead.notifyOfBufferingChange();
@@ -1248,14 +1102,12 @@ describe('Playhead', () => {
         },
       });
 
-      config.jumpLargeGaps = true;
       playhead = new shaka.media.MediaSourcePlayhead(
           video,
           manifest,
           config,
           /* startTime= */ 0,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
@@ -1271,14 +1123,12 @@ describe('Playhead', () => {
       video.readyState = HTMLMediaElement.HAVE_ENOUGH_DATA;
       video.paused = true;
 
-      config.jumpLargeGaps = true;
       playhead = new shaka.media.MediaSourcePlayhead(
           video,
           manifest,
           config,
           /* startTime= */ 5,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
@@ -1296,14 +1146,12 @@ describe('Playhead', () => {
       video.paused = true;
       video.autoplay = true;
 
-      config.jumpLargeGaps = true;
       playhead = new shaka.media.MediaSourcePlayhead(
           video,
           manifest,
           config,
           /* startTime= */ 0,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
@@ -1321,14 +1169,12 @@ describe('Playhead', () => {
       video.paused = true;
       video.autoplay = false;
 
-      config.jumpLargeGaps = true;
       playhead = new shaka.media.MediaSourcePlayhead(
           video,
           manifest,
           config,
           /* startTime= */ 0,
-          Util.spyFunc(onSeek),
-          Util.spyFunc(onEvent));
+          Util.spyFunc(onSeek));
 
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
@@ -1347,23 +1193,14 @@ describe('Playhead', () => {
         video.currentTime = data.start;
         video.readyState = HTMLMediaElement.HAVE_ENOUGH_DATA;
 
-        onEvent.and.callFake((event) => {
-          if (data.preventDefault) {
-            event.preventDefault();
-          }
-        });
-
-        config.jumpLargeGaps = !!data.jumpLargeGaps;
         playhead = new shaka.media.MediaSourcePlayhead(
             video,
             manifest,
             config,
             /* startTime= */ data.start,
-            Util.spyFunc(onSeek),
-            Util.spyFunc(onEvent));
+            Util.spyFunc(onSeek));
 
         jasmine.clock().tick(500);
-        expect(onEvent).not.toHaveBeenCalled();
 
         // Seek to the given position and update ready state.
         video.currentTime = data.seekTo;
@@ -1395,7 +1232,6 @@ describe('Playhead', () => {
           jasmine.clock().tick(250);
         }
 
-        expect(onEvent).toHaveBeenCalledTimes(data.expectEvent ? 1 : 0);
         expect(video.currentTime).toBe(data.expectedEndTime);
       });
     }