shaka-player 4.4.1 → 4.4.3

package/test/dash/dash_parser_segment_base_unit.js

@@ -43,6 +43,11 @@ describe('DashParser SegmentBase', () => {
     };
   });
 
+  afterEach(() => {
+    // Dash parser stop is synchronous.
+    parser.stop();
+  });
+
   it('requests init data for WebM', async () => {
     const source = [
       '<MPD mediaPresentationDuration="PT75S">',

package/test/dash/dash_parser_segment_list_unit.js

@@ -351,24 +351,28 @@ describe('DashParser SegmentList', () => {
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
     };
-    const manifest = await dashParser.start('dummy://foo', playerInterface);
-    const stream = manifest.variants[0].video;
-    await stream.createSegmentIndex();
-    goog.asserts.assert(stream.segmentIndex, 'Expected index to be created');
+    try {
+      const manifest = await dashParser.start('dummy://foo', playerInterface);
+      const stream = manifest.variants[0].video;
+      await stream.createSegmentIndex();
+      goog.asserts.assert(stream.segmentIndex, 'Expected index to be created');
 
-    // Don't use Dash.testSegmentIndex since it uses SegmentIndex.find, which
-    // doesn't reproduce this issue.  We want to use Array.from which uses the
-    // iterator.
-    const expected = [
-      ManifestParser.makeReference('s1.mp4', 0, 10, baseUri),
-      ManifestParser.makeReference('s2.mp4', 10, 20, baseUri),
-      ManifestParser.makeReference('s3.mp4', 20, 30, baseUri),
+      // Don't use Dash.testSegmentIndex since it uses SegmentIndex.find, which
+      // doesn't reproduce this issue.  We want to use Array.from which uses
+      // the iterator.
+      const expected = [
+        ManifestParser.makeReference('s1.mp4', 0, 10, baseUri),
+        ManifestParser.makeReference('s2.mp4', 10, 20, baseUri),
+        ManifestParser.makeReference('s3.mp4', 20, 30, baseUri),
 
-      ManifestParser.makeReference('s3.mp4', 30, 40, baseUri),
-      ManifestParser.makeReference('s4.mp4', 40, 50, baseUri),
-      ManifestParser.makeReference('s5.mp4', 50, 60, baseUri),
-    ];
-    const actual = Array.from(stream.segmentIndex);
-    expect(actual).toEqual(expected);
+        ManifestParser.makeReference('s3.mp4', 30, 40, baseUri),
+        ManifestParser.makeReference('s4.mp4', 40, 50, baseUri),
+        ManifestParser.makeReference('s5.mp4', 50, 60, baseUri),
+      ];
+      const actual = Array.from(stream.segmentIndex);
+      expect(actual).toEqual(expected);
+    } finally {
+      dashParser.stop();
+    }
   });
 });

package/test/dash/dash_parser_segment_template_unit.js

@@ -52,6 +52,11 @@ describe('DashParser SegmentTemplate', () => {
     };
   });
 
+  afterEach(() => {
+    // Dash parser stop is synchronous.
+    parser.stop();
+  });
+
   shaka.test.Dash.makeTimelineTests(
       'SegmentTemplate', 'media="s$Number$.mp4"', []);
 
@@ -670,6 +675,48 @@ describe('DashParser SegmentTemplate', () => {
         expect(pos).toBe(1);
       });
 
+      it('finds correct position in multiperiod content', async () => {
+        const source = [
+          '<MPD type="static" availabilityStartTime="1970-01-01T00:00:00Z">',
+          '  <Period duration="PT30S">',
+          '    <AdaptationSet mimeType="video/mp4">',
+          '      <Representation bandwidth="500">',
+          '        <BaseURL>http://example.com</BaseURL>',
+          '          <SegmentTemplate startNumber="0"',
+          '            media="$Number$-$Time$-$Bandwidth$.mp4">',
+          '            <SegmentTimeline>',
+          '              <S t="0" d="5" r="6" />',
+          '            </SegmentTimeline>',
+          '          </SegmentTemplate>',
+          '      </Representation>',
+          '    </AdaptationSet>',
+          '  </Period>',
+          '  <Period duration="PT30S">',
+          '    <AdaptationSet mimeType="video/mp4">',
+          '      <Representation bandwidth="500">',
+          '        <BaseURL>http://example.com</BaseURL>',
+          '          <SegmentTemplate startNumber="6"',
+          '            media="$Number$-$Time$-$Bandwidth$.mp4">',
+          '            <SegmentTimeline>',
+          '              <S t="0" d="5" r="6" />',
+          '            </SegmentTimeline>',
+          '          </SegmentTemplate>',
+          '      </Representation>',
+          '    </AdaptationSet>',
+          '  </Period>',
+          '</MPD>',
+        ].join('\n');
+
+        fakeNetEngine.setResponseText('dummy://foo', source);
+        const manifest = await parser.start('dummy://foo', playerInterface);
+        const stream = manifest.variants[0].video;
+        await stream.createSegmentIndex();
+
+        // simulate a seek into the second period
+        const segmentIterator = stream.segmentIndex.getIteratorForTime(42);
+        const ref = segmentIterator.next().value;
+        expect(ref.startTime).toBe(40);
+      });
 
       it('returns null if time === last end time', async () => {
         const info = makeTemplateInfo(makeRanges(0, 2.0, 2));

package/test/hls/hls_live_unit.js

@@ -540,10 +540,43 @@ describe('HlsParser live', () => {
 
     it('sets 3 times target duration as presentation delay if not configured',
         async () => {
+          const media = [
+            '#EXTM3U\n',
+            '#EXT-X-TARGETDURATION:5\n',
+            '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+            '#EXT-X-MEDIA-SEQUENCE:0\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+          ].join('');
           const manifest = await testInitialManifest(master, media);
           expect(manifest.presentationTimeline.getDelay()).toBe(15);
         });
 
+    it('sets 1 times target duration as presentation delay if there are not enough segments', async () => { // eslint-disable-line max-len
+      const media = [
+        '#EXTM3U\n',
+        '#EXT-X-TARGETDURATION:5\n',
+        '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+        '#EXT-X-MEDIA-SEQUENCE:0\n',
+        '#EXTINF:2,\n',
+        'main.mp4\n',
+        '#EXTINF:2,\n',
+        'main.mp4\n',
+      ].join('');
+      const manifest = await testInitialManifest(master, media);
+      expect(manifest.presentationTimeline.getDelay()).toBe(5);
+    });
+
     it('sets presentation delay if defined', async () => {
       const media = [
         '#EXTM3U\n',

package/test/hls/hls_parser_unit.js

@@ -1136,63 +1136,6 @@ describe('HlsParser', () => {
     expect(references[6].discontinuitySequence).toBe(3);
   });
 
-  it('sets reference timetampOffset based on discontinuity start time',
-      async () => {
-        const master = [
-          '#EXTM3U\n',
-          '#EXT-X-STREAM-INF:BANDWIDTH=2000000,CODECS="avc1"\n',
-          'video\n',
-        ].join('');
-
-        const media = [
-          '#EXTM3U\n',
-          '#EXT-X-VERSION:3\n',
-          '#EXT-X-TARGETDURATION:5\n',
-          '#EXT-X-MEDIA-SEQUENCE:0\n',
-          '#EXTINF:3,\n',
-          'clip0-video-0.ts\n',
-          '#EXTINF:1,\n',
-          'clip0-video-1.ts\n',
-          '#EXT-X-DISCONTINUITY\n',
-          '#EXTINF:2,\n',
-          'clip1-video-1.ts\n',
-          '#EXTINF:3,\n',
-          'clip1-video-2.ts\n',
-          '#EXT-X-DISCONTINUITY\n',
-          '#EXTINF:1,\n',
-          'media-clip2-video-0.ts\n',
-          '#EXTINF:1,\n',
-          'media-clip2-video-1.ts\n',
-          '#EXT-X-DISCONTINUITY\n',
-          '#EXTINF:4,\n',
-          'media-clip3-video-1.ts\n',
-          '#EXT-X-ENDLIST\n',
-        ].join('');
-
-        fakeNetEngine
-            .setResponseText('test:/master', master)
-            .setResponseText('test:/video', media);
-
-        const manifest = await parser.start('test:/master', playerInterface);
-        await manifest.variants[0].video.createSegmentIndex();
-
-        const segmentIndex = manifest.variants[0].video.segmentIndex;
-        const references = [];
-
-        for (let i = 0; i < 7; i++) {
-          references.push(segmentIndex.get(i));
-        }
-
-        expect(references[0].timestampOffset).toBe(0);
-        expect(references[1].timestampOffset).toBe(0);
-        expect(references[2].timestampOffset).toBe(4);
-        expect(references[3].timestampOffset).toBe(4);
-        expect(references[4].timestampOffset).toBe(9);
-        expect(references[5].timestampOffset).toBe(9);
-        expect(references[6].timestampOffset).toBe(11);
-      },
-  );
-
   it('parses characteristics from audio tags', async () => {
     const master = [
       '#EXTM3U\n',
@@ -3182,8 +3125,10 @@ describe('HlsParser', () => {
 
     const firstMp4Segment = mp4AesEncryptionVideo.segmentIndex.get(0);
     expect(firstMp4Segment.hlsAes128Key).toBeDefined();
+    expect(firstMp4Segment.initSegmentReference.hlsAes128Key).toBeDefined();
     const secondMp4Segment = mp4AesEncryptionVideo.segmentIndex.get(1);
     expect(secondMp4Segment.hlsAes128Key).toBeNull();
+    expect(secondMp4Segment.initSegmentReference.hlsAes128Key).toBeDefined();
 
     const tsAesEncryptionVideo = actual.variants[2].video;
     await tsAesEncryptionVideo.createSegmentIndex();

package/test/test/util/dash_parser_util.js

@@ -46,11 +46,15 @@ shaka.test.Dash = class {
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
     };
-    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();
+    }
   }
 
   /**
@@ -82,9 +86,14 @@ shaka.test.Dash = class {
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
     };
-    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/text/text_engine_unit.js

@@ -49,7 +49,8 @@ describe('TextEngine', () => {
     textEngine.initParser(
         dummyMimeType,
         /* sequenceMode= */ false,
-        /* segmentRelativeVttTiming= */ false);
+        /* segmentRelativeVttTiming= */ false,
+        shaka.media.ManifestParser.UNKNOWN);
   });
 
   afterEach(() => {
@@ -298,7 +299,8 @@ describe('TextEngine', () => {
       textEngine.initParser(
           dummyMimeType,
           /* sequenceMode= */ false,
-          /* segmentRelativeVttTiming= */ true);
+          /* segmentRelativeVttTiming= */ true,
+          shaka.media.ManifestParser.UNKNOWN);
 
       mockParseMedia.and.callFake((data, time) => {
         return [

package/test/text/ttml_text_parser_unit.js

@@ -1866,9 +1866,8 @@ describe('TtmlTextParser', () => {
             endTime: 60,
             payload: '',
             fontSize: '15px',
-            // Styles from regionStyle should apply only to the nested cue.
-            backgroundColor: '',
-            color: '',
+            backgroundColor: 'transparent',
+            color: 'blue',
             displayAlign: Cue.displayAlign.CENTER,
             textAlign: Cue.textAlign.CENTER,
 
@@ -1970,7 +1969,7 @@ describe('TtmlTextParser', () => {
             startTime: 0,
             endTime: 60,
             payload: '',
-            fontSize: '',
+            fontSize: '16px',
             nestedCues: [
               {
                 startTime: 0,

package/test/text/web_vtt_layout_integration.js

@@ -213,7 +213,6 @@ filterDescribe('WebVTT layout', shaka.test.TextLayoutTests.supported, () => {
       await helper.checkScreenshot('line-negative-2');
     });
 
-    // FIXME: UI version is wrong: not positioned by line
     it('line 0', async () => {
       parseAndDisplay([
         'WEBVTT\n',

package/test/transmuxer/transmuxer_integration.js

@@ -36,8 +36,8 @@ describe('Transmuxer Player', () => {
     // We must enable this, once it is resolved:
     // https://bugs.chromium.org/p/chromium/issues/detail?id=1450313
     const chromeVersion = shaka.util.Platform.chromeVersion();
-    if (shaka.util.Platform.isEdge() &&
-        chromeVersion && chromeVersion <= 116) {
+    if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge() &&
+        chromeVersion && chromeVersion <= 118) {
       return false;
     }
     return true;
@@ -57,8 +57,8 @@ describe('Transmuxer Player', () => {
     // We must enable this, once it is resolved:
     // https://bugs.chromium.org/p/chromium/issues/detail?id=1450313
     const chromeVersion = shaka.util.Platform.chromeVersion();
-    if (shaka.util.Platform.isEdge() &&
-        chromeVersion && chromeVersion <= 116) {
+    if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge() &&
+        chromeVersion && chromeVersion <= 118) {
       return false;
     }
     return true;

package/test/util/ts_parser_unit.js

@@ -72,6 +72,6 @@ describe('TsParser', () => {
     const codecs = new shaka.util.TsParser().parse(tsSegment)
         .getCodecs();
     expect(codecs.audio).toBe('aac');
-    expect(codecs.video).toBe('');
+    expect(codecs.video).toBe(null);
   });
 });

package/ui/language_utils.js

@@ -193,21 +193,6 @@ shaka.ui.LanguageUtils = class {
     // Extract the base language from the locale as a fallback step.
     const language = shaka.util.LanguageUtils.getBase(locale);
 
-    // If Intl.DisplayNames is supported we prefer it, because the list of
-    // languages is up to date.
-    if (window.Intl && 'DisplayNames' in Intl) {
-      try {
-        if (Intl.DisplayNames.supportedLocalesOf([locale]).length) {
-          const languageNames =
-              new Intl.DisplayNames([locale], {type: 'language'});
-          const language = languageNames.of(locale);
-          return language.charAt(0).toUpperCase() + language.slice(1);
-        }
-      } catch (e) {
-        // Ignore errors and try the fallback
-      }
-    }
-
     // First try to resolve the full language name.
     // If that fails, try the base.
     // Finally, report "unknown".