shaka-player 3.2.14 → 3.2.15

package/test/media/playhead_unit.js

@@ -171,6 +171,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(video.currentTime).toBe(5);
       expect(playhead.getTime()).toBe(5);
 
@@ -192,6 +194,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(video.addEventListener).toHaveBeenCalledWith(
           'loadedmetadata', jasmine.any(Function), jasmine.anything());
       expect(video.addEventListener).not.toHaveBeenCalledWith(
@@ -233,6 +237,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       video.on['seeking']();
       expect(playhead.getTime()).toBe(5);
       expect(video.currentTime).toBe(5);
@@ -266,6 +272,8 @@ describe('Playhead', () => {
           video, manifest, config, /* startTime= */ 60, Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(playhead.getTime()).toBe(59);  // duration - durationBackoff
       expect(video.currentTime).toBe(59);  // duration - durationBackoff
     });
@@ -296,6 +304,8 @@ describe('Playhead', () => {
           video, manifest, config, /* startTime= */ -40, Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(playhead.getTime()).toBe(30);
     });
 
@@ -308,6 +318,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(video.addEventListener).toHaveBeenCalledWith(
           'loadedmetadata', jasmine.any(Function), jasmine.anything());
 
@@ -341,6 +353,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(video.addEventListener).toHaveBeenCalledWith(
           'loadedmetadata', jasmine.any(Function), jasmine.anything());
 
@@ -374,6 +388,8 @@ describe('Playhead', () => {
         Util.spyFunc(onSeek),
         Util.spyFunc(onEvent));
 
+    playhead.ready();
+
     // This has to periodically increment the mock date to allow the onSeeking_
     // handler to seek, if appropriate.
 
@@ -646,6 +662,8 @@ describe('Playhead', () => {
     expect(currentTime).toBe(1000);
     seekCount = 0;
 
+    playhead.ready();
+
     // The availability window slips ahead.
     timeline.getSeekRangeStart.and.returnValue(1030);
     timeline.getSeekRangeEnd.and.returnValue(1030);
@@ -690,6 +708,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       video.on['seeking']();
       expect(video.currentTime).toBe(5);
       expect(playhead.getTime()).toBe(5);
@@ -722,6 +742,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       video.on['seeking']();
       expect(video.currentTime).toBe(5);
       expect(playhead.getTime()).toBe(5);
@@ -759,6 +781,9 @@ describe('Playhead', () => {
 
     video.currentTime = 0;
     video.seeking = true;
+
+    playhead.ready();
+
     // "video.seeking" stays true until the buffered range intersects with
     // "video.currentTime".  Playhead should correct anyway.
     video.on['seeking']();
@@ -803,6 +828,8 @@ describe('Playhead', () => {
         Util.spyFunc(onSeek),
         Util.spyFunc(onEvent));
 
+    playhead.ready();
+
     /**
      * Prevent retries on the initial start time seek.  This will ensure that
      * only one call is made for the initial seek, and that any additional calls
@@ -955,6 +982,8 @@ describe('Playhead', () => {
               Util.spyFunc(onSeek),
               Util.spyFunc(onEvent));
 
+          playhead.ready();
+
           jasmine.clock().tick(500);
           for (let time = data.start; time < data.waitingAt; time++) {
             // We don't want to run tick() for 1 second because it will trigger
@@ -1208,6 +1237,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       jasmine.clock().tick(500);
       expect(onEvent).not.toHaveBeenCalled();
 
@@ -1257,6 +1288,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
 
@@ -1280,6 +1313,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
 
@@ -1305,6 +1340,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
 
@@ -1330,6 +1367,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
 
@@ -1362,6 +1401,8 @@ describe('Playhead', () => {
             Util.spyFunc(onSeek),
             Util.spyFunc(onEvent));
 
+        playhead.ready();
+
         jasmine.clock().tick(500);
         expect(onEvent).not.toHaveBeenCalled();
 

package/test/media/streaming_engine_integration.js

@@ -155,6 +155,19 @@ describe('StreamingEngine', () => {
         /* presentationDuration= */ Infinity);
     setupPlayhead();
 
+    // Retry on failure for live streams.
+    config.failureCallback = () => streamingEngine.retry(0.1);
+
+    // Ignore 404 errors in live stream tests.
+    onError.and.callFake((error) => {
+      if (error.code == shaka.util.Error.Code.BAD_HTTP_STATUS &&
+          error.data[1] == 404) {
+        // 404 error
+      } else {
+        fail(error);
+      }
+    });
+
     createStreamingEngine();
   }
 

package/test/media/streaming_engine_unit.js

@@ -855,7 +855,7 @@ describe('StreamingEngine', () => {
 
     const config = shaka.util.PlayerConfiguration.createDefault().streaming;
     config.bufferingGoal = 60;
-    config.failureCallback = () => streamingEngine.retry();
+    config.failureCallback = () => streamingEngine.retry(0.1);
     createStreamingEngine(config);
 
     // Make requests for different types take different amounts of time.
@@ -1714,8 +1714,23 @@ describe('StreamingEngine', () => {
     beforeEach(() => {
       setupLive();
       mediaSourceEngine = new shaka.test.FakeMediaSourceEngine(segmentData, 0);
-      createStreamingEngine();
+
+      // Retry on failure for live streams.
+      const config = shaka.util.PlayerConfiguration.createDefault().streaming;
+      config.failureCallback = () => streamingEngine.retry(0.1);
+
+      createStreamingEngine(config);
       presentationTimeInSeconds = 100;
+
+      // Ignore 404 errors in live stream tests.
+      onError.and.callFake((error) => {
+        if (error.code == shaka.util.Error.Code.BAD_HTTP_STATUS &&
+            error.data[1] == 404) {
+          // 404 error
+        } else {
+          fail(error);
+        }
+      });
     });
 
     it('outside segment availability window', async () => {
@@ -1751,9 +1766,9 @@ describe('StreamingEngine', () => {
             if (startTime >= 100) {
               // Ignore a possible call for the first Period.
               expect(Util.invokeSpy(timeline.getSegmentAvailabilityStart))
-                  .toBe(100);
+                  .not.toBeLessThan(100);
               expect(Util.invokeSpy(timeline.getSegmentAvailabilityEnd))
-                  .toBe(120);
+                  .not.toBeLessThan(120);
               playing = true;
               mediaSourceEngine.appendBuffer.and.callFake(
                   originalAppendBuffer);
@@ -1978,7 +1993,7 @@ describe('StreamingEngine', () => {
       mediaSourceEngine = new shaka.test.FakeMediaSourceEngine(segmentData);
 
       const config = shaka.util.PlayerConfiguration.createDefault().streaming;
-      config.failureCallback = () => streamingEngine.retry();
+      config.failureCallback = () => streamingEngine.retry(0.1);
       createStreamingEngine(config);
 
       presentationTimeInSeconds = 100;
@@ -2139,7 +2154,7 @@ describe('StreamingEngine', () => {
         netEngine.request.calls.reset();
 
         // Retry streaming.
-        expect(streamingEngine.retry()).toBe(true);
+        expect(streamingEngine.retry(0.1)).toBe(true);
       });
 
       // Here we go!
@@ -2169,7 +2184,7 @@ describe('StreamingEngine', () => {
 
         // Retry streaming, which should fail and return false.
         netEngine.request.calls.reset();
-        expect(streamingEngine.retry()).toBe(false);
+        expect(streamingEngine.retry(0.1)).toBe(false);
       });
 
       // Here we go!
@@ -2221,7 +2236,7 @@ describe('StreamingEngine', () => {
 
           // Retry streaming, which should fail and return false.
           netEngine.request.calls.reset();
-          expect(streamingEngine.retry()).toBe(false);
+          expect(streamingEngine.retry(0.1)).toBe(false);
         }
       });
 

package/test/player_unit.js

@@ -3735,6 +3735,93 @@ describe('Player', () => {
     });
   });
 
+  describe('config streaming.failureCallback default', () => {
+    /** @type {jasmine.Spy} */
+    let retryStreaming;
+    /** @type {jasmine.Spy} */
+    let isLive;
+
+    /**
+     * @suppress {accessControls}
+     * @param {!shaka.util.Error} error
+     */
+    function defaultStreamingFailureCallback(error) {
+      player.defaultStreamingFailureCallback_(error);
+    }
+
+    beforeEach(() => {
+      retryStreaming = jasmine.createSpy('retryStreaming');
+      isLive = jasmine.createSpy('isLive');
+
+      player.retryStreaming = Util.spyFunc(retryStreaming);
+      player.isLive = Util.spyFunc(isLive);
+    });
+
+    it('ignores VOD failures', () => {
+      isLive.and.returnValue(false);
+
+      const error = new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.NETWORK,
+          shaka.util.Error.Code.BAD_HTTP_STATUS,
+          /* url= */ '',
+          /* http_status= */ 404);
+
+      defaultStreamingFailureCallback(error);
+      expect(retryStreaming).not.toHaveBeenCalled();
+    });
+
+    it('retries live on HTTP 404', () => {
+      isLive.and.returnValue(true);
+
+      const error = new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.NETWORK,
+          shaka.util.Error.Code.BAD_HTTP_STATUS,
+          /* url= */ '',
+          /* http_status= */ 404);
+
+      defaultStreamingFailureCallback(error);
+      expect(retryStreaming).toHaveBeenCalled();
+    });
+
+    it('retries live on generic HTTP error', () => {
+      isLive.and.returnValue(true);
+
+      const error = new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.NETWORK,
+          shaka.util.Error.Code.HTTP_ERROR);
+
+      defaultStreamingFailureCallback(error);
+      expect(retryStreaming).toHaveBeenCalled();
+    });
+
+    it('retries live on HTTP timeout', () => {
+      isLive.and.returnValue(true);
+
+      const error = new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.NETWORK,
+          shaka.util.Error.Code.TIMEOUT);
+
+      defaultStreamingFailureCallback(error);
+      expect(retryStreaming).toHaveBeenCalled();
+    });
+
+    it('ignores other live failures', () => {
+      isLive.and.returnValue(true);
+
+      const error = new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MEDIA,
+          shaka.util.Error.Code.VIDEO_ERROR);
+
+      defaultStreamingFailureCallback(error);
+      expect(retryStreaming).not.toHaveBeenCalled();
+    });
+  });
+
   /**
    * Gets the currently active variant track.
    * @return {shaka.extern.Track}

package/test/test/util/simple_fakes.js

@@ -333,6 +333,9 @@ shaka.test.FakePlayhead = class {
     /** @private {number} */
     this.startTime_ = 0;
 
+    /** @type {!jasmine.Spy} */
+    this.ready = jasmine.createSpy('ready');
+
     /** @type {!jasmine.Spy} */
     this.setStartTime = jasmine.createSpy('setStartTime')
         .and.callFake((value) => {

package/ui/controls.js

@@ -970,7 +970,10 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
     if (!this.video_ ||
         this.video_.readyState == 0 ||
         this.castProxy_.isCasting() ||
-        !this.config_.enableFullscreenOnRotation) { return; }
+        !this.config_.enableFullscreenOnRotation ||
+        !document.fullscreenEnabled) {
+      return;
+    }
 
     if (screen.orientation.type.includes('landscape') &&
         !document.fullscreenElement) {