shaka-player 4.3.11 → 4.4.1

package/test/media/media_source_engine_unit.js

@@ -42,7 +42,13 @@ describe('MediaSourceEngine', () => {
   const originalCreateMediaSource =
       // eslint-disable-next-line no-restricted-syntax
       shaka.media.MediaSourceEngine.prototype.createMediaSource;
-  const originalTransmuxer = shaka.media.Transmuxer;
+
+  const originalFindTransmuxer =
+      shaka.transmuxer.TransmuxerEngine.findTransmuxer;
+  const originalConvertCodecs =
+      shaka.transmuxer.TransmuxerEngine.convertCodecs;
+  const originalIsSupported =
+      shaka.transmuxer.TransmuxerEngine.isSupported;
 
   // Jasmine Spies don't handle toHaveBeenCalledWith well with objects, so use
   // some numbers instead.
@@ -50,11 +56,14 @@ describe('MediaSourceEngine', () => {
   const buffer2 = /** @type {!ArrayBuffer} */ (/** @type {?} */ (2));
   const buffer3 = /** @type {!ArrayBuffer} */ (/** @type {?} */ (3));
 
-  const fakeVideoStream = {mimeType: 'video/foo', drmInfos: []};
-  const fakeAudioStream = {mimeType: 'audio/foo', drmInfos: []};
-  const fakeTextStream = {mimeType: 'text/foo', drmInfos: []};
+  const fakeVideoStream = {mimeType: 'video/mp4', drmInfos: [{}]};
+  const fakeAudioStream = {mimeType: 'audio/mp4', drmInfos: []};
+  const fakeTextStream = {mimeType: 'text/mp4', drmInfos: []};
   const fakeTransportStream = {mimeType: 'tsMimetype', drmInfos: []};
 
+  /** @type {shaka.extern.Stream} */
+  const fakeStream = shaka.test.StreamingEngineUtil.createMockVideoStream(1);
+
   let audioSourceBuffer;
   let videoSourceBuffer;
   let mockVideo;
@@ -73,6 +82,10 @@ describe('MediaSourceEngine', () => {
 
   /** @type {!jasmine.Spy} */
   let createMediaSourceSpy;
+  /** @type {!jasmine.Spy} */
+  let requiresEncryptionInfoInAllInitSegmentsSpy;
+  /** @type {!jasmine.Spy} */
+  let fakeEncryptionSpy;
 
   /** @type {!shaka.media.MediaSourceEngine} */
   let mediaSourceEngine;
@@ -89,7 +102,12 @@ describe('MediaSourceEngine', () => {
 
   afterAll(() => {
     window.MediaSource.isTypeSupported = originalIsTypeSupported;
-    shaka.media.Transmuxer = originalTransmuxer;
+    shaka.transmuxer.TransmuxerEngine.findTransmuxer =
+        originalFindTransmuxer;
+    shaka.transmuxer.TransmuxerEngine.convertCodecs =
+        originalConvertCodecs;
+    shaka.transmuxer.TransmuxerEngine.isSupported =
+        originalIsSupported;
   });
 
   beforeEach(/** @suppress {invalidCasts} */ () => {
@@ -101,17 +119,18 @@ describe('MediaSourceEngine', () => {
       return type == 'audio' ? audioSourceBuffer : videoSourceBuffer;
     });
     mockTransmuxer = new shaka.test.FakeTransmuxer();
-
-    // eslint-disable-next-line no-restricted-syntax
-    shaka.media.Transmuxer = /** @type {?} */ (function() {
-      return /** @type {?} */ (mockTransmuxer);
-    });
-    shaka.media.Transmuxer.convertCodecs = (mimeType, contentType) => {
-      return 'video/mp4; codecs="avc1.42E01E"';
-    };
-    shaka.media.Transmuxer.isSupported = (mimeType, contentType) => {
-      return mimeType == 'tsMimetype';
-    };
+    shaka.transmuxer.TransmuxerEngine.findTransmuxer =
+        (mimeType) => {
+          return () => mockTransmuxer;
+        };
+    shaka.transmuxer.TransmuxerEngine.convertCodecs =
+        (mimeType, contentType) => {
+          return 'video/mp4; codecs="avc1.42E01E"';
+        };
+    shaka.transmuxer.TransmuxerEngine.isSupported =
+        (mimeType, contentType) => {
+          return mimeType == 'tsMimetype';
+        };
 
     shaka.text.TextEngine = createMockTextEngineCtor();
 
@@ -124,6 +143,12 @@ describe('MediaSourceEngine', () => {
     shaka.media.MediaSourceEngine.prototype.createMediaSource =
         Util.spyFunc(createMediaSourceSpy);
 
+    requiresEncryptionInfoInAllInitSegmentsSpy = spyOn(shaka.util.Platform,
+        'requiresEncryptionInfoInAllInitSegments').and.returnValue(false);
+
+    fakeEncryptionSpy = spyOn(shaka.media.ContentWorkarounds, 'fakeEncryption')
+        .and.callFake((data) => data + 100);
+
     // MediaSourceEngine uses video to:
     //  - set src attribute
     //  - read error codes when operations fail
@@ -254,8 +279,8 @@ describe('MediaSourceEngine', () => {
       initObject.set(ContentType.AUDIO, fakeAudioStream);
       initObject.set(ContentType.VIDEO, fakeVideoStream);
       await mediaSourceEngine.init(initObject, false);
-      expect(mockMediaSource.addSourceBuffer).toHaveBeenCalledWith('audio/foo');
-      expect(mockMediaSource.addSourceBuffer).toHaveBeenCalledWith('video/foo');
+      expect(mockMediaSource.addSourceBuffer).toHaveBeenCalledWith('audio/mp4');
+      expect(mockMediaSource.addSourceBuffer).toHaveBeenCalledWith('video/mp4');
       expect(shaka.text.TextEngine).not.toHaveBeenCalled();
     });
 
@@ -381,9 +406,45 @@ describe('MediaSourceEngine', () => {
       await mediaSourceEngine.init(initObject, false);
     });
 
+    it('should apply fake encryption by default', async () => {
+      requiresEncryptionInfoInAllInitSegmentsSpy.and.returnValue(true);
+
+      const p = mediaSourceEngine.appendBuffer(
+          ContentType.VIDEO, buffer, null, fakeStream,
+          /* hasClosedCaptions= */ false);
+
+      expect(fakeEncryptionSpy).toHaveBeenCalled();
+
+      expect(videoSourceBuffer.appendBuffer)
+          .toHaveBeenCalledWith((buffer + 100));
+      videoSourceBuffer.updateend();
+
+      await p;
+    });
+
+    it('should not apply fake encryption when config is off', async () => {
+      requiresEncryptionInfoInAllInitSegmentsSpy.and.returnValue(true);
+
+      const config = shaka.util.PlayerConfiguration.createDefault().mediaSource;
+      config.insertFakeEncryptionInInit = false;
+
+      mediaSourceEngine.configure(config);
+
+      const p = mediaSourceEngine.appendBuffer(
+          ContentType.VIDEO, buffer, null, fakeStream,
+          /* hasClosedCaptions= */ false);
+
+      expect(fakeEncryptionSpy).not.toHaveBeenCalled();
+
+      expect(videoSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
+      videoSourceBuffer.updateend();
+
+      await p;
+    });
+
     it('appends the given data', async () => {
       const p = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false);
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
       audioSourceBuffer.updateend();
@@ -392,15 +453,16 @@ describe('MediaSourceEngine', () => {
 
     it('rejects promise when operation throws', async () => {
       audioSourceBuffer.appendBuffer.and.throwError('fail!');
-      mockVideo.error = {code: 5};
+      mockVideo.error = {code: 5, message: 'something failed'};
       const expected = Util.jasmineError(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
           shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
-          jasmine.objectContaining({message: 'fail!'})));
+          jasmine.objectContaining({message: 'fail!'}),
+          {code: 5, message: 'something failed'}));
       await expectAsync(
           mediaSourceEngine.appendBuffer(
-              ContentType.AUDIO, buffer, null,
+              ContentType.AUDIO, buffer, null, fakeStream,
               /* hasClosedCaptions= */ false))
           .toBeRejectedWith(expected);
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
@@ -419,7 +481,7 @@ describe('MediaSourceEngine', () => {
           ContentType.AUDIO));
       await expectAsync(
           mediaSourceEngine.appendBuffer(
-              ContentType.AUDIO, buffer, null,
+              ContentType.AUDIO, buffer, null, fakeStream,
               /* hasClosedCaptions= */ false))
           .toBeRejectedWith(expected);
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
@@ -440,10 +502,10 @@ describe('MediaSourceEngine', () => {
           ContentType.AUDIO));
 
       const p1 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false);
       const p2 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false);
       audioSourceBuffer.updateend();
       await expectAsync(p1).toBeResolved();
@@ -453,7 +515,7 @@ describe('MediaSourceEngine', () => {
     it('rejects the promise if this operation fails async', async () => {
       mockVideo.error = {code: 5};
       const p = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false);
       audioSourceBuffer.error();
       audioSourceBuffer.updateend();
@@ -470,11 +532,11 @@ describe('MediaSourceEngine', () => {
     it('queues operations on a single SourceBuffer', async () => {
       /** @type {!shaka.test.StatusPromise} */
       const p1 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p2 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer2, null,
+          ContentType.AUDIO, buffer2, null, fakeStream,
           /* hasClosedCaptions= */ false));
 
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
@@ -493,15 +555,15 @@ describe('MediaSourceEngine', () => {
     it('queues operations independently for different types', async () => {
       /** @type {!shaka.test.StatusPromise} */
       const p1 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p2 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer2, null,
+          ContentType.AUDIO, buffer2, null, fakeStream,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p3 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer3, null,
+          ContentType.VIDEO, buffer3, null, fakeStream,
           /* hasClosedCaptions= */ false));
 
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
@@ -536,13 +598,13 @@ describe('MediaSourceEngine', () => {
       });
 
       const p1 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false);
       const p2 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer2, null,
+          ContentType.AUDIO, buffer2, null, fakeStream,
           /* hasClosedCaptions= */ false);
       const p3 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer3, null,
+          ContentType.AUDIO, buffer3, null, fakeStream,
           /* hasClosedCaptions= */ false);
 
       await expectAsync(p1).toBeResolved();
@@ -558,12 +620,13 @@ describe('MediaSourceEngine', () => {
       expect(mockTextEngine.appendBuffer).not.toHaveBeenCalled();
       const reference = dummyReference(0, 10);
       await mediaSourceEngine.appendBuffer(
-          ContentType.TEXT, data, reference, /* hasClosedCaptions= */ false);
+          ContentType.TEXT, data, reference, fakeStream,
+          /* hasClosedCaptions= */ false);
       expect(mockTextEngine.appendBuffer).toHaveBeenCalledWith(
           data, 0, 10);
     });
 
-    it('appends transmuxed data and captions', async () => {
+    it('appends transmuxed data', async () => {
       const initObject = new Map();
       initObject.set(ContentType.VIDEO, fakeTransportStream);
 
@@ -576,9 +639,8 @@ describe('MediaSourceEngine', () => {
       const init = async () => {
         await mediaSourceEngine.init(initObject, false);
         await mediaSourceEngine.appendBuffer(
-            ContentType.VIDEO, buffer, null,
+            ContentType.VIDEO, buffer, null, fakeStream,
             /* hasClosedCaptions= */ false);
-        expect(mockTextEngine.storeAndAppendClosedCaptions).toHaveBeenCalled();
         expect(videoSourceBuffer.appendBuffer).toHaveBeenCalled();
       };
 
@@ -593,38 +655,6 @@ describe('MediaSourceEngine', () => {
       await Promise.all([init(), delay()]);
     });
 
-    it('appends only transmuxed data without embedded text', async () => {
-      const initObject = new Map();
-      initObject.set(ContentType.VIDEO, fakeTransportStream);
-
-      const output = {
-        data: new Uint8Array(1),
-        captions: [],
-      };
-      mockTransmuxer.transmux.and.returnValue(Promise.resolve(output));
-
-      const init = async () => {
-        await mediaSourceEngine.init(initObject, false);
-        await mediaSourceEngine.appendBuffer(
-            ContentType.VIDEO, buffer, null,
-            /* hasClosedCaptions= */ false);
-        expect(mockTextEngine.storeAndAppendClosedCaptions)
-            .not.toHaveBeenCalled();
-        expect(videoSourceBuffer.appendBuffer)
-            .toHaveBeenCalledWith(output.data);
-      };
-
-      // The 'updateend' event fires once the data is done appending to the
-      // media source.  We only append to the media source once transmuxing is
-      // done.  Since transmuxing is done using Promises, we need to delay the
-      // event until MediaSourceEngine calls appendBuffer.
-      const delay = async () => {
-        await Util.shortDelay();
-        videoSourceBuffer.updateend();
-      };
-      await Promise.all([init(), delay()]);
-    });
-
     it('appends parsed closed captions from CaptionParser', async () => {
       const initObject = new Map();
       initObject.set(ContentType.VIDEO, fakeVideoStream);
@@ -637,7 +667,7 @@ describe('MediaSourceEngine', () => {
 
       // Initialize the closed caption parser.
       const appendInit = mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, null,
+          ContentType.VIDEO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ true);
       // In MediaSourceEngine, appendBuffer() is async and Promise-based, but
       // at the browser level, it's event-based.
@@ -653,7 +683,8 @@ describe('MediaSourceEngine', () => {
       // Parse and append the closed captions embedded in video stream.
       const reference = dummyReference(0, 1000);
       const appendVideo = mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, reference, true);
+          ContentType.VIDEO, buffer, reference, fakeStream,
+          /* hasClosedCaptions= */ true);
       videoSourceBuffer.updateend();
       await appendVideo;
 
@@ -665,8 +696,7 @@ describe('MediaSourceEngine', () => {
       initObject.set(ContentType.VIDEO, fakeVideoStream);
       videoSourceBuffer.mode = 'sequence';
 
-      await mediaSourceEngine.init(
-          initObject, /* forceTransmux= */ false, /* sequenceMode= */ true);
+      await mediaSourceEngine.init(initObject, /* sequenceMode= */ true);
 
       expect(videoSourceBuffer.timestampOffset).toBe(0);
 
@@ -675,67 +705,14 @@ describe('MediaSourceEngine', () => {
       const reference = dummyReference(0, 1000);
       reference.startTime = 0.50;
       const appendVideo = mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, reference, /* hasClosedCaptions= */ false,
+          ContentType.VIDEO, buffer, reference, fakeStream,
+          /* hasClosedCaptions= */ false,
           /* seeked= */ false, /* adaptation= */ true);
       videoSourceBuffer.updateend();
       await appendVideo;
 
       expect(videoSourceBuffer.timestampOffset).toBe(0.50);
     });
-
-    it('calls abort before setting timestampOffset', async () => {
-      const simulateUpdate = async () => {
-        await Util.shortDelay();
-        videoSourceBuffer.updateend();
-      };
-      const initObject = new Map();
-      initObject.set(ContentType.VIDEO, fakeVideoStream);
-
-      await mediaSourceEngine.init(
-          initObject, /* forceTransmux= */ false, /* sequenceMode= */ true);
-
-      // First, mock the scenario where timestampOffset is set to help align
-      // text segments. In this case, SourceBuffer mode is still 'segments'.
-      let reference = dummyReference(0, 1000);
-      let appendVideo = mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, reference, /* hasClosedCaptions= */ false);
-      // Wait for the first appendBuffer(), in segments mode.
-      await simulateUpdate();
-      // Next, wait for abort(), used to reset the parser state for a safe
-      // setting of timestampOffset. Shaka fakes an updateend event on abort(),
-      // so simulateUpdate() isn't needed.
-      await Util.shortDelay();
-      // Next, wait for remove(), used to clear the SourceBuffer from the
-      // initial append.
-      await simulateUpdate();
-      // Next, wait for the second appendBuffer(), falling through to normal
-      // operations.
-      await simulateUpdate();
-      // Lastly, wait for the function-scoped MediaSourceEngine#appendBuffer()
-      // promise to resolve.
-      await appendVideo;
-      expect(videoSourceBuffer.abort).toHaveBeenCalledTimes(1);
-
-      // Second, mock the scenario where timestampOffset is set during an
-      // unbuffered seek or adaptation. SourceBuffer mode is 'sequence' now.
-      reference = dummyReference(0, 1000);
-      appendVideo = mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, reference, /* hasClosedCaptions= */ false,
-          /* seeked= */ true);
-      // First, wait for abort(), used to reset the parser state for a safe
-      // setting of timestampOffset.
-      await Util.shortDelay();
-      // The subsequent setTimestampOffset() fakes an updateend event for us, so
-      // simulateUpdate() isn't needed.
-      await Util.shortDelay();
-      // Next, wait for the second appendBuffer(), falling through to normal
-      // operations.
-      await simulateUpdate();
-      // Lastly, wait for the function-scoped MediaSourceEngine#appendBuffer()
-      // promise to resolve.
-      await appendVideo;
-      expect(videoSourceBuffer.abort).toHaveBeenCalledTimes(2);
-    });
   });
 
   describe('remove', () => {
@@ -765,7 +742,8 @@ describe('MediaSourceEngine', () => {
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
           shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
-          jasmine.objectContaining({message: 'fail!'})));
+          jasmine.objectContaining({message: 'fail!'}),
+          {code: 5}));
       await expectAsync(mediaSourceEngine.remove(ContentType.AUDIO, 1, 5))
           .toBeRejectedWith(expected);
       expect(audioSourceBuffer.remove).toHaveBeenCalledWith(1, 5);
@@ -930,7 +908,9 @@ describe('MediaSourceEngine', () => {
           /* timestampOffset= */ 10,
           /* appendWindowStart= */ 0,
           /* appendWindowEnd= */ 20,
-          /* sequenceMode= */ false);
+          /* sequenceMode= */ false,
+          fakeStream,
+          /* streamsByType= */ new Map());
       expect(mockTextEngine.setTimestampOffset).toHaveBeenCalledWith(10);
       expect(mockTextEngine.setAppendWindow).toHaveBeenCalledWith(0, 20);
     });
@@ -954,11 +934,11 @@ describe('MediaSourceEngine', () => {
     it('waits for all previous operations to complete', async () => {
       /** @type {!shaka.test.StatusPromise} */
       const p1 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p2 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, null,
+          ContentType.VIDEO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p3 = new shaka.test.StatusPromise(mediaSourceEngine.endOfStream());
@@ -982,11 +962,11 @@ describe('MediaSourceEngine', () => {
       /** @type {!Promise} */
       const p1 = mediaSourceEngine.endOfStream();
       mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
       mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
       mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer2, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
 
       // endOfStream hasn't been called yet because blocking multiple queues
       // takes an extra tick, even when they are empty.
@@ -1014,7 +994,7 @@ describe('MediaSourceEngine', () => {
       /** @type {!Promise} */
       const p1 = mediaSourceEngine.endOfStream();
       mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
 
       expect(audioSourceBuffer.appendBuffer).not.toHaveBeenCalled();
 
@@ -1045,11 +1025,11 @@ describe('MediaSourceEngine', () => {
     it('waits for all previous operations to complete', async () => {
       /** @type {!shaka.test.StatusPromise} */
       const p1 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p2 = new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, buffer, null,
+          ContentType.VIDEO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false));
       /** @type {!shaka.test.StatusPromise} */
       const p3 =
@@ -1074,11 +1054,11 @@ describe('MediaSourceEngine', () => {
       /** @type {!Promise} */
       const p1 = mediaSourceEngine.setDuration(100);
       mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
       mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
       mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer2, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
 
       // The setter hasn't been called yet because blocking multiple queues
       // takes an extra tick, even when they are empty.
@@ -1107,7 +1087,7 @@ describe('MediaSourceEngine', () => {
       /** @type {!Promise} */
       const p1 = mediaSourceEngine.setDuration(100);
       mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
 
       expect(audioSourceBuffer.appendBuffer).not.toHaveBeenCalled();
 
@@ -1146,9 +1126,9 @@ describe('MediaSourceEngine', () => {
       // This is tested because shrinking duration generates 'updateend'
       // events, and we want to show that the queue still operates correctly.
       const a1 = mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
       const a2 = mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
 
       await p1;
       await a1;
@@ -1168,9 +1148,9 @@ describe('MediaSourceEngine', () => {
 
     it('waits for all operations to complete', async () => {
       mediaSourceEngine.appendBuffer(ContentType.AUDIO, buffer, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
       mediaSourceEngine.appendBuffer(ContentType.VIDEO, buffer, null,
-          /* hasClosedCaptions= */ false);
+          fakeStream, /* hasClosedCaptions= */ false);
 
       /** @type {!shaka.test.StatusPromise} */
       const d = new shaka.test.StatusPromise(mediaSourceEngine.destroy());
@@ -1187,7 +1167,7 @@ describe('MediaSourceEngine', () => {
 
     it('resolves even when a pending operation fails', async () => {
       const p = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false);
       const d = mediaSourceEngine.destroy();
 
@@ -1212,10 +1192,10 @@ describe('MediaSourceEngine', () => {
 
     it('cancels operations that have not yet started', async () => {
       mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false);
       const rejected = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer2, null,
+          ContentType.AUDIO, buffer2, null, fakeStream,
           /* hasClosedCaptions= */ false);
       // Create the expectation first so we don't get unhandled rejection errors
       const expected = expectAsync(rejected).toBeRejected();
@@ -1239,7 +1219,7 @@ describe('MediaSourceEngine', () => {
 
     it('cancels blocking operations that have not yet started', async () => {
       const p1 = mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, buffer, null,
+          ContentType.AUDIO, buffer, null, fakeStream,
           /* hasClosedCaptions= */ false);
       const p2 = mediaSourceEngine.endOfStream();
       const d = mediaSourceEngine.destroy();
@@ -1254,7 +1234,7 @@ describe('MediaSourceEngine', () => {
       const d = mediaSourceEngine.destroy();
       await expectAsync(
           mediaSourceEngine.appendBuffer(
-              ContentType.AUDIO, buffer, null,
+              ContentType.AUDIO, buffer, null, fakeStream,
               /* hasClosedCaptions= */ false))
           .toBeRejected();
       await d;
@@ -1328,7 +1308,7 @@ describe('MediaSourceEngine', () => {
       mockTextEngine = jasmine.createSpyObj('TextEngine', [
         'initParser', 'destroy', 'appendBuffer', 'remove', 'setTimestampOffset',
         'setAppendWindow', 'bufferStart', 'bufferEnd', 'bufferedAheadOf',
-        'storeAndAppendClosedCaptions', 'convertMuxjsCaptionsToShakaCaptions',
+        'storeAndAppendClosedCaptions',
       ]);
 
       const resolve = () => Promise.resolve();

package/test/media/playhead_unit.js

@@ -134,6 +134,9 @@ describe('Playhead', () => {
       minBufferTime: 10,
       offlineSessionIds: [],
       sequenceMode: false,
+      ignoreManifestTimestampsInSegmentsMode: false,
+      type: 'UNKNOWN',
+      serviceDescription: null,
     };
 
     config = shaka.util.PlayerConfiguration.createDefault().streaming;

package/test/media/presentation_timeline_unit.js

@@ -114,6 +114,57 @@ describe('PresentationTimeline', () => {
     return timeline;
   }
 
+  const makeTimeRange = (startTime, endTime) => {
+    return {
+      start: startTime,
+      end: endTime,
+    };
+  };
+
+  describe('notifyTimeRange', () => {
+    it('calculates time based on segment times when available', () => {
+      const timeline = makeLiveTimeline(/* availability= */ 20);
+
+      const timeRanges = [
+        makeTimeRange(0, 10),
+        makeTimeRange(10, 20),
+        makeTimeRange(20, 30),
+        makeTimeRange(30, 40),
+        makeTimeRange(40, 50),
+      ];
+
+
+      // In spite of the current time, the explicit segment times will decide
+      // the availability window.
+      // See https://github.com/shaka-project/shaka-player/issues/999
+      setElapsed(1000);
+      timeline.notifyTimeRange(timeRanges, 0);
+
+      // last segment time (50) - availability (20)
+      expect(timeline.getSegmentAvailabilityStart()).toBe(30);
+    });
+
+    it('ignores segment times when configured to', () => {
+      const timeline = makeLiveTimeline(
+          /* availability= */ 20, /* drift= */ 0,
+          /* autoCorrectDrift= */ false);
+
+      const timeRanges = [
+        makeTimeRange(0, 10),
+        makeTimeRange(10, 20),
+        makeTimeRange(20, 30),
+        makeTimeRange(30, 40),
+        makeTimeRange(40, 50),
+      ];
+
+      setElapsed(100);
+      timeline.notifyTimeRange(timeRanges, 0);
+
+      // now (100) - max segment duration (10) - availability start time (0)
+      expect(timeline.getSegmentAvailabilityEnd()).toBe(90);
+    });
+  });
+
   describe('getSegmentAvailabilityStart', () => {
     it('returns 0 for VOD and IPR', () => {
       const timeline1 = makeVodTimeline(/* duration= */ 60);