shaka-player 4.4.2 → 4.4.3

package/lib/text/cue.js

@@ -26,7 +26,7 @@ shaka.text.Cue = class {
      * The start time of the cue in seconds, relative to the start of the
      * presentation.
      * @type {number}
-     * @exportDoc
+     * @export
      */
     this.startTime = startTime;
 
@@ -34,7 +34,7 @@ shaka.text.Cue = class {
      * The end time of the cue in seconds, relative to the start of the
      * presentation.
      * @type {number}
-     * @exportDoc
+     * @export
      */
     this.endTime = endTime;
 
@@ -42,7 +42,7 @@ shaka.text.Cue = class {
      * The text payload of the cue.  If nestedCues is non-empty, this should be
      * empty.  Top-level block containers should have no payload of their own.
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.payload = payload;
 
@@ -50,7 +50,7 @@ shaka.text.Cue = class {
      * The region to render the cue into.  Only supported on top-level cues,
      * because nested cues are inline elements.
      * @type {shaka.text.CueRegion}
-     * @exportDoc
+     * @export
      */
     this.region = new shaka.text.CueRegion();
 
@@ -58,42 +58,42 @@ shaka.text.Cue = class {
      * The indent (in percent) of the cue box in the direction defined by the
      * writing direction.
      * @type {?number}
-     * @exportDoc
+     * @export
      */
     this.position = null;
 
     /**
      * Position alignment of the cue.
      * @type {shaka.text.Cue.positionAlign}
-     * @exportDoc
+     * @export
      */
     this.positionAlign = Cue.positionAlign.AUTO;
 
     /**
      * Size of the cue box (in percents), where 0 means "auto".
      * @type {number}
-     * @exportDoc
+     * @export
      */
     this.size = 0;
 
     /**
      * Alignment of the text inside the cue box.
      * @type {shaka.text.Cue.textAlign}
-     * @exportDoc
+     * @export
      */
     this.textAlign = Cue.textAlign.CENTER;
 
     /**
      * Text direction of the cue.
      * @type {shaka.text.Cue.direction}
-     * @exportDoc
+     * @export
      */
     this.direction = Cue.direction.HORIZONTAL_LEFT_TO_RIGHT;
 
     /**
      * Text writing mode of the cue.
      * @type {shaka.text.Cue.writingMode}
-     * @exportDoc
+     * @export
      */
     this.writingMode = Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM;
 
@@ -101,7 +101,7 @@ shaka.text.Cue = class {
      * The way to interpret line field. (Either as an integer line number or
      * percentage from the display box).
      * @type {shaka.text.Cue.lineInterpretation}
-     * @exportDoc
+     * @export
      */
     this.lineInterpretation = Cue.lineInterpretation.LINE_NUMBER;
 
@@ -109,7 +109,7 @@ shaka.text.Cue = class {
      * The offset from the display box in either number of lines or
      * percentage depending on the value of lineInterpretation.
      * @type {?number}
-     * @exportDoc
+     * @export
      */
     this.line = null;
 
@@ -118,7 +118,7 @@ shaka.text.Cue = class {
      * (e.g. '100px'/'100em'). If not specified, this should be no less than
      * the largest font size applied to the text in the cue.
      * @type {string}.
-     * @exportDoc
+     * @export
      */
     this.lineHeight = '';
 
@@ -132,7 +132,7 @@ shaka.text.Cue = class {
      * (for vertical growing right), or left side (for vertical growing left) is
      * aligned at the line.
      * @type {shaka.text.Cue.lineAlign}
-     * @exportDoc
+     * @export
      */
     this.lineAlign = Cue.lineAlign.START;
 
@@ -141,84 +141,84 @@ shaka.text.Cue = class {
      * 'BEFORE' means displaying the captions at the top of the text display
      * container box, 'CENTER' means in the middle, 'AFTER' means at the bottom.
      * @type {shaka.text.Cue.displayAlign}
-     * @exportDoc
+     * @export
      */
     this.displayAlign = Cue.displayAlign.AFTER;
 
     /**
      * Text color as a CSS color, e.g. "#FFFFFF" or "white".
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.color = '';
 
     /**
      * Text background color as a CSS color, e.g. "#FFFFFF" or "white".
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.backgroundColor = '';
 
     /**
      * The URL of the background image, e.g. "data:[mime type];base64,[data]".
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.backgroundImage = '';
 
     /**
      * The border around this cue as a CSS border.
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.border = '';
 
     /**
      * Text font size in px or em (e.g. '100px'/'100em').
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.fontSize = '';
 
     /**
      * Text font weight. Either normal or bold.
      * @type {shaka.text.Cue.fontWeight}
-     * @exportDoc
+     * @export
      */
     this.fontWeight = Cue.fontWeight.NORMAL;
 
     /**
      * Text font style. Normal, italic or oblique.
      * @type {shaka.text.Cue.fontStyle}
-     * @exportDoc
+     * @export
      */
     this.fontStyle = Cue.fontStyle.NORMAL;
 
     /**
      * Text font family.
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.fontFamily = '';
 
     /**
      * Text letter spacing as a CSS letter-spacing value.
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.letterSpacing = '';
 
     /**
      * Text line padding as a CSS line-padding value.
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.linePadding = '';
 
     /**
      * Opacity of the cue element, from 0-1.
      * @type {number}
-     * @exportDoc
+     * @export
      */
     this.opacity = 1;
 
@@ -226,42 +226,42 @@ shaka.text.Cue = class {
      * Text decoration. A combination of underline, overline
      * and line through. Empty array means no decoration.
      * @type {!Array.<!shaka.text.Cue.textDecoration>}
-     * @exportDoc
+     * @export
      */
     this.textDecoration = [];
 
     /**
      * Text shadow color as a CSS text-shadow value.
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.textShadow = '';
 
     /**
      * Text stroke color as a CSS color, e.g. "#FFFFFF" or "white".
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.textStrokeColor = '';
 
     /**
      * Text stroke width as a CSS stroke-width value.
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.textStrokeWidth = '';
 
     /**
      * Whether or not line wrapping should be applied to the cue.
      * @type {boolean}
-     * @exportDoc
+     * @export
      */
     this.wrapLine = true;
 
     /**
      * Id of the cue.
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.id = '';
 
@@ -270,7 +270,7 @@ shaka.text.Cue = class {
      * Top-level cues are blocks, and nested cues are inline elements.
      * Cues can be nested arbitrarily deeply.
      * @type {!Array.<!shaka.text.Cue>}
-     * @exportDoc
+     * @export
      */
     this.nestedCues = [];
 
@@ -280,7 +280,7 @@ shaka.text.Cue = class {
      * in a TTML file. This controls the flow of the final cues; any nested cues
      * within an "isContainer" cue will be laid out as separate lines.
      * @type {boolean}
-     * @exportDoc
+     * @export
      */
     this.isContainer = false;
 
@@ -288,7 +288,7 @@ shaka.text.Cue = class {
      * Whether or not the cue only acts as a line break between two nested cues.
      * Should only appear in nested cues.
      * @type {boolean}
-     * @exportDoc
+     * @export
      */
     this.lineBreak = false;
 
@@ -297,7 +297,7 @@ shaka.text.Cue = class {
      * Region area is divided.
      *
      * @type {{ columns: number, rows: number }}
-     * @exportDoc
+     * @export
      */
     this.cellResolution = {
       columns: 32,
@@ -551,7 +551,7 @@ shaka.text.CueRegion = class {
     /**
      * Region identifier.
      * @type {string}
-     * @exportDoc
+     * @export
      */
     this.id = '';
 
@@ -559,7 +559,7 @@ shaka.text.CueRegion = class {
      * The X offset to start the rendering area in viewportAnchorUnits of the
      * video width.
      * @type {number}
-     * @exportDoc
+     * @export
      */
     this.viewportAnchorX = 0;
 
@@ -567,7 +567,7 @@ shaka.text.CueRegion = class {
      * The X offset to start the rendering area in viewportAnchorUnits of the
      * video height.
      * @type {number}
-     * @exportDoc
+     * @export
      */
     this.viewportAnchorY = 0;
 
@@ -575,7 +575,7 @@ shaka.text.CueRegion = class {
      * The X offset to start the rendering area in percentage (0-100) of this
      * region width.
      * @type {number}
-     * @exportDoc
+     * @export
      */
     this.regionAnchorX = 0;
 
@@ -583,42 +583,42 @@ shaka.text.CueRegion = class {
      * The Y offset to start the rendering area in percentage (0-100) of the
      * region height.
      * @type {number}
-     * @exportDoc
+     * @export
      */
     this.regionAnchorY = 0;
 
     /**
      * The width of the rendering area in widthUnits.
      * @type {number}
-     * @exportDoc
+     * @export
      */
     this.width = 100;
 
     /**
      * The width of the rendering area in heightUnits.
      * @type {number}
-     * @exportDoc
+     * @export
      */
     this.height = 100;
 
     /**
      * The units (percentage, pixels or lines) the region height is in.
      * @type {shaka.text.CueRegion.units}
-     * @exportDoc
+     * @export
      */
     this.heightUnits = CueRegion.units.PERCENTAGE;
 
     /**
      * The units (percentage or pixels) the region width is in.
      * @type {shaka.text.CueRegion.units}
-     * @exportDoc
+     * @export
      */
     this.widthUnits = CueRegion.units.PERCENTAGE;
 
     /**
      * The units (percentage or pixels) the region viewportAnchors are in.
      * @type {shaka.text.CueRegion.units}
-     * @exportDoc
+     * @export
      */
     this.viewportAnchorUnits = CueRegion.units.PERCENTAGE;
 
@@ -628,7 +628,7 @@ shaka.text.CueRegion = class {
      * region up.  Otherwise (scroll=NONE) cues will stay fixed at the location
      * they were first painted in.
      * @type {shaka.text.CueRegion.scrollMode}
-     * @exportDoc
+     * @export
      */
     this.scroll = CueRegion.scrollMode.NONE;
   }

package/lib/text/vtt_text_parser.js

@@ -417,6 +417,8 @@ shaka.text.VttTextParser = class {
       cue = new shaka.text.Cue(start, end, '');
     }
 
+    VttTextParser.parseCueStyles(payload, cue, styles);
+
     // Parse optional settings.
     parser.skipWhitespace();
     let word = parser.readWord();
@@ -430,8 +432,6 @@ shaka.text.VttTextParser = class {
       word = parser.readWord();
     }
 
-    VttTextParser.parseCueStyles(payload, cue, styles);
-
     if (id != null) {
       cue.id = id;
     }

package/lib/util/cmcd_manager.js

@@ -406,12 +406,17 @@ shaka.util.CmcdManager = class {
    * @private
    */
   getObjectTypeFromMimeType_(mimeType) {
-    switch (mimeType) {
+    switch (mimeType.toLowerCase()) {
       case 'video/webm':
       case 'video/mp4':
+      case 'video/mpeg':
+      case 'video/mp2t':
         return shaka.util.CmcdManager.ObjectType.MUXED;
 
       case 'application/x-mpegurl':
+      case 'application/vnd.apple.mpegurl':
+      case 'application/dash+xml':
+      case 'video/vnd.mpeg.dash.mpd':
         return shaka.util.CmcdManager.ObjectType.MANIFEST;
 
       default:

package/lib/util/manifest_parser_utils.js

@@ -32,13 +32,19 @@ shaka.util.ManifestParserUtils = class {
       return baseUris;
     }
 
+    if (baseUris.length == 1 && relativeUris.length == 1) {
+      const baseUri = new goog.Uri(baseUris[0]);
+      const relativeUri = new goog.Uri(relativeUris[0]);
+      return [baseUri.resolve(relativeUri).toString()];
+    }
+
     const relativeAsGoog = relativeUris.map((uri) => new goog.Uri(uri));
     // Resolve each URI relative to each base URI, creating an Array of Arrays.
     // Then flatten the Arrays into a single Array.
-    return baseUris.map((uri) => new goog.Uri(uri))
-        .map((base) => relativeAsGoog.map((i) => base.resolve(i)))
-        .reduce(Functional.collapseArrays, [])
-        .map((uri) => uri.toString());
+    return baseUris.map((uri) => {
+      const base = new goog.Uri(uri);
+      return relativeAsGoog.map((i) => base.resolve(i).toString());
+    }).reduce(Functional.collapseArrays, []);
   }
 
 

package/lib/util/platform.js

@@ -368,6 +368,20 @@ shaka.util.Platform = class {
     return navigator.platform.toLowerCase().includes('mac');
   }
 
+  /**
+   * Return true if the platform is a Windows, regardless of the browser.
+   *
+   * @return {boolean}
+   */
+  static isWindows() {
+    // Try the newer standard first.
+    if (navigator.userAgentData && navigator.userAgentData.platform) {
+      return navigator.userAgentData.platform.toLowerCase() == 'windows';
+    }
+    // Fall back to the old API, with less strict matching.
+    return navigator.platform.toLowerCase().includes('windows');
+  }
+
   /**
    * Check if the user agent contains a key. This is the best way we know of
    * right now to detect platforms. If there is a better way, please send a

package/lib/util/ts_parser.js

@@ -129,15 +129,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.4.2",
+  "version": "4.4.3",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

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