shaka-player 4.3.15 → 4.3.16

package/test/cast/cast_proxy_unit.js

@@ -114,52 +114,6 @@ describe('CastProxy', () => {
   });
 
   describe('cast', () => {
-    it('pauses the local video', () => {
-      proxy.cast();
-      expect(mockVideo.pause).toHaveBeenCalled();
-    });
-
-    it('passes initial state to sender', () => {
-      mockVideo.loop = true;
-      mockVideo.playbackRate = 3;
-      mockVideo.currentTime = 12;
-      const fakeConfig = {key: 'value'};
-      mockPlayer.getConfiguration.and.returnValue(fakeConfig);
-      mockPlayer.isTextTrackVisible.and.returnValue(false);
-      const fakeManifestUri = 'foo://bar';
-      mockPlayer.getAssetUri.and.returnValue(fakeManifestUri);
-
-      proxy.cast();
-      const calls = mockSender.cast.calls;
-      expect(calls.count()).toBe(1);
-      if (calls.count()) {
-        const state = calls.argsFor(0)[0];
-        // Video state goes directly:
-        expect(state.video.loop).toBe(mockVideo.loop);
-        expect(state.video.playbackRate).toBe(mockVideo.playbackRate);
-        // Player state uses corresponding setter names:
-        expect(state.player.configure).toEqual(fakeConfig);
-        expect(state['playerAfterLoad'].setTextTrackVisibility).toBe(false);
-        // Manifest URI:
-        expect(state.manifest).toBe(fakeManifestUri);
-        // Start time:
-        expect(state.startTime).toBe(mockVideo.currentTime);
-      }
-    });
-
-    it('does not provide a start time if the video has ended', () => {
-      mockVideo.ended = true;
-      mockVideo.currentTime = 12;
-
-      proxy.cast();
-      const calls = mockSender.cast.calls;
-      expect(calls.count()).toBe(1);
-      if (calls.count()) {
-        const state = calls.argsFor(0)[0];
-        expect(state.startTime).toBe(null);
-      }
-    });
-
     it('unloads the local player after casting is complete', async () => {
       /** @type {!shaka.util.PublicPromise} */
       const p = new shaka.util.PublicPromise();

package/test/cast/cast_sender_unit.js

@@ -157,7 +157,7 @@ describe('CastSender', () => {
           shaka.util.Error.Severity.RECOVERABLE,
           shaka.util.Error.Category.CAST,
           shaka.util.Error.Code.CAST_API_UNAVAILABLE));
-      await expectAsync(sender.cast(fakeInitState)).toBeRejectedWith(expected);
+      await expectAsync(sender.cast()).toBeRejectedWith(expected);
     });
 
     it('fails when there are no receivers', async () => {
@@ -168,7 +168,7 @@ describe('CastSender', () => {
           shaka.util.Error.Severity.RECOVERABLE,
           shaka.util.Error.Category.CAST,
           shaka.util.Error.Code.NO_CAST_RECEIVERS));
-      await expectAsync(sender.cast(fakeInitState)).toBeRejectedWith(expected);
+      await expectAsync(sender.cast()).toBeRejectedWith(expected);
     });
 
     it('creates a session and sends an "init" message', async () => {
@@ -177,7 +177,7 @@ describe('CastSender', () => {
       fakeReceiverAvailability(true);
       expect(sender.hasReceivers()).toBe(true);
 
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
 
       await p;
@@ -220,7 +220,7 @@ describe('CastSender', () => {
         sender.init();
         fakeReceiverAvailability(true);
 
-        const p = sender.cast(fakeInitState);
+        const p = sender.cast();
         fakeSessionConnectionFailure(metadata.castErrorCode);
 
         const expected = Util.jasmineError(new shaka.util.Error(
@@ -236,7 +236,7 @@ describe('CastSender', () => {
       sender.init();
       fakeReceiverAvailability(true);
 
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
 
       await p;
@@ -244,14 +244,14 @@ describe('CastSender', () => {
           shaka.util.Error.Severity.RECOVERABLE,
           shaka.util.Error.Category.CAST,
           shaka.util.Error.Code.ALREADY_CASTING));
-      await expectAsync(sender.cast(fakeInitState)).toBeRejectedWith(expected);
+      await expectAsync(sender.cast()).toBeRejectedWith(expected);
     });
   });
 
   it('re-uses old sessions', async () => {
     sender.init();
     fakeReceiverAvailability(true);
-    const p = sender.cast(fakeInitState);
+    const p = sender.cast();
     fakeSessionConnection();
     const oldMockSession = mockSession;
     await p;
@@ -289,7 +289,7 @@ describe('CastSender', () => {
   it('doesn\'t re-use stopped sessions', async () => {
     sender.init();
     fakeReceiverAvailability(true);
-    const p = sender.cast(fakeInitState);
+    const p = sender.cast();
     fakeSessionConnection();
     await p;
     await sender.destroy();
@@ -334,7 +334,7 @@ describe('CastSender', () => {
       sender.init();
       fakeReceiverAvailability(true);
       sender.setAppData(fakeAppData);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
 
       await p;
@@ -347,7 +347,7 @@ describe('CastSender', () => {
     it('sends a special "appData" message if casting', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -390,7 +390,7 @@ describe('CastSender', () => {
     it('is not triggered if making a new session', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -437,7 +437,7 @@ describe('CastSender', () => {
     it('is triggered by an "event" message', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -460,7 +460,7 @@ describe('CastSender', () => {
     it('is triggered when casting ends', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -477,7 +477,7 @@ describe('CastSender', () => {
     it('opens the dialog if we are casting', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -502,7 +502,7 @@ describe('CastSender', () => {
     it('returns most recent properties from "update" messages', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -545,7 +545,7 @@ describe('CastSender', () => {
     it('simple methods trigger "call" messages', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -568,7 +568,7 @@ describe('CastSender', () => {
         method = null;
         sender.init();
         fakeReceiverAvailability(true);
-        const p = sender.cast(fakeInitState);
+        const p = sender.cast();
         fakeSessionConnection();
         await p;
 
@@ -655,7 +655,7 @@ describe('CastSender', () => {
     it('overrides any cached properties', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -675,7 +675,7 @@ describe('CastSender', () => {
     it('causes a "set" message to be sent', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -691,7 +691,7 @@ describe('CastSender', () => {
     it('can be used before we have an "update" message', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -705,7 +705,7 @@ describe('CastSender', () => {
     it('is true only after we have an "update" message', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const p = sender.cast(fakeInitState);
+      const p = sender.cast();
       fakeSessionConnection();
       await p;
 
@@ -723,7 +723,7 @@ describe('CastSender', () => {
     it('disconnects and cancels all async operations', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const cast = sender.cast(fakeInitState);
+      const cast = sender.cast();
       fakeSessionConnection();
       await cast;
 
@@ -756,7 +756,7 @@ describe('CastSender', () => {
     it('transfers playback to local device', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const cast = sender.cast(fakeInitState);
+      const cast = sender.cast();
       fakeSessionConnection();
       await cast;
 
@@ -772,7 +772,7 @@ describe('CastSender', () => {
     it('succeeds even if session.stop() throws', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const cast = sender.cast(fakeInitState);
+      const cast = sender.cast();
       fakeSessionConnection();
       await cast;
 
@@ -792,7 +792,7 @@ describe('CastSender', () => {
     beforeEach(async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const cast = sender.cast(fakeInitState);
+      const cast = sender.cast();
       fakeSessionConnection();
       await cast;
 
@@ -837,7 +837,7 @@ describe('CastSender', () => {
     it('cancels all async operations', async () => {
       sender.init();
       fakeReceiverAvailability(true);
-      const cast = sender.cast(fakeInitState);
+      const cast = sender.cast();
       fakeSessionConnection();
       await cast;
 

package/test/cea/cea608_memory_unit.js

@@ -46,11 +46,12 @@ describe('Cea608Memory', () => {
   it('adds and emits a series of special characters from the buffer', () => {
     const startTime = 1;
     const endTime = 2;
-    const expectedText = '½¿èôÇ©ë»ö{ß│';
+    const expectedText = '½¿ èôÇ©ë»ö{ß│';
     const charGroups = [
       {
         set: CharSet.SPECIAL_NORTH_AMERICAN,
-        chars: [0x32, 0x33, 0x3a, 0x3e], // ½, ¿, è, ô
+        // Note TS is not at either end to avoid side effect of trim()
+        chars: [0x32, 0x33, 0x39, 0x3a, 0x3e], // ½, ¿, TS, è, ô
       },
 
       {

package/test/hls/hls_live_unit.js

@@ -776,6 +776,58 @@ describe('HlsParser live', () => {
             manifest.variants[1].video, [ref4]);
       });
 
+      describe('when ignoreManifestProgramDateTime is set', () => {
+        const config = shaka.util.PlayerConfiguration.createDefault().manifest;
+        config.hls.ignoreManifestProgramDateTime = true;
+
+        it('does not reset segment times when switching', async () => {
+          parser.configure(config);
+
+          const ref1 = makeReference(
+              'test:/main.mp4', 0, 2, /* syncTime= */ null);
+          const ref2 = makeReference(
+              'test:/main2.mp4', 2, 4, /* syncTime= */ null);
+
+          const secondVariant = [
+            '#EXT-X-STREAM-INF:BANDWIDTH=300,CODECS="avc1",',
+            'RESOLUTION=1200x940,FRAME-RATE=60\n',
+            'video2',
+          ].join('');
+          const masterWithTwoVariants = master + secondVariant;
+          configureNetEngineForInitialManifest(masterWithTwoVariants,
+              mediaWithAdditionalSegment, mediaWithAdditionalSegment2);
+
+          const manifest = await parser.start('test:/master', playerInterface);
+          await manifest.variants[0].video.createSegmentIndex();
+          ManifestParser.verifySegmentIndex(
+              manifest.variants[0].video, [ref1, ref2]);
+          expect(manifest.variants[1].video.segmentIndex).toBeNull();
+
+          // In the initial playlist, we know the earliest start time is 0, at
+          // EXT-X-MEDIA-SEQUENCE of 0.
+          expect(
+              manifest.variants[0].video.segmentIndex.earliestReference()
+                  .getStartTime())
+              .toBe(0);
+
+          // Update.
+          fakeNetEngine
+              .setResponseText('test:/video', mediaWithRemovedSegment)
+              .setResponseText('test:/video2', mediaWithRemovedSegment2);
+          await delayForUpdatePeriod();
+
+          // Switch. The new variant starts at EXT-X-MEDIA-SEQUENCE of 1.
+          await manifest.variants[0].video.closeSegmentIndex();
+          await manifest.variants[1].video.createSegmentIndex();
+
+          // The earliest start time of the new segmentIndex should therefore be
+          // 2.
+          expect(manifest.variants[0].video.segmentIndex).toBeNull();
+          const segIdx = manifest.variants[1].video.segmentIndex;
+          expect(segIdx.earliestReference().getStartTime()).toBe(2);
+        });
+      });
+
       it('handles switching during update', async () => {
         const ref1 = makeReference(
             'test:/main.mp4', 0, 2, /* syncTime= */ null);

package/test/media/media_source_engine_integration.js

@@ -28,7 +28,7 @@ describe('MediaSourceEngine', () => {
       jasmine.objectContaining({
         startTime: Util.closeTo(0.067, 0.001),
         endTime: Util.closeTo(1, 0.001),
-        payload: 'eng:⠀00:00:00:00',
+        payload: 'eng: 00:00:00:00',
         textAlign: Cue.textAlign.CENTER,
       }),
     ],

package/test/player_unit.js

@@ -3519,11 +3519,14 @@ describe('Player', () => {
   });
 
   describe('getPlayheadTimeAsDate()', () => {
+    /** @type {?shaka.media.PresentationTimeline} */
+    let timeline;
     beforeEach(async () => {
-      const timeline = new shaka.media.PresentationTimeline(300, 0);
+      timeline = new shaka.media.PresentationTimeline(300, 0);
       timeline.setStatic(false);
 
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        goog.asserts.assert(timeline, 'timeline must be non-null');
         manifest.presentationTimeline = timeline;
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1);
@@ -3541,6 +3544,15 @@ describe('Player', () => {
       // (300 (presentation start time) + 20 (playhead time)) * 1000 (ms/sec)
       expect(liveTimeUtc).toEqual(new Date(320 * 1000));
     });
+
+    it('uses program date time', () => {
+      timeline.setInitialProgramDateTime(100);
+      playhead.getTime.and.returnValue(20);
+
+      const liveTimeUtc = player.getPlayheadTimeAsDate();
+      // (100 (program date time) + 20 (playhead time)) * 1000 (ms/sec)
+      expect(liveTimeUtc).toEqual(new Date(120 * 1000));
+    });
   });
 
   it('rejects empty manifests', async () => {

package/lib/polyfill/storage_estimate.js

@@ -1,57 +0,0 @@
-/*! @license
- * Shaka Player
- * Copyright 2016 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-goog.provide('shaka.polyfill.StorageEstimate');
-
-goog.require('shaka.polyfill');
-
-
-/**
- * @summary A polyfill to provide navigator.storage.estimate in old
- * webkit browsers.
- * See: https://developers.google.com/web/updates/2017/08/estimating-available-storage-space#the-present
- * @export
- */
-shaka.polyfill.StorageEstimate = class {
-  /**
-   * Install the polyfill if needed.
-   * @export
-   */
-  static install() {
-    if (navigator.storage && navigator.storage.estimate) {
-      // No need.
-      return;
-    }
-
-    if (navigator.webkitTemporaryStorage &&
-        navigator.webkitTemporaryStorage.queryUsageAndQuota) {
-      if (!('storage' in navigator)) {
-        navigator.storage = /** @type {!StorageManager} */ ({});
-      }
-      navigator.storage.estimate =
-          shaka.polyfill.StorageEstimate.storageEstimate_;
-    }
-  }
-
-  /**
-   * @this {StorageManager}
-   * @return {!Promise}
-   * @private
-   */
-  static storageEstimate_() {
-    return new Promise((resolve, reject) => {
-      navigator.webkitTemporaryStorage.queryUsageAndQuota(
-          (usage, quota) => {
-            resolve({usage: usage, quota: quota});
-          },
-          reject,
-      );
-    });
-  }
-};
-
-
-shaka.polyfill.register(shaka.polyfill.StorageEstimate.install);