shaka-player 4.2.3 → 4.2.4

package/test/media/media_source_engine_integration.js

@@ -70,6 +70,18 @@ describe('MediaSourceEngine', () => {
         type, segment, reference, /* hasClosedCaptions= */ false);
   }
 
+  function appendWithSeek(type, segmentNumber) {
+    const segment = generators[type]
+        .getSegment(segmentNumber, Date.now() / 1000);
+    const reference = dummyReference(type, segmentNumber);
+    return mediaSourceEngine.appendBuffer(
+        type,
+        segment,
+        reference,
+        /* hasClosedCaptions= */ false,
+        /* seeked= */ true);
+  }
+
   function appendInitWithClosedCaptions(type) {
     const segment = generators[type].getInitSegment(Date.now() / 1000);
     const reference = null;
@@ -380,6 +392,25 @@ describe('MediaSourceEngine', () => {
     expect(textDisplayer.appendSpy).toHaveBeenCalledTimes(3);
   });
 
+  it('extracts CEA-708 captions from previous segment from hls', async () => {
+    // Load TS file with CEA-708 captions.
+    metadata = shaka.test.TestScheme.DATA['cea-708_ts'];
+    generators = shaka.test.TestScheme.GENERATORS['cea-708_ts'];
+
+    const initObject = new Map();
+    initObject.set(ContentType.VIDEO, getFakeStream(metadata.video));
+    initObject.set(ContentType.TEXT, getFakeStream(metadata.text));
+    // Call with forceTransmux = true, so that it will transmux even on
+    // platforms with native TS support.
+    await mediaSourceEngine.init(initObject, /* forceTransmux= */ true);
+    mediaSourceEngine.setSelectedClosedCaptionId('CC1');
+
+    await append(ContentType.VIDEO, 2);
+    await appendWithSeek(ContentType.VIDEO, 0);
+
+    expect(textDisplayer.appendSpy).toHaveBeenCalledTimes(6);
+  });
+
   it('buffers partial TS video segments in sequence mode', async () => {
     metadata = shaka.test.TestScheme.DATA['cea-708_ts'];
     generators = shaka.test.TestScheme.GENERATORS['cea-708_ts'];

package/test/media/playhead_unit.js

@@ -161,6 +161,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(video.currentTime).toBe(5);
       expect(playhead.getTime()).toBe(5);
 
@@ -182,6 +184,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(
@@ -223,6 +227,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       video.on['seeking']();
       expect(playhead.getTime()).toBe(5);
       expect(video.currentTime).toBe(5);
@@ -264,6 +270,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(playhead.getTime()).toBe(59);  // duration - durationBackoff
       expect(video.currentTime).toBe(59);  // duration - durationBackoff
     });
@@ -302,6 +310,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(playhead.getTime()).toBe(30);
     });
 
@@ -314,6 +324,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(video.addEventListener).toHaveBeenCalledWith(
           'loadedmetadata', jasmine.any(Function), jasmine.anything());
 
@@ -347,6 +359,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       expect(video.addEventListener).toHaveBeenCalledWith(
           'loadedmetadata', jasmine.any(Function), jasmine.anything());
 
@@ -380,6 +394,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.
 
@@ -652,6 +668,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);
@@ -696,6 +714,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       video.on['seeking']();
       expect(video.currentTime).toBe(5);
       expect(playhead.getTime()).toBe(5);
@@ -728,6 +748,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       video.on['seeking']();
       expect(video.currentTime).toBe(5);
       expect(playhead.getTime()).toBe(5);
@@ -765,6 +787,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']();
@@ -809,6 +834,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
@@ -933,6 +960,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
@@ -1142,6 +1171,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       jasmine.clock().tick(500);
       expect(onEvent).not.toHaveBeenCalled();
 
@@ -1190,6 +1221,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
 
@@ -1212,6 +1245,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
 
@@ -1236,6 +1271,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
 
@@ -1260,6 +1297,8 @@ describe('Playhead', () => {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      playhead.ready();
+
       playhead.notifyOfBufferingChange();
       jasmine.clock().tick(500);
 
@@ -1287,6 +1326,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

@@ -154,6 +154,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

@@ -878,7 +878,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.
@@ -1737,8 +1737,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 () => {
@@ -1768,24 +1783,22 @@ describe('StreamingEngine', () => {
       const originalAppendBuffer =
           // eslint-disable-next-line no-restricted-syntax
           shaka.test.FakeMediaSourceEngine.prototype.appendBufferImpl;
-      mediaSourceEngine.appendBuffer.and.callFake(
-          (type, data, reference) => {
-            expect(presentationTimeInSeconds).toBe(125);
-            if (reference && reference.startTime >= 100) {
-              // Ignore a possible call for the first Period.
-              expect(Util.invokeSpy(timeline.getSegmentAvailabilityStart))
-                  .toBe(100);
-              expect(Util.invokeSpy(timeline.getSegmentAvailabilityEnd))
-                  .toBe(120);
-              playing = true;
-              mediaSourceEngine.appendBuffer.and.callFake(
-                  originalAppendBuffer);
-            }
+      mediaSourceEngine.appendBuffer.and.callFake((type, data, reference) => {
+        expect(presentationTimeInSeconds).toBe(125);
+        // Ignore a possible call for the first Period.
+        if (reference && reference.startTime >= 100) {
+          expect(Util.invokeSpy(timeline.getSegmentAvailabilityStart))
+              .not.toBeLessThan(100);
+          expect(Util.invokeSpy(timeline.getSegmentAvailabilityEnd))
+              .not.toBeLessThan(120);
+          playing = true;
+          mediaSourceEngine.appendBuffer.and.callFake(originalAppendBuffer);
+        }
 
-            // eslint-disable-next-line no-restricted-syntax
-            return originalAppendBuffer.call(
-                mediaSourceEngine, type, data, reference);
-          });
+        // eslint-disable-next-line no-restricted-syntax
+        return originalAppendBuffer.call(
+            mediaSourceEngine, type, data, reference);
+      });
 
       await runTest(slideSegmentAvailabilityWindow);
       // Verify buffers.
@@ -2001,7 +2014,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;
@@ -2162,7 +2175,7 @@ describe('StreamingEngine', () => {
         netEngine.request.calls.reset();
 
         // Retry streaming.
-        expect(streamingEngine.retry()).toBe(true);
+        expect(streamingEngine.retry(0.1)).toBe(true);
       });
 
       // Here we go!
@@ -2192,7 +2205,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!
@@ -2244,7 +2257,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

@@ -3940,6 +3940,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

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

package/ui/controls.js

@@ -1024,7 +1024,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 ||
+        !this.isFullScreenSupported()) {
+      return;
+    }
 
     if (screen.orientation.type.includes('landscape') &&
         !document.fullscreenElement) {

package/ui/settings_menu.js

@@ -12,6 +12,7 @@ goog.require('shaka.ui.Enums');
 goog.require('shaka.ui.Utils');
 goog.require('shaka.util.Dom');
 goog.require('shaka.util.FakeEvent');
+goog.require('shaka.util.Iterables');
 goog.requireType('shaka.ui.Controls');
 
 
@@ -116,8 +117,16 @@ shaka.ui.SettingsMenu = class extends shaka.ui.Element {
       this.eventManager.listen(this.backButton, 'click', () => {
         shaka.ui.Utils.setDisplay(this.parent, true);
 
-        /** @type {!HTMLElement} */
-        (this.parent.childNodes[0]).focus();
+        const isDisplayed =
+        (element) => element.classList.contains('shaka-hidden') == false;
+
+        const Iterables = shaka.util.Iterables;
+        if (Iterables.some(this.parent.childNodes, isDisplayed)) {
+          // Focus on the first visible child of the overflow menu
+          const visibleElements =
+            Iterables.filter(this.parent.childNodes, isDisplayed);
+          /** @type {!HTMLElement} */ (visibleElements[0]).focus();
+        }
 
         // Make sure controls are displayed
         this.controls.computeOpacity();