shaka-player 4.3.14 → 4.3.16

package/lib/text/ui_text_displayer.js

@@ -72,7 +72,9 @@ shaka.text.UITextDisplayer = class {
 
     /** @private {shaka.util.Timer} */
     this.captionsTimer_ = new shaka.util.Timer(() => {
-      this.updateCaptions_();
+      if (!this.video_.paused) {
+        this.updateCaptions_();
+      }
     }).tickEvery(updatePeriod);
 
     /**
@@ -93,6 +95,10 @@ shaka.text.UITextDisplayer = class {
       this.updateCaptions_(/* forceUpdate= */ true);
     });
 
+    this.eventManager_.listen(this.video_, 'seeking', () => {
+      this.updateCaptions_(/* forceUpdate= */ true);
+    });
+
     // From: https://html.spec.whatwg.org/multipage/media.html#dom-video-videowidth
     // Whenever the natural width or natural height of the video changes
     // (including, for example, because the selected video track was changed),
@@ -339,6 +345,9 @@ shaka.text.UITextDisplayer = class {
         const cueRegistry = this.currentCuesMap_.get(cue);
         goog.asserts.assert(cueRegistry, 'cueRegistry should exist.');
         if (cueRegistry.regionElement) {
+          if (cueRegistry.regionElement.contains(container)) {
+            cueRegistry.regionElement.removeChild(container);
+          }
           container.appendChild(cueRegistry.regionElement);
           cueRegistry.regionElement.appendChild(cueRegistry.cueElement);
         } else {

package/lib/text/vtt_text_parser.js

@@ -673,13 +673,14 @@ shaka.text.VttTextParser = class {
         refCue.fontFamily, cue.fontFamily);
     cue.fontSize = VttTextParser.getOrDefault_(
         refCue.fontSize, cue.fontSize);
+    cue.textShadow = VttTextParser.getOrDefault_(
+        refCue.textShadow, cue.textShadow);
 
     // Overwrite with new values as unable to determine
     // if new value is set or not
     cue.fontWeight = refCue.fontWeight;
     cue.fontStyle = refCue.fontStyle;
     cue.opacity = refCue.opacity;
-    cue.textShadow = refCue.textShadow;
     cue.wrapLine = refCue.wrapLine;
   }
 

package/lib/util/error.js

@@ -506,6 +506,7 @@ shaka.util.Error.Code = {
    *   <li>Configure the server to accept a HEAD request for the manifest.
    * </ul>
    * <br> error.data[0] is the manifest URI.
+   * <br> error.data[1] is the detected or specified MIME type.
    */
   'UNABLE_TO_GUESS_MANIFEST_TYPE': 4000,
 

package/lib/util/manifest_parser_utils.js

@@ -200,6 +200,7 @@ shaka.util.ManifestParserUtils.AUDIO_CODEC_REGEXPS_ = [
   /^[ae]c-3$/,
   /^ac-4$/,
   /^dts[cex]$/, // DTS Digital Surround (dtsc), DTS Express (dtse), DTS:X (dtsx)
+  /^iamf/,
 ];
 
 

package/lib/util/stream_utils.js

@@ -806,8 +806,12 @@ shaka.util.StreamUtils = class {
     // currently don't support 'fLaC', while 'flac' is supported by most
     // major browsers.
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
-    if (codecs === 'fLaC' && !shaka.util.Platform.isSafari()) {
-      return 'flac';
+    if (codecs.toLowerCase() == 'flac') {
+      if (!shaka.util.Platform.isSafari()) {
+        return 'flac';
+      } else {
+        return 'fLaC';
+      }
     }
 
     // The same is true for 'Opus'.
@@ -1273,8 +1277,6 @@ shaka.util.StreamUtils = class {
    * @return {shaka.extern.Track}
    */
   static html5TextTrackToTrack(textTrack) {
-    const CLOSED_CAPTION_MIMETYPE =
-        shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE;
     const StreamUtils = shaka.util.StreamUtils;
 
     /** @type {shaka.extern.Track} */
@@ -1283,7 +1285,8 @@ shaka.util.StreamUtils = class {
     track.type = 'text';
     track.originalTextId = textTrack.id;
     if (textTrack.kind == 'captions') {
-      track.mimeType = CLOSED_CAPTION_MIMETYPE;
+      // See: https://github.com/shaka-project/shaka-player/issues/6233
+      track.mimeType = 'unknown';
     }
     if (textTrack.kind == 'subtitles') {
       track.mimeType = 'text/vtt';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.3.14",
+  "version": "4.3.16",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -48,7 +48,7 @@
     "karma-spec-reporter": "^0.0.34",
     "karma-webdriver-launcher": "^1.0.8",
     "lcevc_dil.js": "^1.1.20",
-    "less": "https://gitpkg.now.sh/joeyparrish/less.js/packages/less?28c63a43",
+    "less": "^4.2.0",
     "less-plugin-clean-css": "github:austingardner/less-plugin-clean-css#4e9e77bf",
     "material-design-lite": "^1.3.0",
     "mux.js": "^6.2.0",

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/hls/hls_parser_unit.js

@@ -3743,6 +3743,34 @@ describe('HlsParser', () => {
       await verifyError(master, media, error, /* onCreateSegmentIndex= */ true);
     });
 
+    it('if SAMPLE-AES encryption with MSE and mp2t content', async () => {
+      const master = [
+        '#EXTM3U\n',
+        '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1",',
+        'RESOLUTION=960x540,FRAME-RATE=60\n',
+        'video\n',
+      ].join('');
+
+      const media = [
+        '#EXTM3U\n',
+        '#EXT-X-TARGETDURATION:6\n',
+        '#EXT-X-PLAYLIST-TYPE:VOD\n',
+        '#EXT-X-KEY:METHOD=SAMPLE-AES,',
+        'URI="fake",\n',
+        '#EXTINF:5,\n',
+        '#EXT-X-BYTERANGE:121090@616\n',
+        'main.ts',
+      ].join('');
+
+      const error = new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);
+
+      await verifyError(master, media, error, /* onCreateSegmentIndex= */ true);
+    });
+
+
     describe('if required tags are missing', () => {
       /**
        * @param {string} master

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_integration.js

@@ -1197,13 +1197,21 @@ describe('Player', () => {
         'com.widevine.alpha': bogusUrl,
         'com.microsoft.playready': bogusUrl,
       });
-      await player.load('test:sintel-enc_compiled');
+
+      // This load may be interrupted, so ignore errors and don't wait.
+      const loadPromise =
+          player.load('test:sintel-enc_compiled').catch(() => {});
 
       await errorPromise;
       expect(unloadPromise).not.toBeNull();
+
       if (unloadPromise) {
         await unloadPromise;
       }
+
+      // This should be done, and errors ignored.  But don't leave any Promise
+      // unresolved.
+      await loadPromise;
     });
   });  // describe('unloading')
 

package/test/player_load_graph_integration.js

@@ -464,11 +464,11 @@ describe('Player Load Graph', () => {
 
       // Make the two requests one-after-another so that we don't have any idle
       // time between them.
-      const attachRequest = player.attach(video);
-      const loadRequest = player.load('test:sintel');
+      const attach = player.attach(video);
+      const load = player.load('test:sintel');
 
-      await attachRequest;
-      await expectAsync(loadRequest).toBeRejected();
+      await attach;
+      await expectAsync(load).toBeRejected();
 
       // Wait a couple interrupter cycles to allow the player to enter idle
       // state.
@@ -506,10 +506,12 @@ describe('Player Load Graph', () => {
       // Normally the player would initialize media source after attaching to
       // the media element, however since we don't support media source, it
       // should stop at the attach state.
-      player.attach(video, /* initMediaSource= */ true);
+      const attach = player.attach(video, /* initMediaSource= */ true);
 
       const event = await spyIsCalled(stateIdleSpy);
       expect(event.state).toBe('attach');
+
+      await attach;
     });
 
     it('loading ignores media source path', async () => {
@@ -518,10 +520,12 @@ describe('Player Load Graph', () => {
       // Normally the player would load content like this with the media source
       // path, but since we don't have media source support, it should use the
       // src= path.
-      player.load(SMALL_MP4_CONTENT_URI);
+      const load = player.load(SMALL_MP4_CONTENT_URI);
 
       const event = await spyIsCalled(stateIdleSpy);
       expect(event.state).toBe('src-equals');
+
+      await load;
     });
 
     it('unloading ignores init media source flag', async () => {
@@ -531,10 +535,12 @@ describe('Player Load Graph', () => {
       // Normally the player would try to go to the media source state because
       // we are saying to initialize media source after unloading, but since we
       // don't have media source, it should stop at the attach state.
-      player.unload(/* initMediaSource= */ true);
+      const unload = player.unload(/* initMediaSource= */ true);
 
       const event = await spyIsCalled(stateIdleSpy);
       expect(event.state).toBe('attach');
+
+      await unload;
     });
   });
 

package/test/player_src_equals_integration.js

@@ -114,8 +114,8 @@ describe('Player Src Equals', () => {
     expect(video.currentTime).toBeLessThan(2.0);
 
     // Trigger a seek and then wait for the seek to take effect.
-    // This seek target is very close to the duration of the video.
-    video.currentTime = 10;
+    // This seek target is very close to the duration of the video (10.01s).
+    video.currentTime = 9.5;
     await waiter.waitForMovementOrFailOnTimeout(video, /* timeout= */10);
 
     // Make sure the playhead is roughly where we expect it to be after

package/test/player_unit.js

@@ -559,15 +559,21 @@ describe('Player', () => {
     });
 
     describe('when config.streaming.preferNativeHls is set to true', () => {
-      beforeEach(() => {
+      beforeAll(() => {
         shaka.media.ManifestParser.registerParserByMime(
             'application/x-mpegurl',
             () => new shaka.test.FakeManifestParser(manifest));
       });
 
+      afterAll(() => {
+        // IMPORTANT: restore the ORIGINAL parser.  DO NOT just unregister the
+        // fake!
+        shaka.media.ManifestParser.registerParserByMime(
+            'application/x-mpegurl',
+            () => new shaka.hls.HlsParser());
+      });
+
       afterEach(() => {
-        shaka.media.ManifestParser.unregisterParserByMime(
-            'application/x-mpegurl');
         video.canPlayType.calls.reset();
       });
 
@@ -3513,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);
@@ -3535,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 () => {