shaka-player 4.4.2 → 4.5.0

package/test/test/assets/hls-ts-muxed-ec3-h264/prog_index.m3u8

@@ -0,0 +1,14 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:6
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-INDEPENDENT-SEGMENTS
+#EXTINF:6.000,
+ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0000.ts
+#EXTINF:6.000,
+ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0001.ts
+#EXTINF:6.000,
+ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0002.ts
+#EXTINF:6.000,
+ChID_voices_1280x720p_25fps_h264_6ch_256kbps_ddp_sub_0003.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-muxed-mp3-h264/index.m3u8

@@ -0,0 +1,23 @@
+#EXTM3U
+#EXT-X-TARGETDURATION:6
+#EXT-X-ALLOW-CACHE:YES
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:1
+#EXTINF:2.436,
+seg-1-v1-a1.ts
+#EXTINF:3.337,
+seg-2-v1-a1.ts
+#EXTINF:3.337,
+seg-3-v1-a1.ts
+#EXTINF:5.005,
+seg-4-v1-a1.ts
+#EXTINF:5.005,
+seg-5-v1-a1.ts
+#EXTINF:5.005,
+seg-6-v1-a1.ts
+#EXTINF:5.606,
+seg-7-v1-a1.ts
+#EXTINF:5.005,
+seg-8-v1-a1.ts
+#EXT-X-ENDLIST

package/test/test/util/dash_parser_util.js

@@ -45,12 +45,18 @@ shaka.test.Dash = class {
       enableLowLatencyMode: () => {},
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
+      onManifestUpdated: () => {},
+      getBandwidthEstimate: () => 1e6,
     };
-    const manifest = await dashParser.start('dummy://foo', playerInterface);
-    const stream = manifest.variants[0].video;
-    await stream.createSegmentIndex();
+    try {
+      const manifest = await dashParser.start('dummy://foo', playerInterface);
+      const stream = manifest.variants[0].video;
+      await stream.createSegmentIndex();
 
-    shaka.test.ManifestParser.verifySegmentIndex(stream, references);
+      shaka.test.ManifestParser.verifySegmentIndex(stream, references);
+    } finally {
+      dashParser.stop();
+    }
   }
 
   /**
@@ -81,10 +87,17 @@ shaka.test.Dash = class {
       enableLowLatencyMode: () => {},
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
+      onManifestUpdated: () => {},
+      getBandwidthEstimate: () => 1e6,
     };
-    const p = dashParser.start('dummy://foo', playerInterface);
-    await expectAsync(p).toBeRejectedWith(
-        shaka.test.Util.jasmineError(expectedError));
+
+    try {
+      const p = dashParser.start('dummy://foo', playerInterface);
+      await expectAsync(p).toBeRejectedWith(
+          shaka.test.Util.jasmineError(expectedError));
+    } finally {
+      dashParser.stop();
+    }
   }
 
   /**

package/test/test/util/fake_ad_manager.js

@@ -39,6 +39,14 @@ shaka.test.FakeAdManager = class extends shaka.util.FakeEventTarget {
   /** @override */
   updateClientSideAdsRenderingSettings(adsRenderingSettings) {}
 
+  /** @override */
+  initMediaTailor(networkingEngine, video) {}
+
+  /** @override */
+  requestMediaTailorStream(url, adsParams, backupUrl) {
+    return Promise.resolve('fake:url');
+  }
+
   /** @override */
   initServerSide(adContainer, video) {}
 
@@ -57,11 +65,23 @@ shaka.test.FakeAdManager = class extends shaka.util.FakeEventTarget {
     return [];
   }
 
+  /**
+   * @override
+   */
+  getCuePoints() {
+    return [];
+  }
+
   /** @override */
   getStats() {
     return this.stats_;
   }
 
+  /**
+   * @override
+   */
+  onManifestUpdated(isLive) {}
+
   /**
    * @override
    */

package/test/test/util/fake_media_source_engine.js

@@ -134,8 +134,8 @@ shaka.test.FakeMediaSourceEngine = class {
         jasmine.createSpy('setSegmentRelativeVttTiming').and.stub();
 
     /** @type {!jasmine.Spy} */
-    this.updateLcevcDil =
-        jasmine.createSpy('updateLcevcDil').and.stub();
+    this.updateLcevcDec =
+        jasmine.createSpy('updateLcevcDec').and.stub();
 
     /** @type {!jasmine.Spy} */
     this.resync=
@@ -341,6 +341,12 @@ shaka.test.FakeMediaSourceEngine = class {
     return Promise.resolve();
   }
 
+
+  /** @override */
+  isResetMediaSourceNecessary() {
+    return false;
+  }
+
   /**
    * @param {string} type
    * @return {!Promise}

package/test/test/util/manifest_generator.js

@@ -459,9 +459,11 @@ shaka.test.ManifestGenerator.Stream = class {
    * @param {string=} label
    */
   constructor(manifest, isPartial, id, type, lang, label) {
-    goog.asserts.assert(
-        !manifest || !manifest.isIdUsed_(id),
-        'Streams should have unique ids!');
+    // variants can be made up of different combinations of video
+    // and audio streams
+    // goog.asserts.assert(
+    //     !manifest || !manifest.isIdUsed_(id),
+    //     'Streams should have unique ids!');
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     /** @const {shaka.test.ManifestGenerator.Manifest} */
@@ -499,6 +501,8 @@ shaka.test.ManifestGenerator.Stream = class {
 
       /** @type {?string} */
       this.originalId = null;
+      /** @type {?string} */
+      this.groupId = null;
       /** @type {shaka.extern.CreateSegmentIndexFunction} */
       this.createSegmentIndex = shaka.test.Util.spyFunc(create);
       /** @type {shaka.media.SegmentIndex} */

package/test/test/util/mss_parser_util.js

@@ -45,6 +45,8 @@ shaka.test.Mss = class {
       enableLowLatencyMode: () => {},
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
+      onManifestUpdated: () => {},
+      getBandwidthEstimate: () => 1e6,
     };
     const manifest = await mssParser.start('dummy://foo', playerInterface);
     const stream = manifest.variants[0].audio;
@@ -81,6 +83,8 @@ shaka.test.Mss = class {
       enableLowLatencyMode: () => {},
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
+      onManifestUpdated: () => {},
+      getBandwidthEstimate: () => 1e6,
     };
     const p = mssParser.start('dummy://foo', playerInterface);
     await expectAsync(p).toBeRejectedWith(

package/test/test/util/offline_utils.js

@@ -33,6 +33,7 @@ shaka.test.OfflineUtils = class {
     return {
       id,
       originalId: id.toString(),
+      groupId: null,
       primary: false,
       presentationTimeOffset: 0,
       type,

package/test/test/util/streaming_engine_util.js

@@ -149,13 +149,13 @@ shaka.test.StreamingEngineUtil = class {
    *   ranges for each type of init segment.
    * @param {!Object.<string,number>=} timestampOffsets The timestamp offset
    *  for each type of segment
-   * @param {shaka.extern.HlsAes128Key=} hlsAes128Key The AES-128 key to provide
+   * @param {shaka.extern.aes128Key=} aes128Key The AES-128 key to provide
    *  to streams, if desired.
    * @return {shaka.extern.Manifest}
    */
   static createManifest(
       presentationTimeline, periodStartTimes, presentationDuration,
-      segmentDurations, initSegmentRanges, timestampOffsets, hlsAes128Key) {
+      segmentDurations, initSegmentRanges, timestampOffsets, aes128Key) {
     const Util = shaka.test.Util;
 
     /**
@@ -268,9 +268,9 @@ shaka.test.StreamingEngineUtil = class {
           appendWindowStart,
           appendWindowEnd);
       const ContentType = shaka.util.ManifestParserUtils.ContentType;
-      if (hlsAes128Key &&
+      if (aes128Key &&
           (type == ContentType.AUDIO || type == ContentType.VIDEO)) {
-        ref.hlsAes128Key = hlsAes128Key;
+        ref.aes128Key = aes128Key;
       }
       return ref;
     };
@@ -394,6 +394,7 @@ shaka.test.StreamingEngineUtil = class {
     return {
       id: id,
       originalId: id.toString(),
+      groupId: null,
       createSegmentIndex: Util.spyFunc(jasmine.createSpy('createSegmentIndex')),
       segmentIndex: null,
       mimeType: 'audio/mp4',
@@ -433,6 +434,7 @@ shaka.test.StreamingEngineUtil = class {
     return {
       id: id,
       originalId: id.toString(),
+      groupId: null,
       createSegmentIndex: Util.spyFunc(jasmine.createSpy('createSegmentIndex')),
       segmentIndex: null,
       mimeType: mimeType,
@@ -473,6 +475,7 @@ shaka.test.StreamingEngineUtil = class {
     return {
       id: id,
       originalId: id.toString(),
+      groupId: null,
       createSegmentIndex: Util.spyFunc(jasmine.createSpy('createSegmentIndex')),
       segmentIndex: null,
       mimeType: 'text/vtt',

package/test/text/ttml_text_parser_unit.js

@@ -1147,6 +1147,31 @@ describe('TtmlTextParser', () => {
         {startTime: 62.05, endTime: 3723.2});
   });
 
+  it('supports textCombine setting', () => {
+    verifyHelper(
+        [
+          {
+            startTime: 62.05,
+            endTime: 3723.2,
+            payload: 'Test',
+            textCombineUpright: 'all',
+            writingMode: Cue.writingMode.VERTICAL_LEFT_TO_RIGHT,
+          },
+        ],
+        '<tt xmlns:tts="http://www.w3.org/ns/ttml#styling">' +
+        '<layout>' +
+        '<region xml:id="subtitleArea" ' +
+        'tts:writingMode="tb" ' +
+        'tts:textCombine="all"/>' +
+        '</layout>' +
+        '<body region="subtitleArea"><div>' +
+        '<p begin="01:02.05" end="01:02:03.200">Test</p>' +
+        '</div></body></tt>',
+        {periodStart: 0, segmentStart: 60, segmentEnd: 3730, vttOffset: 0},
+        {startTime: 62.05, endTime: 3723.2, region: {id: 'subtitleArea'}},
+        {startTime: 62.05, endTime: 3723.2});
+  });
+
   it('disregards empty divs and ps', () => {
     verifyHelper(
         [
@@ -1286,6 +1311,33 @@ describe('TtmlTextParser', () => {
         {startTime: 62.05, endTime: 3723.2});
   });
 
+  it('supports tts:ruby', () => {
+    verifyHelper(
+        [{
+          startTime: 62.05,
+          endTime: 3723.2,
+          payload: '',
+          nestedCues: [{
+            startTime: 62.05,
+            endTime: 3723.2,
+            payload: 'Line1',
+          }, {
+            startTime: 62.05,
+            endTime: 3723.2,
+            payload: 'Line2',
+            rubyTag: 'rt',
+          }],
+          rubyTag: 'ruby',
+        }],
+        // With anonymous spans
+        '<tt xmlns:tts="http://www.w3.org/ns/ttml#styling"><body><div>' +
+        '<p begin="01:02.05" end="01:02:03.200" tts:ruby="container">' +
+        '<span tts:ruby="base">Line1</span><span tts:ruby="text">Line2' +
+        '</span></p></div></body></tt>',
+        {periodStart: 0, segmentStart: 60, segmentEnd: 3730, vttOffset: 0},
+        {startTime: 62.05, endTime: 3723.2});
+  });
+
   it('inserts line breaks for <br> tags', () => {
     verifyHelper(
         [{

package/test/text/vtt_text_parser_unit.js

@@ -198,30 +198,15 @@ describe('VttTextParser', () => {
           {
             startTime: 40,
             endTime: 50,
-            payload: '',
+            payload: 'Test2',
             writingMode: Cue.writingMode.VERTICAL_LEFT_TO_RIGHT,
-            nestedCues: [
-              {
-                startTime: 40,
-                endTime: 50,
-                payload: 'Test',
-                writingMode: Cue.writingMode.VERTICAL_LEFT_TO_RIGHT,
-              },
-              {
-                startTime: 40,
-                endTime: 50,
-                payload: '2',
-                fontWeight: Cue.fontWeight.BOLD,
-                writingMode: Cue.writingMode.VERTICAL_LEFT_TO_RIGHT,
-              },
-            ],
           },
         ],
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 vertical:rl\n' +
         'Test\n\n' +
         '00:00:40.000 --> 00:00:50.000 vertical:lr\n' +
-        'Test<b>2</b>',
+        'Test2',
         {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
@@ -661,6 +646,7 @@ describe('VttTextParser', () => {
             payload: 'Test',
             color: 'cyan',
             fontSize: '10px',
+            textCombineUpright: 'all',
             textShadow: textShadow,
           },
           {
@@ -669,6 +655,7 @@ describe('VttTextParser', () => {
             payload: 'Test2',
             color: 'cyan',
             fontSize: '10px',
+            textCombineUpright: 'all',
             textShadow: textShadow,
           },
         ],
@@ -678,6 +665,7 @@ describe('VttTextParser', () => {
         'color: cyan;\n'+
         'font-size: 10px;\n'+
         `text-shadow: ${textShadow};\n`+
+        'text-combine-upright: all;\n'+
         '}\n\n' +
         '00:00:20.000 --> 00:00:40.000\n' +
         'Test\n\n' +
@@ -776,16 +764,21 @@ describe('VttTextParser', () => {
               {
                 startTime: 50,
                 endTime: 60,
-                payload: 'Test',
-                fontWeight: Cue.fontWeight.BOLD,
-                fontStyle: Cue.fontStyle.NORMAL,
-              },
-              {
-                startTime: 50,
-                endTime: 60,
-                payload: '5',
+                payload: '',
                 fontWeight: Cue.fontWeight.BOLD,
-                fontStyle: Cue.fontStyle.ITALIC,
+                nestedCues: [
+                  {
+                    startTime: 50,
+                    endTime: 60,
+                    payload: 'Test',
+                  },
+                  {
+                    startTime: 50,
+                    endTime: 60,
+                    payload: '5',
+                    fontStyle: Cue.fontStyle.ITALIC,
+                  },
+                ],
               },
             ],
           },
@@ -816,16 +809,21 @@ describe('VttTextParser', () => {
               {
                 startTime: 80,
                 endTime: 90,
-                payload: 'Test ',
-                fontWeight: Cue.fontWeight.BOLD,
-                fontStyle: Cue.fontStyle.NORMAL,
-              },
-              {
-                startTime: 80,
-                endTime: 90,
-                payload: '7',
+                payload: '',
                 fontWeight: Cue.fontWeight.BOLD,
-                fontStyle: Cue.fontStyle.ITALIC,
+                nestedCues: [
+                  {
+                    startTime: 80,
+                    endTime: 90,
+                    payload: 'Test ',
+                  },
+                  {
+                    startTime: 80,
+                    endTime: 90,
+                    payload: '7',
+                    fontStyle: Cue.fontStyle.ITALIC,
+                  },
+                ],
               },
             ],
           },
@@ -918,6 +916,48 @@ describe('VttTextParser', () => {
         {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
+  it('supports ruby html tags', () => {
+    verifyHelper(
+        [
+          {
+            startTime: 20,
+            endTime: 40,
+            payload: '',
+            nestedCues: [
+              {
+                startTime: 20,
+                endTime: 40,
+                payload: '',
+                rubyTag: 'ruby',
+                nestedCues: [
+                  {
+                    startTime: 20,
+                    endTime: 40,
+                    payload: 'Test',
+                  },
+                  {
+                    startTime: 20,
+                    endTime: 40,
+                    payload: '2',
+                    rubyTag: 'rt',
+                  },
+                  {
+                    startTime: 20,
+                    endTime: 40,
+                    payload: '3',
+                    rubyTag: 'rp',
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+        'WEBVTT\n\n' +
+        '00:00:20.000 --> 00:00:40.000\n' +
+        '<ruby>Test<rt>2</rt><rp>3</rp></ruby>',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+  });
+
   it('supports only two digits in the timestamp', () => {
     verifyHelper(
         [
@@ -1013,14 +1053,22 @@ describe('VttTextParser', () => {
               {
                 startTime: 70,
                 endTime: 80,
-                payload: 'Test5.1',
+                payload: '',
                 color: 'red',
-              },
-              {
-                startTime: 70,
-                endTime: 80,
-                payload: 'Test5.2',
-                color: 'lime',
+                nestedCues: [
+                  {
+                    startTime: 70,
+                    endTime: 80,
+                    payload: 'Test5.1',
+                    color: 'red',
+                  },
+                  {
+                    startTime: 70,
+                    endTime: 80,
+                    payload: 'Test5.2',
+                    color: 'lime',
+                  },
+                ],
               },
             ],
           },
@@ -1200,9 +1248,17 @@ describe('VttTextParser', () => {
               {
                 startTime: 10,
                 endTime: 20,
-                payload: '2',
+                payload: '',
                 color: 'magenta',
-                fontStyle: Cue.fontStyle.ITALIC,
+                nestedCues: [
+                  {
+                    startTime: 10,
+                    endTime: 20,
+                    payload: '2',
+                    color: 'magenta',
+                    fontStyle: Cue.fontStyle.ITALIC,
+                  },
+                ],
               },
             ],
           },
@@ -1270,13 +1326,14 @@ describe('VttTextParser', () => {
     parser.setSequenceMode(sequenceMode);
     const result = parser.parseMedia(data, time);
 
-    const expected = cues.map((cue) => {
+    const checkCue = (cue) => {
       if (cue.nestedCues) {
-        cue.nestedCues = cue.nestedCues.map(
-            (nestedCue) => jasmine.objectContaining(nestedCue));
+        cue.nestedCues = cue.nestedCues.map((nestedCue) => checkCue(nestedCue));
       }
       return jasmine.objectContaining(cue);
-    });
+    };
+
+    const expected = cues.map(checkCue);
     expect(result).toEqual(expected);
   }