shaka-player 4.3.11 → 4.3.13

package/lib/util/stream_utils.js

@@ -1442,22 +1442,23 @@ shaka.util.StreamUtils = class {
 
   /**
    * Chooses streams according to the given config.
+   * Works both for Stream and Track types due to their similarities.
    *
-   * @param {!Array.<shaka.extern.Stream>} streams
+   * @param {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>} streams
    * @param {string} preferredLanguage
    * @param {string} preferredRole
    * @param {boolean} preferredForced
-   * @return {!Array.<!shaka.extern.Stream>}
+   * @return {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>}
    */
   static filterStreamsByLanguageAndRole(
       streams, preferredLanguage, preferredRole, preferredForced) {
     const LanguageUtils = shaka.util.LanguageUtils;
 
-    /** @type {!Array.<!shaka.extern.Stream>} */
+    /** @type {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>} */
     let chosen = streams;
 
     // Start with the set of primary streams.
-    /** @type {!Array.<!shaka.extern.Stream>} */
+    /** @type {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>} */
     const primary = streams.filter((stream) => {
       return stream.primary;
     });
@@ -1497,7 +1498,7 @@ shaka.util.StreamUtils = class {
 
     // Now refine the choice based on role preference.
     if (preferredRole) {
-      const roleMatches = shaka.util.StreamUtils.filterTextStreamsByRole_(
+      const roleMatches = shaka.util.StreamUtils.filterStreamsByRole_(
           chosen, preferredRole);
       if (roleMatches.length) {
         return roleMatches;
@@ -1525,20 +1526,21 @@ shaka.util.StreamUtils = class {
     if (!allRoles.length) {
       return chosen;
     }
-    return shaka.util.StreamUtils.filterTextStreamsByRole_(chosen, allRoles[0]);
+    return shaka.util.StreamUtils.filterStreamsByRole_(chosen, allRoles[0]);
   }
 
 
   /**
-   * Filter text Streams by role.
+   * Filter Streams by role.
+   * Works both for Stream and Track types due to their similarities.
    *
-   * @param {!Array.<shaka.extern.Stream>} textStreams
+   * @param {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>} streams
    * @param {string} preferredRole
-   * @return {!Array.<shaka.extern.Stream>}
+   * @return {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>}
    * @private
    */
-  static filterTextStreamsByRole_(textStreams, preferredRole) {
-    return textStreams.filter((stream) => {
+  static filterStreamsByRole_(streams, preferredRole) {
+    return streams.filter((stream) => {
       return stream.roles.includes(preferredRole);
     });
   }

package/lib/util/ts_parser.js

@@ -122,15 +122,15 @@ shaka.util.TsParser = class {
             // for example
             // NOTE this is only the PID of the track as found in TS,
             // but we are not using this for MP4 track IDs.
-            if (this.videoPid_ == null) {
+            if (parsedPIDs.video != -1) {
               this.videoPid_ = parsedPIDs.video;
               this.videoCodec_ = parsedPIDs.videoCodec;
             }
-            if (this.audioPid_ == null) {
+            if (parsedPIDs.audio != -1) {
               this.audioPid_ = parsedPIDs.audio;
               this.audioCodec_ = parsedPIDs.audioCodec;
             }
-            if (this.id3Pid_ == null) {
+            if (parsedPIDs.id3 != -1) {
               this.id3Pid_ = parsedPIDs.id3;
             }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.3.11",
+  "version": "4.3.13",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -42,7 +42,7 @@
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",
-    "karma-local-wd-launcher": "^1.6.4",
+    "karma-local-wd-launcher": "^1.6.6",
     "karma-opera-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.34",

package/test/dash/dash_parser_manifest_unit.js

@@ -57,6 +57,11 @@ describe('DashParser Manifest', () => {
     };
   });
 
+  afterEach(() => {
+    // Dash parser stop is synchronous.
+    parser.stop();
+  });
+
   /**
    * Makes a series of tests for the given manifest type.
    *

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"', []);
 

package/test/hls/hls_live_unit.js

@@ -501,10 +501,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 for low latency mode', async () => {
       const mediaWithLowLatency = [
         '#EXTM3U\n',

package/test/hls/hls_parser_unit.js

@@ -1114,63 +1114,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',
@@ -3132,8 +3075,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/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/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);
   });
 });