shaka-player 4.3.10 → 4.4.0

package/test/text/vtt_text_parser_unit.js

@@ -8,7 +8,6 @@ describe('VttTextParser', () => {
   const Cue = shaka.text.Cue;
   const CueRegion = shaka.text.CueRegion;
   const originalLogWarning = shaka.log.warning;
-  const anyString = jasmine.any(String);
 
   /** @type {!jasmine.Spy} */
   let logWarningSpy;
@@ -161,38 +160,30 @@ describe('VttTextParser', () => {
   });
 
   it('rejects invalid time values', () => {
-    errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
+    verifyHelper([],
         'WEBVTT\n\n00.020    --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
-        anyString);
-    errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+    verifyHelper([],
         'WEBVTT\n\n0:00.020  --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
-        anyString);
-    errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+    verifyHelper([],
         'WEBVTT\n\n00:00.20  --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
-        anyString);
-    errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+    verifyHelper([],
         'WEBVTT\n\n00:100.20 --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
-        anyString);
-    errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+    verifyHelper([],
         'WEBVTT\n\n00:00.020 --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
-        anyString);
-    errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+    verifyHelper([],
         'WEBVTT\n\n00:00:00:00.020 --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
-        anyString);
-    errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+    verifyHelper([],
         'WEBVTT\n\n00:61.020 --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
-        anyString);
-    errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+    verifyHelper([],
         'WEBVTT\n\n61:00.020 --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
-        anyString);
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports vertical setting', () => {
@@ -934,7 +925,7 @@ describe('VttTextParser', () => {
                 startTime: 20,
                 endTime: 40,
                 payload: 'Test',
-                color: '#FF0',
+                color: 'yellow',
               },
             ],
           },
@@ -946,8 +937,8 @@ describe('VttTextParser', () => {
                 startTime: 40,
                 endTime: 50,
                 payload: 'Test2',
-                color: '#0FF',
-                backgroundColor: '#00F',
+                color: 'cyan',
+                backgroundColor: 'blue',
               },
             ],
           },
@@ -959,8 +950,8 @@ describe('VttTextParser', () => {
                 startTime: 50,
                 endTime: 60,
                 payload: 'Test 3',
-                color: '#F0F',
-                backgroundColor: '#000',
+                color: 'magenta',
+                backgroundColor: 'black',
               },
             ],
           },
@@ -978,7 +969,7 @@ describe('VttTextParser', () => {
                 startTime: 60,
                 endTime: 70,
                 payload: 'Test4.1',
-                color: '#FF0',
+                color: 'yellow',
               },
               {
                 startTime: 60,
@@ -995,7 +986,7 @@ describe('VttTextParser', () => {
                 startTime: 60,
                 endTime: 70,
                 payload: 'Test4.2',
-                color: '#00F',
+                color: 'blue',
               },
             ],
           },
@@ -1008,13 +999,13 @@ describe('VttTextParser', () => {
                 startTime: 70,
                 endTime: 80,
                 payload: 'Test5.1',
-                color: '#F00',
+                color: 'red',
               },
               {
                 startTime: 70,
                 endTime: 80,
                 payload: 'Test5.2',
-                color: '#0F0',
+                color: 'lime',
               },
             ],
           },
@@ -1039,7 +1030,7 @@ describe('VttTextParser', () => {
                 startTime: 100,
                 endTime: 110,
                 payload: 'forward slash 1/2 in text',
-                color: '#0F0',
+                color: 'lime',
               },
             ],
           },
@@ -1156,8 +1147,8 @@ describe('VttTextParser', () => {
                 startTime: 10,
                 endTime: 20,
                 payload: 'Example 1',
-                color: '#F00',
-                backgroundColor: '#FF0',
+                color: 'red',
+                backgroundColor: 'yellow',
                 fontSize: '10px',
               },
             ],
@@ -1165,7 +1156,7 @@ describe('VttTextParser', () => {
         ],
         'WEBVTT\n\n' +
         'STYLE\n' +
-        '::cue(.bg_blue) { font-size: 10px; background-color: #FF0 }\n\n' +
+        '::cue(.bg_blue) { font-size: 10px; background-color: yellow }\n\n' +
         '00:00:10.000 --> 00:00:20.000\n' +
         '<c.red.bg_blue>Example 1</c>\n\n',
         {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
@@ -1183,7 +1174,7 @@ describe('VttTextParser', () => {
                 startTime: 10,
                 endTime: 20,
                 payload: '1',
-                color: '#F0F',
+                color: 'magenta',
               },
               {
                 startTime: 10,
@@ -1195,7 +1186,7 @@ describe('VttTextParser', () => {
                 startTime: 10,
                 endTime: 20,
                 payload: '2',
-                color: '#F0F',
+                color: 'magenta',
                 fontStyle: Cue.fontStyle.ITALIC,
               },
             ],
@@ -1223,6 +1214,34 @@ describe('VttTextParser', () => {
         {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
+  it('supports an extra newline inside the cue body', () => {
+    verifyHelper(
+        [
+          {startTime: 20, endTime: 40, payload: 'Test'},
+          {startTime: 40, endTime: 50, payload: 'Test2'},
+        ],
+        'WEBVTT\n\n' +
+        '00:00:20.000 --> 00:00:40.000\n' +
+        'Test\n\nExtra line\n\n' +
+        '00:00:40.000 --> 00:00:50.000\n' +
+        'Test2',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+  });
+
+  it('supports an extra newline before the cue body', () => {
+    verifyHelper(
+        [
+          {startTime: 20, endTime: 40, payload: ''},
+          {startTime: 40, endTime: 50, payload: 'Test2'},
+        ],
+        'WEBVTT\n\n' +
+        '00:00:20.000 --> 00:00:40.000\n' +
+        '\nTest\n\n' +
+        '00:00:40.000 --> 00:00:50.000\n' +
+        'Test2',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+  });
+
   /**
    * @param {!Array} cues
    * @param {string} text

package/test/text/web_vtt_generator_unit.js

@@ -13,11 +13,17 @@ describe('WebVttGenerator', () => {
     const shakaCue1 = new shaka.text.Cue(20, 40, 'Test');
     shakaCue1.textAlign = shaka.text.Cue.textAlign.LEFT;
     shakaCue1.writingMode = shaka.text.Cue.writingMode.VERTICAL_LEFT_TO_RIGHT;
+    shakaCue1.color = 'red';
+    shakaCue1.backgroundColor = '#f0f';
     const shakaCue2 = new shaka.text.Cue(40, 50, 'Test2');
     shakaCue2.textAlign = shaka.text.Cue.textAlign.RIGHT;
     shakaCue2.writingMode = shaka.text.Cue.writingMode.VERTICAL_RIGHT_TO_LEFT;
+    shakaCue2.color = '#0f0';
+    shakaCue2.backgroundColor = 'lime';
     const shakaCue3 = new shaka.text.Cue(50, 51, 'Test3');
     shakaCue3.textAlign = shaka.text.Cue.textAlign.CENTER;
+    shakaCue3.color = '#ffff00';
+    shakaCue3.backgroundColor = '#00ffff';
     const shakaCue4 = new shaka.text.Cue(52, 53, 'Test4');
     shakaCue4.textAlign = shaka.text.Cue.textAlign.START;
     const shakaCue5 = new shaka.text.Cue(53, 54, 'Test5');
@@ -36,11 +42,11 @@ describe('WebVttGenerator', () => {
         adCuePoints,
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 align:left vertical:lr\n' +
-        'Test\n\n' +
+        '<c.red.bg_magenta>Test</c>\n\n' +
         '00:00:40.000 --> 00:00:50.000 align:right vertical:rl\n' +
-        'Test2\n\n' +
+        '<c.lime.bg_lime>Test2</c>\n\n' +
         '00:00:50.000 --> 00:00:51.000 align:middle\n' +
-        'Test3\n\n' +
+        '<c.yellow.bg_cyan>Test3</c>\n\n' +
         '00:00:52.000 --> 00:00:53.000 align:start\n' +
         'Test4\n\n' +
         '00:00:53.000 --> 00:00:54.000 align:end\n' +

package/test/{media/transmuxer_integration.js → transmuxer/muxjs_transmuxer_integration.js}

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-describe('Transmuxer', () => {
+describe('MuxjsTransmuxer', () => {
   const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
   const videoSegmentUri = '/base/test/test/assets/video.ts';
@@ -12,9 +12,6 @@ describe('Transmuxer', () => {
   const mp4MimeType = 'video/mp4; codecs="avc1.42E01E"';
   const transportStreamVideoMimeType = 'video/mp2t; codecs="avc1.42E01E"';
   const transportStreamAudioMimeType = 'video/mp2t; codecs="mp4a.40.2"';
-  const aacAudioMimeType = 'audio/aac';
-
-  const transmuxerMimeType = 'fake/mimeType';
 
   /** @type {!ArrayBuffer} */
   let videoSegment;
@@ -23,9 +20,12 @@ describe('Transmuxer', () => {
   /** @type {!ArrayBuffer} */
   let emptySegment;
 
-  /** @type {!shaka.media.Transmuxer} */
+  /** @type {?shaka.transmuxer.MuxjsTransmuxer} */
   let transmuxer;
 
+  function useTsTransmuxer() {
+    transmuxer = new shaka.transmuxer.MuxjsTransmuxer('video/mp2t');
+  }
 
   beforeAll(async () => {
     const responses = await Promise.all([
@@ -38,7 +38,7 @@ describe('Transmuxer', () => {
   });
 
   beforeEach(() => {
-    transmuxer = new shaka.media.Transmuxer(transmuxerMimeType);
+    transmuxer = null;
   });
 
   afterEach(async () => {
@@ -46,42 +46,41 @@ describe('Transmuxer', () => {
   });
 
   describe('isSupported', () => {
-    const Transmuxer = shaka.media.Transmuxer;
-
     it('returns whether the content type is supported', () => {
-      expect(Transmuxer.isSupported(
+      useTsTransmuxer();
+      expect(transmuxer.isSupported(
           mp4MimeType, ContentType.VIDEO)).toBe(false);
-      expect(Transmuxer.isSupported(
+      expect(transmuxer.isSupported(
           transportStreamVideoMimeType, ContentType.VIDEO)).toBe(true);
     });
 
     // Issue #1991
     it('handles upper-case MIME types', () => {
+      useTsTransmuxer();
       const mimeType = transportStreamVideoMimeType.replace('mp2t', 'MP2T');
-      expect(Transmuxer.isSupported(mimeType, ContentType.VIDEO)).toBe(true);
+      expect(transmuxer.isSupported(
+          mimeType, ContentType.VIDEO)).toBe(true);
     });
   });
 
   describe('convertCodecs', () => {
     const convertCodecs =
-        (type, codecs) => shaka.media.Transmuxer.convertCodecs(type, codecs);
+        (type, codecs) => transmuxer.convertCodecs(type, codecs);
 
-    it('returns converted codecs', () => {
+    it('returns converted codecs for TS', () => {
+      useTsTransmuxer();
       const convertedVideoCodecs =
           convertCodecs(ContentType.VIDEO, transportStreamVideoMimeType);
       const convertedAudioCodecs =
           convertCodecs(ContentType.AUDIO, transportStreamAudioMimeType);
-      const convertedAacCodecs =
-          convertCodecs(ContentType.AUDIO, aacAudioMimeType);
       const expectedVideoCodecs = 'video/mp4; codecs="avc1.42E01E"';
       const expectedAudioCodecs = 'audio/mp4; codecs="mp4a.40.2"';
-      const expectedAacCodecs = 'audio/mp4; codecs="mp4a.40.2"';
       expect(convertedVideoCodecs).toBe(expectedVideoCodecs);
       expect(convertedAudioCodecs).toBe(expectedAudioCodecs);
-      expect(convertedAacCodecs).toBe(expectedAacCodecs);
     });
 
     it('converts legacy avc1 codec strings', () => {
+      useTsTransmuxer();
       expect(
           convertCodecs(
               ContentType.VIDEO, 'video/mp2t; codecs="avc1.100.42"'))
@@ -96,62 +95,60 @@ describe('Transmuxer', () => {
 
     // Issue #1991
     it('handles upper-case MIME types', () => {
+      useTsTransmuxer();
       expect(convertCodecs(
           ContentType.VIDEO, 'video/MP2T; codecs="avc1.420001"'))
           .toBe('video/mp4; codecs="avc1.420001"');
     });
   });
 
-  it('getOrginalMimeType returns the correct mimeType', () => {
-    expect(transmuxer.getOrginalMimeType()).toBe(transmuxerMimeType);
-  });
-
   describe('transmuxing', () => {
     it('transmux video from TS to MP4', async () => {
+      useTsTransmuxer();
       let sawMDAT = false;
 
       const transmuxedData = await transmuxer.transmux(videoSegment);
-      expect(transmuxedData.data).toEqual(jasmine.any(Uint8Array));
-      expect(transmuxedData.data.length).toBeGreaterThan(0);
-      expect(transmuxedData.captions).toEqual(jasmine.any(Array));
+      expect(transmuxedData).toEqual(jasmine.any(Uint8Array));
+      expect(transmuxedData.length).toBeGreaterThan(0);
       new shaka.util.Mp4Parser()
           .box('mdat', shaka.util.Mp4Parser.allData((data) => {
             sawMDAT = true;
             expect(data.byteLength).toBeGreaterThan(0);
           }))
-          .parse(transmuxedData.data);
+          .parse(transmuxedData);
       expect(sawMDAT).toBeTruthy();
     });
 
     it('transmux audio from TS to MP4', async () => {
+      useTsTransmuxer();
       let sawMDAT = false;
       const transmuxedData = await transmuxer.transmux(audioSegment);
-      expect(transmuxedData.data).toEqual(jasmine.any(Uint8Array));
-      expect(transmuxedData.data.length).toBeGreaterThan(0);
-      expect(transmuxedData.captions).toEqual(jasmine.any(Array));
+      expect(transmuxedData).toEqual(jasmine.any(Uint8Array));
+      expect(transmuxedData.length).toBeGreaterThan(0);
       new shaka.util.Mp4Parser()
           .box('mdat', shaka.util.Mp4Parser.allData((data) => {
             sawMDAT = true;
             expect(data.byteLength).toBeGreaterThan(0);
           }))
-          .parse(transmuxedData.data);
+          .parse(transmuxedData);
       expect(sawMDAT).toBeTruthy();
     });
 
     it('transmux empty video from TS to MP4', async () => {
+      useTsTransmuxer();
       let sawMDAT = false;
       const transmuxedData = await transmuxer.transmux(emptySegment);
-      expect(transmuxedData.data).toEqual(jasmine.any(Uint8Array));
-      expect(transmuxedData.captions).toEqual([]);
+      expect(transmuxedData).toEqual(jasmine.any(Uint8Array));
       new shaka.util.Mp4Parser()
           .box('mdat', shaka.util.Mp4Parser.allData((data) => {
             sawMDAT = true;
           }))
-          .parse(transmuxedData.data);
+          .parse(transmuxedData);
       expect(sawMDAT).toBeFalsy();
     });
 
     it('passes through true timestamps', async () => {
+      useTsTransmuxer();
       let parsed = false;
       const expectedMp4Timestamp = 5166000;  // in timescale units
       let mp4Timestamp;
@@ -171,7 +168,7 @@ describe('Transmuxer', () => {
             mp4Timestamp = parsedTFDTBox.baseMediaDecodeTime;
             parsed = true;
           })
-          .parse(transmuxedData.data);
+          .parse(transmuxedData);
 
       expect(parsed).toBe(true);
       expect(mp4Timestamp).toBe(expectedMp4Timestamp);

package/test/transmuxer/transmuxer_engine_integration.js

@@ -0,0 +1,60 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+describe('TransmuxerEngine', () => {
+  const ContentType = shaka.util.ManifestParserUtils.ContentType;
+
+  const mp4MimeType = 'video/mp4; codecs="avc1.42E01E"';
+  const transportStreamVideoMimeType = 'video/mp2t; codecs="avc1.42E01E"';
+  const transportStreamAudioMimeType = 'video/mp2t; codecs="mp4a.40.2"';
+  const aacAudioMimeType = 'audio/aac';
+
+  describe('isSupported', () => {
+    const TransmuxerEngine = shaka.transmuxer.TransmuxerEngine;
+
+    it('returns whether the content type is supported', () => {
+      expect(TransmuxerEngine.isSupported(
+          mp4MimeType, ContentType.VIDEO)).toBe(false);
+      expect(TransmuxerEngine.isSupported(
+          transportStreamVideoMimeType, ContentType.VIDEO)).toBe(true);
+    });
+
+    // Issue #1991
+    it('handles upper-case MIME types', () => {
+      const mimeType = transportStreamVideoMimeType.replace('mp2t', 'MP2T');
+      expect(TransmuxerEngine.isSupported(
+          mimeType, ContentType.VIDEO)).toBe(true);
+    });
+  });
+
+  describe('convertCodecs', () => {
+    const TransmuxerEngine = shaka.transmuxer.TransmuxerEngine;
+    const convertCodecs =
+        (type, codecs) => TransmuxerEngine.convertCodecs(type, codecs);
+
+    it('returns converted codecs', () => {
+      const convertedVideoCodecs =
+          convertCodecs(ContentType.VIDEO, transportStreamVideoMimeType);
+      const convertedAudioCodecs =
+          convertCodecs(ContentType.AUDIO, transportStreamAudioMimeType);
+      const convertedAacCodecs =
+          convertCodecs(ContentType.AUDIO, aacAudioMimeType);
+      const expectedVideoCodecs = 'video/mp4; codecs="avc1.42E01E"';
+      const expectedAudioCodecs = 'audio/mp4; codecs="mp4a.40.2"';
+      const expectedAacCodecs = 'audio/mp4; codecs="mp4a.40.2"';
+      expect(convertedVideoCodecs).toBe(expectedVideoCodecs);
+      expect(convertedAudioCodecs).toBe(expectedAudioCodecs);
+      expect(convertedAacCodecs).toBe(expectedAacCodecs);
+    });
+
+    // Issue #1991
+    it('handles upper-case MIME types', () => {
+      expect(convertCodecs(
+          ContentType.VIDEO, 'video/MP2T; codecs="avc1.420001"'))
+          .toBe('video/mp4; codecs="avc1.420001"');
+    });
+  });
+});