shaka-player 4.6.3 → 4.6.5

package/docs/tutorials/ui.md

@@ -204,11 +204,13 @@ constructor.
 // "local" because it is for local playback only, as opposed to the player proxy
 // object, which will route your calls to the ChromeCast receiver as necessary.
 const localPlayer = new shaka.Player();
-await localPlayer.attach(videoElement);
 // "Overlay" because the UI will add DOM elements inside the container,
 // to visually overlay the video element
 const ui = new shaka.ui.Overlay(localPlayer, videoContainerElement,
   videoElement);
+// Now that the player has been configured to be part of a UI, attach it to the
+// video.
+await localPlayer.attach(videoElement);
 
 // As with DOM-based setup, get access to the UI controls and player from the
 // UI.

package/lib/ads/client_side_ad_manager.js

@@ -13,6 +13,10 @@ goog.provide('shaka.ads.ClientSideAdManager');
 
 goog.require('goog.asserts');
 goog.require('shaka.ads.ClientSideAd');
+goog.require('shaka.log');
+goog.require('shaka.util.Dom');
+goog.require('shaka.util.EventManager');
+goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IReleasable');
 
 /**

package/lib/ads/media_tailor_ad_manager.js

@@ -15,7 +15,12 @@ goog.require('goog.asserts');
 goog.require('shaka.ads.MediaTailorAd');
 goog.require('shaka.log');
 goog.require('shaka.net.NetworkingEngine');
+goog.require('goog.Uri');
+goog.require('shaka.util.EventManager');
+goog.require('shaka.util.Error');
+goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IReleasable');
+goog.require('shaka.util.PublicPromise');
 goog.require('shaka.util.StringUtils');
 
 

package/lib/ads/server_side_ad_manager.js

@@ -14,7 +14,11 @@ goog.provide('shaka.ads.ServerSideAdManager');
 goog.require('goog.asserts');
 goog.require('shaka.ads.ServerSideAd');
 goog.require('shaka.log');
+goog.require('shaka.util.EventManager');
+goog.require('shaka.util.Error');
+goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IReleasable');
+goog.require('shaka.util.PublicPromise');
 
 
 /**

package/lib/hls/hls_parser.js

@@ -3753,14 +3753,26 @@ shaka.hls.HlsParser = class {
 
     // If unable to guess mime type, request a segment and try getting it
     // from the response.
+    let contentMimeType;
+    const type = shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT;
     const headRequest = shaka.net.NetworkingEngine.makeRequest(
         middleSegmentUris, this.config_.retryParameters);
-    headRequest.method = 'HEAD';
-    const type = shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT;
-    const response = await this.makeNetworkRequest_(
-        headRequest, requestType, {type});
+    try {
+      headRequest.method = 'HEAD';
+      const response = await this.makeNetworkRequest_(
+          headRequest, requestType, {type});
+
+      contentMimeType = response.headers['content-type'];
+    } catch (error) {
+      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+        headRequest.method = 'GET';
+        const response = await this.makeNetworkRequest_(
+            headRequest, requestType, {type});
+
+        contentMimeType = response.headers['content-type'];
+      }
+    }
 
-    const contentMimeType = response.headers['content-type'];
     if (contentMimeType) {
       // Split the MIME type in case the server sent additional parameters.
       return contentMimeType.split(';')[0];

package/lib/media/drm_engine.js

@@ -2038,9 +2038,6 @@ shaka.media.DrmEngine = class {
 
     for (const drm1 of drms1) {
       for (const drm2 of drms2) {
-        // This method is only called to compare drmInfos of a video and an
-        // audio adaptations, so we shouldn't have to worry about checking
-        // robustness.
         if (drm1.keySystem == drm2.keySystem) {
           const initDataMap = new Map();
           const bothInitDatas = (drm1.initData || [])

package/lib/media/media_source_engine.js

@@ -864,7 +864,7 @@ shaka.media.MediaSourceEngine = class {
         const calculatedTimestampOffset = reference.startTime - timestamp;
         const timestampOffsetDifference =
             Math.abs(timestampOffset - calculatedTimestampOffset);
-        if ((timestampOffsetDifference >= 0.1 || seeked || adaptation) &&
+        if ((timestampOffsetDifference >= 0.001 || seeked || adaptation) &&
             (!isChunkedData || calculatedTimestampOffset > 0 ||
             !timestampOffset)) {
           timestampOffset = calculatedTimestampOffset;

package/lib/media/streaming_engine.js

@@ -6,7 +6,6 @@
 
 /**
  * @fileoverview
- * @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
  */
 
 goog.provide('shaka.media.StreamingEngine');
@@ -14,12 +13,14 @@ goog.provide('shaka.media.StreamingEngine');
 goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.media.InitSegmentReference');
+goog.require('shaka.media.ManifestParser');
 goog.require('shaka.media.MediaSourceEngine');
 goog.require('shaka.media.SegmentIterator');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.media.SegmentPrefetch');
 goog.require('shaka.net.Backoff');
 goog.require('shaka.net.NetworkingEngine');
+goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.DelayedTick');
 goog.require('shaka.util.Destroyer');
 goog.require('shaka.util.Error');
@@ -28,6 +29,7 @@ goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.Id3Utils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
+goog.require('shaka.util.Mp4BoxParsers');
 goog.require('shaka.util.Mp4Parser');
 goog.require('shaka.util.Networking');
 
@@ -2203,7 +2205,6 @@ shaka.media.StreamingEngine = class {
    *
    * @return {!Promise.<BufferSource>}
    * @private
-   * @suppress {strictMissingProperties}
    */
   async fetch_(mediaState, reference, streamDataCallback) {
     if (reference instanceof shaka.media.InitSegmentReference) {

package/lib/media/video_wrapper.js

@@ -183,8 +183,8 @@ shaka.media.VideoWrapper = class {
 
 /**
  * A class used to move the playhead away from its current time.  Sometimes,
- * Edge ignores re-seeks. After changing the current time, check every 100ms,
- * retrying if the change was not accepted.
+ * legacy Edge ignores re-seeks. After changing the current time, check every
+ * 100ms, retrying if the change was not accepted.
  *
  * Delay stats over 100 runs of a re-seeking integration test:
  *   Edge   -   0ms -   2%
@@ -194,7 +194,8 @@ shaka.media.VideoWrapper = class {
  *   Edge   - 400ms -   2%
  *   Chrome -   0ms - 100%
  *
- * TODO: File a bug on Edge about this.
+ * Unfortunately, legacy Edge is not receiving updates anymore, but it still
+ * must be supported as it is used for web browsers on XBox.
  *
  * @implements {shaka.util.IReleasable}
  * @final

package/lib/net/networking_utils.js

@@ -8,6 +8,7 @@ goog.provide('shaka.net.NetworkingUtils');
 
 goog.require('goog.Uri');
 goog.require('shaka.net.NetworkingEngine');
+goog.require('shaka.util.Error');
 
 
 /**
@@ -30,13 +31,21 @@ shaka.net.NetworkingUtils = class {
     const type = shaka.net.NetworkingEngine.RequestType.MANIFEST;
 
     const request = shaka.net.NetworkingEngine.makeRequest([uri], retryParams);
-    request.method = 'HEAD';
 
-    const response = await netEngine.request(type, request).promise;
+    try {
+      request.method = 'HEAD';
+      const response = await netEngine.request(type, request).promise;
+      mimeType = response.headers['content-type'];
+    } catch (error) {
+      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+        request.method = 'GET';
+        const response = await netEngine.request(type, request).promise;
+        mimeType = response.headers['content-type'];
+      }
+    }
 
     // https://bit.ly/2K9s9kf says this header should always be available,
     // but just to be safe:
-    mimeType = response.headers['content-type'];
     return mimeType ? mimeType.toLowerCase().split(';').shift() : '';
   }
 

package/lib/player.js

@@ -4525,7 +4525,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
       if (this.isLive()) {
         const now = this.getPresentationStartTimeAsDate().valueOf() +
-            this.seekRange().end * 1000;
+            element.currentTime * 1000;
         const latency = (Date.now() - now) / 1000;
         this.stats_.setLiveLatency(latency);
       }
@@ -5144,7 +5144,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       } else {
         // eslint-disable-next-line no-restricted-syntax
         if (HTMLMediaElement.prototype.addTextTrack) {
-          return new shaka.text.SimpleTextDisplayer(this.video_);
+          return new shaka.text.SimpleTextDisplayer(
+              this.video_, shaka.Player.TextTrackLabel);
         } else {
           shaka.log.warning('Text tracks are not supported by the ' +
                             'browser, disabling.');
@@ -6386,6 +6387,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }  // if (keyIds.size)
 
     if (tracksChanged) {
+      this.onTracksChanged_();
       const variantsUpdated = this.updateAbrManagerVariants_();
       if (!variantsUpdated) {
         return;
@@ -6397,10 +6399,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       shaka.log.debug('Choosing new streams after key status changed');
       this.chooseVariantAndSwitch_();
     }
-
-    if (tracksChanged) {
-      this.onTracksChanged_();
-    }
   }
 
   /**
@@ -6781,7 +6779,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.3' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.5' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/simple_text_displayer.js

@@ -6,7 +6,6 @@
 
 /**
  * @fileoverview
- * @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
  */
 
 goog.provide('shaka.text.SimpleTextDisplayer');
@@ -24,8 +23,11 @@ goog.require('shaka.text.Utils');
  * @export
  */
 shaka.text.SimpleTextDisplayer = class {
-  /** @param {HTMLMediaElement} video */
-  constructor(video) {
+  /**
+   * @param {HTMLMediaElement} video
+   * @param {string} label
+   */
+  constructor(video, label) {
     /** @private {TextTrack} */
     this.textTrack_ = null;
 
@@ -39,7 +41,7 @@ shaka.text.SimpleTextDisplayer = class {
       // element.
       track.mode = 'disabled';
 
-      if (track.label == shaka.Player.TextTrackLabel) {
+      if (track.label == label) {
         this.textTrack_ = track;
       }
     }
@@ -49,8 +51,7 @@ shaka.text.SimpleTextDisplayer = class {
       // kind to 'subtitles' or 'captions' when creating the TextTrack object.
       // The individual text tracks from the manifest will still have their own
       // kinds which can be displayed in the app's UI.
-      this.textTrack_ = video.addTextTrack(
-          'subtitles', shaka.Player.TextTrackLabel);
+      this.textTrack_ = video.addTextTrack('subtitles', label);
     }
     this.textTrack_.mode = 'hidden';
   }
@@ -80,7 +81,7 @@ shaka.text.SimpleTextDisplayer = class {
    * @export
    */
   append(cues) {
-    const flattenedCues = shaka.text.Utils.getCuesToFlatten(cues, []);
+    const flattenedCues = shaka.text.Utils.getCuesToFlatten(cues);
 
     // Convert cues.
     const textTrackCues = [];

package/lib/text/text_utils.js

@@ -15,16 +15,19 @@ shaka.text.Utils = class {
    * their contents should be combined and replace the payload of the parent.
    *
    * @param {!shaka.text.Cue} cue
+   * @param {?shaka.text.Cue=} parentCue
    * @return {string}
    * @private
    */
-  static flattenPayload_(cue) {
+  static flattenPayload_(cue, parentCue) {
     if (cue.lineBreak) {
       // This is a vertical lineBreak, so insert a newline.
       return '\n';
     }
     if (cue.nestedCues.length) {
-      return cue.nestedCues.map(shaka.text.Utils.flattenPayload_).join('');
+      return cue.nestedCues.map((nested) => {
+        return shaka.text.Utils.flattenPayload_(nested, cue);
+      }).join('');
     }
 
     // Handle bold, italics and underline
@@ -43,14 +46,22 @@ shaka.text.Utils = class {
       openStyleTags.push(['u']);
     }
     // Handle color classes, if the value consists of letters
+    let color = cue.color;
+    if (color == '' && parentCue) {
+      color = parentCue.color;
+    }
     let classes = '';
-    const color = shaka.text.Utils.getColorName_(cue.color);
-    if (color) {
-      classes += `.${color}`;
+    const colorName = shaka.text.Utils.getColorName_(color);
+    if (colorName) {
+      classes += `.${colorName}`;
+    }
+    let bgColor = cue.backgroundColor;
+    if (bgColor == '' && parentCue) {
+      bgColor = parentCue.backgroundColor;
     }
-    const bgColor = shaka.text.Utils.getColorName_(cue.backgroundColor);
-    if (bgColor) {
-      classes += `.bg_${bgColor}`;
+    const bgColorName = shaka.text.Utils.getColorName_(bgColor);
+    if (bgColorName) {
+      classes += `.bg_${bgColorName}`;
     }
     if (classes) {
       openStyleTags.push(['c', classes]);
@@ -69,7 +80,20 @@ shaka.text.Utils = class {
    * @private
    */
   static getColorName_(string) {
-    switch (string.toLowerCase()) {
+    let colorString = string.toLowerCase();
+    const rgb = colorString.replace(/\s/g, '')
+        .match(/^rgba?\((\d+),(\d+),(\d+),?([^,\s)]+)?/i);
+    if (rgb) {
+      colorString = '#' +
+          (parseInt(rgb[1], 10) | (1 << 8)).toString(16).slice(1) +
+          (parseInt(rgb[2], 10) | (1 << 8)).toString(16).slice(1) +
+          (parseInt(rgb[3], 10) | (1 << 8)).toString(16).slice(1);
+    } else if (colorString.startsWith('#') && colorString.length > 7) {
+      // With this we lose the alpha of the color, but it is better than having
+      // no color.
+      colorString = colorString.slice(0, 7);
+    }
+    switch (colorString) {
       case 'white':
       case '#fff':
       case '#ffffff':
@@ -92,6 +116,7 @@ shaka.text.Utils = class {
         return 'yellow';
       case 'magenta':
       case '#f0f':
+      case '#ff00ff':
         return 'magenta';
       case 'blue':
       case '#00f':
@@ -118,19 +143,20 @@ shaka.text.Utils = class {
    * isContainer = false.
    *
    * @param {!Array.<!shaka.text.Cue>} cues
-   * @param {!Array.<!shaka.text.Cue>} result
+   * @param {?shaka.text.Cue=} parentCue
    * @return {!Array.<!shaka.text.Cue>}
    */
-  static getCuesToFlatten(cues, result) {
+  static getCuesToFlatten(cues, parentCue) {
+    const result = [];
     for (const cue of cues) {
       if (cue.isContainer) {
         // Recurse to find the actual text payload cues.
-        shaka.text.Utils.getCuesToFlatten(cue.nestedCues, result);
+        result.push(...shaka.text.Utils.getCuesToFlatten(cue.nestedCues, cue));
       } else {
         // Flatten the payload.
         const flatCue = cue.clone();
         flatCue.nestedCues = [];
-        flatCue.payload = shaka.text.Utils.flattenPayload_(cue);
+        flatCue.payload = shaka.text.Utils.flattenPayload_(cue, parentCue);
         result.push(flatCue);
       }
     }

package/lib/text/ui_text_displayer.js

@@ -707,37 +707,46 @@ shaka.text.UITextDisplayer = class {
     //   (for vertical growing left) is aligned at the line.
     // TODO: Implement line alignment with line number.
     // TODO: Implement lineAlignment of 'CENTER'.
-    if (cue.line != null) {
+    let line = cue.line;
+    if (line != null) {
       let lineInterpretation = cue.lineInterpretation;
       // HACK: the current implementation of UITextDisplayer only handled
-      // PERCENTAGE, as cue.line=0 is zero, we can interpret it as percentage
-      // safely.
-      if (cue.line == 0 &&
-          lineInterpretation == Cue.lineInterpretation.LINE_NUMBER) {
+      // PERCENTAGE, so we need convert LINE_NUMBER to PERCENTAGE
+      if (lineInterpretation == Cue.lineInterpretation.LINE_NUMBER) {
         lineInterpretation = Cue.lineInterpretation.PERCENTAGE;
+        let maxLines = 16;
+        // The maximum number of lines is different if it is a vertical video.
+        if (this.aspectRatio_ && this.aspectRatio_ < 1) {
+          maxLines = 32;
+        }
+        if (line < 0) {
+          line = 100 + line / maxLines * 100;
+        } else {
+          line = line / maxLines * 100;
+        }
       }
       if (lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
         style.position = 'absolute';
         if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
           style.width = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
-            style.top = cue.line + '%';
+            style.top = line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.bottom = (100 - cue.line) + '%';
+            style.bottom = (100 - line) + '%';
           }
         } else if (cue.writingMode == Cue.writingMode.VERTICAL_LEFT_TO_RIGHT) {
           style.height = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
-            style.left = cue.line + '%';
+            style.left = line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.right = (100 - cue.line) + '%';
+            style.right = (100 - line) + '%';
           }
         } else {
           style.height = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
-            style.right = cue.line + '%';
+            style.right = line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.left = (100 - cue.line) + '%';
+            style.left = (100 - line) + '%';
           }
         }
       }

package/lib/text/web_vtt_generator.js

@@ -40,7 +40,7 @@ shaka.text.WebVttGenerator = class {
           milliseconds;
     };
 
-    const flattenedCues = shaka.text.Utils.getCuesToFlatten(cues, []);
+    const flattenedCues = shaka.text.Utils.getCuesToFlatten(cues);
 
     let webvttString = 'WEBVTT\n\n';
     for (const cue of flattenedCues) {

package/lib/util/ts_parser.js

@@ -614,9 +614,11 @@ shaka.util.TsParser = class {
       let sort = false;
       for (const audioData of this.audioData_) {
         const pes = this.parsePES_(audioData);
-        if (pes && pes.pts != null && pes.dts != null) {
-          if (this.audioPes_.length &&
-              pes.dts < (this.audioPes_[this.audioPes_.length - 1].dts || 0)) {
+        let previousPes = this.audioPes_.length ?
+            this.audioPes_[this.audioPes_.length - 1] : null;
+        if (pes && pes.pts != null && pes.dts != null && (!previousPes ||
+            (previousPes.pts != pes.pts && previousPes.dts != pes.dts))) {
+          if (this.audioPes_.length && pes.dts < (previousPes.dts || 0)) {
             sort = true;
           }
           this.audioPes_.push(pes);
@@ -625,7 +627,7 @@ shaka.util.TsParser = class {
           if (!data) {
             continue;
           }
-          const previousPes = this.audioPes_.pop();
+          previousPes = this.audioPes_.pop();
           previousPes.data =
               shaka.util.Uint8ArrayUtils.concat(previousPes.data, data);
           this.audioPes_.push(previousPes);
@@ -654,9 +656,11 @@ shaka.util.TsParser = class {
       let sort = false;
       for (const videoData of this.videoData_) {
         const pes = this.parsePES_(videoData);
-        if (pes && pes.pts != null && pes.dts != null) {
-          if (this.videoPes_.length &&
-              pes.dts < (this.videoPes_[this.videoPes_.length - 1].dts || 0)) {
+        let previousPes = this.videoPes_.length ?
+            this.videoPes_[this.videoPes_.length - 1] : null;
+        if (pes && pes.pts != null && pes.dts != null && (!previousPes ||
+            (previousPes.pts != pes.pts && previousPes.dts != pes.dts))) {
+          if (this.videoPes_.length && pes.dts < (previousPes.dts || 0)) {
             sort = true;
           }
           this.videoPes_.push(pes);
@@ -665,7 +669,7 @@ shaka.util.TsParser = class {
           if (!data) {
             continue;
           }
-          const previousPes = this.videoPes_.pop();
+          previousPes = this.videoPes_.pop();
           previousPes.data =
               shaka.util.Uint8ArrayUtils.concat(previousPes.data, data);
           this.videoPes_.push(previousPes);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.6.3",
+  "version": "4.6.5",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/test/media/drm_engine_unit.js

@@ -2390,6 +2390,33 @@ describe('DrmEngine', () => {
           [drmInfoAudio]);
       expect(returned).toEqual([drmInfoDesired]);
     });
+
+    it('does not match incompatible drmInfos', () => {
+      // Different key systems do not match.
+      const drmInfo1 = {
+        keySystem: 'drm.abc',
+        licenseServerUri: undefined,
+        distinctiveIdentifierRequired: false,
+        persistentStateRequired: false,
+        serverCertificate: undefined,
+        serverCertificateUri: '',
+        initData: [],
+        keyIds: new Set(),
+      };
+      const drmInfo2 = {
+        keySystem: 'drm.foobar',
+        licenseServerUri: undefined,
+        distinctiveIdentifierRequired: false,
+        persistentStateRequired: false,
+        serverCertificate: undefined,
+        serverCertificateUri: '',
+        initData: [],
+        keyIds: new Set(),
+      };
+      const returned1 = shaka.media.DrmEngine.getCommonDrmInfos(
+          [drmInfo1], [drmInfo2]);
+      expect(returned1).toEqual([]);
+    });
   }); // describe('getCommonDrmInfos')
 
   describe('configure', () => {

package/test/player_unit.js

@@ -3484,6 +3484,37 @@ describe('Player', () => {
       expect(tracks[0].id).toBe(2);
     });
 
+    it('removes based on frameRate', async () => {
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.addVideo(1, (stream) => {
+            stream.frameRate = 15;
+          });
+        });
+
+        manifest.addVariant(1, (variant) => {
+          variant.addVideo(2, (stream) => {
+            stream.frameRate = 30;
+          });
+        });
+
+        manifest.addVariant(2, (variant) => {
+          variant.addVideo(3, (stream) => {
+            stream.frameRate = 60;
+          });
+        });
+      });
+
+      await player.load(fakeManifestUri, 0, fakeMimeType);
+      expect(player.getVariantTracks().length).toBe(3);
+
+      player.configure({restrictions: {minFrameRate: 20, maxFrameRate: 40}});
+
+      const tracks = player.getVariantTracks();
+      expect(tracks.length).toBe(1);
+      expect(tracks[0].id).toBe(1);
+    });
+
     it('removes the whole variant if one stream is restricted', async () => {
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(0, (variant) => {

package/test/test/util/layout_tests.js

@@ -377,7 +377,8 @@ shaka.test.NativeTextLayoutTests = class extends shaka.test.TextLayoutTests {
 
   /** @override */
   recreateTextDisplayer() {
-    this.textDisplayer = new shaka.text.SimpleTextDisplayer(this.video);
+    this.textDisplayer = new shaka.text.SimpleTextDisplayer(
+        this.video, shaka.Player.TextTrackLabel);
     this.textDisplayer.setTextVisibility(true);
   }
 

package/test/text/simple_text_displayer_unit.js

@@ -18,7 +18,7 @@ describe('SimpleTextDisplayer', () => {
 
   beforeEach(() => {
     video = new shaka.test.FakeVideo();
-    displayer = new SimpleTextDisplayer(video);
+    displayer = new SimpleTextDisplayer(video, shaka.Player.TextTrackLabel);
 
     expect(video.textTracks.length).toBe(1);
     mockTrack = /** @type {!shaka.test.FakeTextTrack} */ (video.textTracks[0]);

package/test/text/web_vtt_generator_unit.js

@@ -18,11 +18,11 @@ describe('WebVttGenerator', () => {
     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';
+    shakaCue2.color = '#00ff00ff';
+    shakaCue2.backgroundColor = 'rgba(0,255,0,1)';
     const shakaCue3 = new shaka.text.Cue(50, 51, 'Test3');
     shakaCue3.textAlign = shaka.text.Cue.textAlign.CENTER;
-    shakaCue3.color = '#ffff00';
+    shakaCue3.color = 'rgb(255,255,0)';
     shakaCue3.backgroundColor = '#00ffff';
     const shakaCue4 = new shaka.text.Cue(52, 53, 'Test4');
     shakaCue4.textAlign = shaka.text.Cue.textAlign.START;