shaka-player 4.3.10 → 4.4.0

package/test/media/media_source_engine_integration.js

@@ -18,6 +18,11 @@ describe('MediaSourceEngine', () => {
   let mediaSourceEngine;
   let generators;
   let metadata;
+
+  /** @type {shaka.extern.Stream} */
+  const fakeStream = shaka.test.StreamingEngineUtil.createMockVideoStream(1);
+  const fakeTsStream =
+      shaka.test.StreamingEngineUtil.createMockVideoStream(1, 'video/mp2t');
   // TODO: add text streams to MSE integration tests
 
   const mp4CeaCue0 = jasmine.objectContaining({
@@ -38,21 +43,51 @@ describe('MediaSourceEngine', () => {
     startTime: Util.closeTo(0.767, 0.001),
     endTime: Util.closeTo(4.972, 0.001),
     textAlign: Cue.textAlign.CENTER,
-    payload: 'These are 608 captions\n(top left)',
+    nestedCues: [
+      jasmine.objectContaining({
+        payload: 'These are 608 captions',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+      jasmine.objectContaining({lineBreak: true}),
+      jasmine.objectContaining({
+        payload: '(top left)',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+    ],
   });
 
   const tsCeaCue1 = jasmine.objectContaining({
     startTime: Util.closeTo(5.305, 0.001),
     endTime: Util.closeTo(11.979, 0.001),
     textAlign: Cue.textAlign.CENTER,
-    payload: 'These are 608 captions\n(middle)',
+    nestedCues: [
+      jasmine.objectContaining({
+        payload: 'These are 608 captions',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+      jasmine.objectContaining({lineBreak: true}),
+      jasmine.objectContaining({
+        payload: '(middle)',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+    ],
   });
 
   const tsCeaCue2 = jasmine.objectContaining({
     startTime: Util.closeTo(12.312, 0.001),
     endTime: Util.closeTo(19.319, 0.001),
     textAlign: Cue.textAlign.CENTER,
-    payload: 'These are 608 captions\n(bottom left)',
+    nestedCues: [
+      jasmine.objectContaining({
+        payload: 'These are 608 captions',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+      jasmine.objectContaining({lineBreak: true}),
+      jasmine.objectContaining({
+        payload: '(bottom left)',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+    ],
   });
 
   // The same segments as above, but offset by 40 seconds (yes, 40), which is
@@ -61,21 +96,51 @@ describe('MediaSourceEngine', () => {
     startTime: Util.closeTo(40.767, 0.001),
     endTime: Util.closeTo(44.972, 0.001),
     textAlign: Cue.textAlign.CENTER,
-    payload: 'These are 608 captions\n(top left)',
+    nestedCues: [
+      jasmine.objectContaining({
+        payload: 'These are 608 captions',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+      jasmine.objectContaining({lineBreak: true}),
+      jasmine.objectContaining({
+        payload: '(top left)',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+    ],
   });
 
   const tsCeaCue4 = jasmine.objectContaining({
     startTime: Util.closeTo(45.305, 0.001),
     endTime: Util.closeTo(51.979, 0.001),
     textAlign: Cue.textAlign.CENTER,
-    payload: 'These are 608 captions\n(middle)',
+    nestedCues: [
+      jasmine.objectContaining({
+        payload: 'These are 608 captions',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+      jasmine.objectContaining({lineBreak: true}),
+      jasmine.objectContaining({
+        payload: '(middle)',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+    ],
   });
 
   const tsCeaCue5 = jasmine.objectContaining({
     startTime: Util.closeTo(52.312, 0.001),
     endTime: Util.closeTo(59.319, 0.001),
     textAlign: Cue.textAlign.CENTER,
-    payload: 'These are 608 captions\n(bottom left)',
+    nestedCues: [
+      jasmine.objectContaining({
+        payload: 'These are 608 captions',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+      jasmine.objectContaining({lineBreak: true}),
+      jasmine.objectContaining({
+        payload: '(bottom left)',
+        textAlign: Cue.textAlign.CENTER,
+      }),
+    ],
   });
 
   /**
@@ -126,7 +191,7 @@ describe('MediaSourceEngine', () => {
     const segment = generators[type].getInitSegment(Date.now() / 1000);
     const reference = null;
     return mediaSourceEngine.appendBuffer(
-        type, segment, reference, /* hasClosedCaptions= */ false);
+        type, segment, reference, fakeStream, /* hasClosedCaptions= */ false);
   }
 
   function append(type, segmentNumber) {
@@ -134,10 +199,10 @@ describe('MediaSourceEngine', () => {
         .getSegment(segmentNumber, Date.now() / 1000);
     const reference = dummyReference(type, segmentNumber);
     return mediaSourceEngine.appendBuffer(
-        type, segment, reference, /* hasClosedCaptions= */ false);
+        type, segment, reference, fakeStream, /* hasClosedCaptions= */ false);
   }
 
-  function appendWithSeek(type, segmentNumber) {
+  function appendWithSeekAndClosedCaptions(type, segmentNumber) {
     const segment = generators[type]
         .getSegment(segmentNumber, Date.now() / 1000);
     const reference = dummyReference(type, segmentNumber);
@@ -145,7 +210,8 @@ describe('MediaSourceEngine', () => {
         type,
         segment,
         reference,
-        /* hasClosedCaptions= */ false,
+        fakeStream,
+        /* hasClosedCaptions= */ true,
         /* seeked= */ true);
   }
 
@@ -153,7 +219,7 @@ describe('MediaSourceEngine', () => {
     const segment = generators[type].getInitSegment(Date.now() / 1000);
     const reference = null;
     return mediaSourceEngine.appendBuffer(
-        type, segment, reference, /* hasClosedCaptions= */ true);
+        type, segment, reference, fakeStream, /* hasClosedCaptions= */ true);
   }
 
   function appendWithClosedCaptions(type, segmentNumber) {
@@ -161,7 +227,7 @@ describe('MediaSourceEngine', () => {
         .getSegment(segmentNumber, Date.now() / 1000);
     const reference = dummyReference(type, segmentNumber);
     return mediaSourceEngine.appendBuffer(
-        type, segment, reference, /* hasClosedCaptions= */ true);
+        type, segment, reference, fakeStream, /* hasClosedCaptions= */ true);
   }
 
   function buffered(type, time) {
@@ -383,7 +449,9 @@ describe('MediaSourceEngine', () => {
         /* timestampOffset= */ 0,
         /* appendWindowStart= */ 5,
         /* appendWindowEnd= */ 18,
-        /* sequenceMode= */ false);
+        /* sequenceMode= */ false,
+        fakeStream,
+        /* streamsByType= */ new Map());
     expect(buffered(ContentType.VIDEO, 0)).toBe(0);
     await append(ContentType.VIDEO, 0);
     expect(bufferStart(ContentType.VIDEO)).toBeCloseTo(5, 1);
@@ -402,7 +470,9 @@ describe('MediaSourceEngine', () => {
         /* timestampOffset= */ 100,
         /* appendWindowStart= */ 5,
         /* appendWindowEnd= */ 18,
-        /* sequenceMode= */ true);
+        /* sequenceMode= */ true,
+        fakeStream,
+        /* streamsByType= */ new Map());
     expect(buffered(ContentType.VIDEO, 0)).toBe(0);
     await append(ContentType.VIDEO, 0);
     expect(bufferStart(ContentType.VIDEO)).toBeCloseTo(5, 1);
@@ -422,7 +492,9 @@ describe('MediaSourceEngine', () => {
         /* timestampOffset= */ 0,
         /* appendWindowStart= */ 0,
         /* appendWindowEnd= */ 20,
-        /* sequenceMode= */ false);
+        /* sequenceMode= */ false,
+        fakeStream,
+        /* streamsByType= */ new Map());
     await append(ContentType.VIDEO, 0);
     await append(ContentType.VIDEO, 1);
     expect(bufferStart(ContentType.VIDEO)).toBeCloseTo(0, 1);
@@ -435,7 +507,9 @@ describe('MediaSourceEngine', () => {
         /* timestampOffset= */ 15,
         /* appendWindowStart= */ 20,
         /* appendWindowEnd= */ 35,
-        /* sequenceMode= */ false);
+        /* sequenceMode= */ false,
+        fakeStream,
+        /* streamsByType= */ new Map());
     await append(ContentType.VIDEO, 0);
     await append(ContentType.VIDEO, 1);
     expect(bufferStart(ContentType.VIDEO)).toBeCloseTo(0, 1);
@@ -450,15 +524,15 @@ describe('MediaSourceEngine', () => {
     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);
+    const config = shaka.util.PlayerConfiguration.createDefault().mediaSource;
+    config.forceTransmux = true;
+    mediaSourceEngine.configure(config);
+    await mediaSourceEngine.init(initObject);
     mediaSourceEngine.setSelectedClosedCaptionId('CC1');
 
-    await append(ContentType.VIDEO, 0);
+    await appendWithClosedCaptions(ContentType.VIDEO, 0);
 
     expect(textDisplayer.appendSpy).toHaveBeenCalledTimes(3);
-
     expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue0]);
     expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue1]);
     expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue2]);
@@ -472,12 +546,13 @@ describe('MediaSourceEngine', () => {
     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);
+    const config = shaka.util.PlayerConfiguration.createDefault().mediaSource;
+    config.forceTransmux = true;
+    mediaSourceEngine.configure(config);
+    await mediaSourceEngine.init(initObject);
     mediaSourceEngine.setSelectedClosedCaptionId('CC1');
 
-    await append(ContentType.VIDEO, 2);
+    await appendWithClosedCaptions(ContentType.VIDEO, 2);
 
     expect(textDisplayer.appendSpy).toHaveBeenCalledTimes(3);
     expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue3]);
@@ -485,7 +560,7 @@ describe('MediaSourceEngine', () => {
     expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue5]);
 
     textDisplayer.appendSpy.calls.reset();
-    await appendWithSeek(ContentType.VIDEO, 0);
+    await appendWithSeekAndClosedCaptions(ContentType.VIDEO, 0);
 
     expect(textDisplayer.appendSpy).toHaveBeenCalledTimes(3);
     expect(textDisplayer.appendSpy).toHaveBeenCalledWith([tsCeaCue0]);
@@ -501,15 +576,16 @@ describe('MediaSourceEngine', () => {
     const initObject = new Map();
     initObject.set(videoType, getFakeStream(metadata.video));
 
-    await mediaSourceEngine.init(
-        initObject, /* forceTransmux= */ false, /* sequenceMode= */ true);
+    await mediaSourceEngine.init(initObject, /* sequenceMode= */ true);
     await mediaSourceEngine.setDuration(presentationDuration);
     await mediaSourceEngine.setStreamProperties(
         videoType,
         /* timestampOffset= */ 0,
         /* appendWindowStart= */ 0,
         /* appendWindowEnd= */ Infinity,
-        /* sequenceMode= */ true);
+        /* sequenceMode= */ true,
+        fakeTsStream,
+        /* streamsByType= */ new Map());
 
     const segment = generators[videoType].getSegment(0, Date.now() / 1000);
     const partialSegmentLength = Math.floor(segment.byteLength / 3);
@@ -518,15 +594,16 @@ describe('MediaSourceEngine', () => {
         segment, /* offset= */ 0, /* length= */ partialSegmentLength);
     let reference = dummyReference(videoType, 0);
     await mediaSourceEngine.appendBuffer(
-        videoType, partialSegment, reference, /* hasClosedCaptions= */ false);
+        videoType, partialSegment, reference, fakeStream,
+        /* hasClosedCaptions= */ false);
 
     partialSegment = shaka.util.BufferUtils.toUint8(
         segment,
         /* offset= */ partialSegmentLength);
     reference = dummyReference(videoType, 1);
     await mediaSourceEngine.appendBuffer(
-        videoType, partialSegment, reference, /* hasClosedCaptions= */ false,
-        /* seeked= */ true);
+        videoType, partialSegment, reference, fakeStream,
+        /* hasClosedCaptions= */ false, /* seeked= */ true);
   });
 
   it('extracts CEA-708 captions from dash', async () => {
@@ -537,7 +614,7 @@ describe('MediaSourceEngine', () => {
     const initObject = new Map();
     initObject.set(ContentType.VIDEO, getFakeStream(metadata.video));
 
-    await mediaSourceEngine.init(initObject, /* forceTransmux= */ false);
+    await mediaSourceEngine.init(initObject);
     await mediaSourceEngine.setDuration(presentationDuration);
     await appendInitWithClosedCaptions(ContentType.VIDEO);
     mediaSourceEngine.setSelectedClosedCaptionId('CC1');
@@ -554,7 +631,7 @@ describe('MediaSourceEngine', () => {
     const audioType = ContentType.AUDIO;
     const initObject = new Map();
     initObject.set(audioType, getFakeStream(metadata.audio));
-    await mediaSourceEngine.init(initObject, /* forceTransmux= */ false);
+    await mediaSourceEngine.init(initObject);
     await append(ContentType.AUDIO, 0);
 
     expect(onMetadata).toHaveBeenCalled();
@@ -567,14 +644,18 @@ describe('MediaSourceEngine', () => {
     const audioType = ContentType.AUDIO;
     const initObject = new Map();
     initObject.set(audioType, getFakeStream(metadata.audio));
-    await mediaSourceEngine.init(initObject, /* forceTransmux= */ true);
+    const config = shaka.util.PlayerConfiguration.createDefault().mediaSource;
+    config.forceTransmux = true;
+    mediaSourceEngine.configure(config);
+    await mediaSourceEngine.init(initObject);
     await append(ContentType.AUDIO, 0);
 
     expect(onMetadata).toHaveBeenCalled();
   });
 
   it('extracts ID3 metadata from AAC', async () => {
-    if (!MediaSource.isTypeSupported('audio/aac')) {
+    if (!MediaSource.isTypeSupported('audio/aac') ||
+        !shaka.util.Platform.supportsSequenceMode()) {
       return;
     }
     metadata = shaka.test.TestScheme.DATA['id3-metadata_aac'];
@@ -583,7 +664,7 @@ describe('MediaSourceEngine', () => {
     const audioType = ContentType.AUDIO;
     const initObject = new Map();
     initObject.set(audioType, getFakeStream(metadata.audio));
-    await mediaSourceEngine.init(initObject, /* forceTransmux= */ false);
+    await mediaSourceEngine.init(initObject, /* sequenceMode= */ true);
     await append(ContentType.AUDIO, 0);
 
     expect(onMetadata).toHaveBeenCalled();
@@ -599,7 +680,10 @@ describe('MediaSourceEngine', () => {
     const audioType = ContentType.AUDIO;
     const initObject = new Map();
     initObject.set(audioType, getFakeStream(metadata.audio));
-    await mediaSourceEngine.init(initObject, /* forceTransmux= */ true);
+    const config = shaka.util.PlayerConfiguration.createDefault().mediaSource;
+    config.forceTransmux = true;
+    mediaSourceEngine.configure(config);
+    await mediaSourceEngine.init(initObject);
     await append(ContentType.AUDIO, 0);
 
     expect(onMetadata).toHaveBeenCalled();