shaka-player 2.5.1 → 2.5.5

package/lib/media/streaming_engine.js

@@ -575,9 +575,16 @@ shaka.media.StreamingEngine.prototype.loadNewTextStream = async function(
   await this.setupStreams_(streamSet);
   if (this.destroyed_) { return; }
 
+  const showText = this.playerInterface_
+      .mediaSourceEngine
+      .getTextDisplayer()
+      .isTextVisible();
+
+  const streamText = showText || this.config_.alwaysStreamText;
+
   if ((this.textStreamSequenceId_ == currentSequenceId) &&
       !this.mediaStates_.has(ContentType.TEXT) &&
-      !this.unloadingTextStream_) {
+      !this.unloadingTextStream_ && streamText) {
     const presentationTime = this.playerInterface_.getPresentationTime();
     const needPeriodIndex = this.findPeriodForTime_(presentationTime);
 
@@ -713,7 +720,12 @@ shaka.media.StreamingEngine.prototype.switchInternal_ = function(
   // handle a Period transition. Simply ignore the given stream, assuming that
   // Player will select the same track in onChooseStreams.
   let periodIndex = this.findPeriodContainingStream_(stream);
-  if (clearBuffer && periodIndex != mediaState.needPeriodIndex) {
+  const mediaStates = Array.from(this.mediaStates_.values());
+  const needSamePeriod = mediaStates.every((ms) => {
+    return ms.needPeriodIndex == mediaState.needPeriodIndex;
+  });
+  if (clearBuffer && periodIndex != mediaState.needPeriodIndex &&
+      needSamePeriod) {
     shaka.log.debug('switch: switching to stream in another Period; clearing ' +
                     'buffer and changing Periods');
     // handlePeriodTransition_ will be called on the next update because the
@@ -796,7 +808,13 @@ shaka.media.StreamingEngine.prototype.switchInternal_ = function(
       // Cancel the update timer, if any.
       this.cancelUpdate_(mediaState);
       // Clear right away.
-      this.clearBuffer_(mediaState, /* flush */ true, safeMargin);
+      this.clearBuffer_(mediaState, /* flush */ true, safeMargin)
+          .catch((error) => {
+            if (this.playerInterface_) {
+              this.playerInterface_.onError(
+                  /** @type {!shaka.util.Error} */ (error));
+            }
+          });
     }
   }
 };
@@ -972,7 +990,11 @@ shaka.media.StreamingEngine.prototype.forceClearBuffer_ = function(
   // buffer right away. Note: clearBuffer_() will schedule the next update.
   shaka.log.debug(logPrefix, 'clear: handling right now');
   this.cancelUpdate_(mediaState);
-  this.clearBuffer_(mediaState, /* flush */ false, 0);
+  this.clearBuffer_(mediaState, /* flush */ false, 0).catch((error) => {
+    if (this.playerInterface_) {
+      this.playerInterface_.onError(/** @type {!shaka.util.Error} */ (error));
+    }
+  });
 };
 
 
@@ -1287,8 +1309,11 @@ shaka.media.StreamingEngine.prototype.onUpdate_ = function(mediaState) {
       // forever at the end.  We should only do this if the duration needs to
       // shrink.  Growing it by less than 1ms can actually cause buffering on
       // replay, as in https://github.com/google/shaka-player/issues/979
-      let duration = this.playerInterface_.mediaSourceEngine.getDuration();
-      if (duration < this.manifest_.presentationTimeline.getDuration()) {
+      // On some platforms, this can spuriously be 0, so ignore this case.
+      // https://github.com/google/shaka-player/issues/1967,
+      const duration = this.playerInterface_.mediaSourceEngine.getDuration();
+      if (duration != 0 &&
+          duration < this.manifest_.presentationTimeline.getDuration()) {
         this.manifest_.presentationTimeline.setDuration(duration);
       }
     }.bind(this));
@@ -1314,11 +1339,7 @@ shaka.media.StreamingEngine.prototype.update_ = function(mediaState) {
   // If it's a text stream and the original id starts with 'CC', it's CEA
   // closed captions. Do not schedule update for closed captions text
   // mediastate, since closed captions are embedded in video streams.
-  const isCaptionState = (state) => {
-    return state.type == ContentType.TEXT &&
-        state.stream.mimeType == shaka.util.MimeUtils.CLOSED_CAPTION_MIMETYPE;
-  };
-  if (isCaptionState(mediaState)) {
+    if (shaka.media.StreamingEngine.isEmbeddedText_(mediaState)) {
     this.playerInterface_.mediaSourceEngine.setSelectedClosedCaptionId(
         mediaState.stream.originalId || '');
     return null;
@@ -1418,7 +1439,9 @@ shaka.media.StreamingEngine.prototype.update_ = function(mediaState) {
   mediaStates.forEach((otherState) => {
     // Do not consider embedded captions in this calculation.  It could lead
     // to hangs in streaming.
-    if (isCaptionState(otherState)) return;
+      if (shaka.media.StreamingEngine.isEmbeddedText_(otherState)) {
+        return;
+      }
 
     const timeNeeded = this.getTimeNeeded_(otherState, presentationTime);
     minTimeNeeded = Math.min(minTimeNeeded, timeNeeded);
@@ -1436,10 +1459,11 @@ shaka.media.StreamingEngine.prototype.update_ = function(mediaState) {
   }
 
   mediaState.resumeAt = 0;
-  this.fetchAndAppend_(mediaState,
-                       presentationTime,
-                       currentPeriodIndex,
-                       reference);
+  this.fetchAndAppend_(
+      mediaState,
+      presentationTime,
+      currentPeriodIndex,
+      reference);
   return null;
 };
 
@@ -2173,13 +2197,15 @@ shaka.media.StreamingEngine.prototype.handlePeriodTransition_ = function(
   goog.asserts.assert(
       mediaStates.every(function(ms) {
         return ms.needPeriodIndex == needPeriodIndex || ms.hasError ||
-            !shaka.media.StreamingEngine.isIdle_(ms);
+            !shaka.media.StreamingEngine.isIdle_(ms) ||
+            shaka.media.StreamingEngine.isEmbeddedText_(ms);
       }),
       'All MediaStates should need the same Period or be performing updates.');
 
   // Only call onChooseStreams() when all MediaStates need the same Period.
   let needSamePeriod = mediaStates.every(function(ms) {
-    return ms.needPeriodIndex == needPeriodIndex;
+    return ms.needPeriodIndex == needPeriodIndex ||
+        shaka.media.StreamingEngine.isEmbeddedText_(ms);
   });
   if (!needSamePeriod) {
     shaka.log.debug(
@@ -2213,6 +2239,10 @@ shaka.media.StreamingEngine.prototype.handlePeriodTransition_ = function(
     let allReady = mediaStates.every(function(ms) {
       let isIdle = shaka.media.StreamingEngine.isIdle_(ms);
       let currentPeriodIndex = this.findPeriodContainingStream_(ms.stream);
+      if (shaka.media.StreamingEngine.isEmbeddedText_(ms)) {
+        // Embedded text tracks don't do Period transitions.
+        return true;
+      }
       return isIdle && ms.needPeriodIndex == needPeriodIndex &&
           currentPeriodIndex != needPeriodIndex;
     }.bind(this));
@@ -2299,6 +2329,18 @@ shaka.media.StreamingEngine.prototype.handlePeriodTransition_ = function(
 };
 
 
+/**
+ * @param {shaka.media.StreamingEngine.MediaState_} mediaState
+ * @return {boolean}
+ * @private
+ */
+shaka.media.StreamingEngine.isEmbeddedText_ = function(mediaState) {
+  const MimeUtils = shaka.util.MimeUtils;
+  return mediaState.type == shaka.util.ManifestParserUtils.ContentType.TEXT &&
+      mediaState.stream.mimeType == MimeUtils.CLOSED_CAPTION_MIMETYPE;
+};
+
+
 /**
  * @param {shaka.media.StreamingEngine.MediaState_} mediaState
  * @return {boolean} True if the given MediaState is idle; otherwise, return
@@ -2481,8 +2523,14 @@ shaka.media.StreamingEngine.prototype.scheduleUpdate_ = function(
   goog.asserts.assert(mediaState.updateTimer == null,
                       logPrefix + ' did not expect update to be scheduled');
 
-  mediaState.updateTimer = new shaka.util.DelayedTick(() => {
-    this.onUpdate_(mediaState);
+  mediaState.updateTimer = new shaka.util.DelayedTick(async () => {
+    try {
+      await this.onUpdate_(mediaState);
+    } catch (error) {
+      if (this.playerInterface_) {
+        this.playerInterface_.onError(error);
+      }
+    }
   }).tickAfter(delay);
 };
 

package/lib/media/transmuxer.js

@@ -94,7 +94,7 @@ shaka.media.Transmuxer.isSupported = function(mimeType, contentType) {
  * @return {boolean}
  */
 shaka.media.Transmuxer.isTsContainer = function(mimeType) {
-  return mimeType.split(';')[0].split('/')[1] == 'mp2t';
+  return mimeType.toLowerCase().split(';')[0].split('/')[1] == 'mp2t';
 };
 
 
@@ -106,7 +106,7 @@ shaka.media.Transmuxer.isTsContainer = function(mimeType) {
  */
 shaka.media.Transmuxer.convertTsCodecs = function(contentType, tsMimeType) {
   const ContentType = shaka.util.ManifestParserUtils.ContentType;
-  let mp4MimeType = tsMimeType.replace('mp2t', 'mp4');
+  let mp4MimeType = tsMimeType.replace(/mp2t/i, 'mp4');
   if (contentType == ContentType.AUDIO) {
     mp4MimeType = mp4MimeType.replace('video', 'audio');
   }

package/lib/media/video_wrapper.js

@@ -49,6 +49,9 @@ shaka.media.VideoWrapper = function(video, onSeek, startTime) {
   /** @private {number} */
   this.startTime_ = startTime;
 
+  /** @private {boolean} */
+  this.started_ = false;
+
   /** @private {shaka.util.EventManager} */
   this.eventManager_ = new shaka.util.EventManager();
 
@@ -92,9 +95,7 @@ shaka.media.VideoWrapper.prototype.release = function() {
  * @return {number}
  */
 shaka.media.VideoWrapper.prototype.getTime = function() {
-  return this.video_.readyState > 0 ?
-         this.video_.currentTime :
-         this.startTime_;
+  return this.started_ ? this.video_.currentTime : this.startTime_;
 };
 
 
@@ -186,6 +187,10 @@ shaka.media.VideoWrapper.prototype.startListeningToSeeks_ = function() {
       this.video_.readyState > 0,
       'The media element should be ready before we listen for seeking.');
 
+  // Now that any startup seeking is complete, we can trust the video element
+  // for currentTime.
+  this.started_ = true;
+
   this.eventManager_.listen(this.video_, 'seeking', () => this.onSeek_());
 };
 

package/lib/net/data_uri_plugin.js

@@ -31,17 +31,20 @@ goog.require('shaka.util.Uint8ArrayUtils');
  * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/data_URIs
  * @param {string} uri
  * @param {shaka.extern.Request} request
- * @param {shaka.net.NetworkingEngine.RequestType=} requestType
+ * @param {shaka.net.NetworkingEngine.RequestType} requestType
+ * @param {shaka.extern.ProgressUpdated} progressUpdated Called when a
+ *   progress event happened.
  * @return {!shaka.extern.IAbortableOperation.<shaka.extern.Response>}
  * @export
  */
-shaka.net.DataUriPlugin = function(uri, request, requestType) {
+shaka.net.DataUriPlugin = function(uri, request, requestType, progressUpdated) {
   try {
     let parsed = shaka.net.DataUriPlugin.parse(uri);
 
     /** @type {shaka.extern.Response} */
     let response = {
       uri: uri,
+      originalUri: uri,
       data: parsed.data,
       headers: {
         'content-type': parsed.contentType,

package/lib/net/http_fetch_plugin.js

@@ -32,8 +32,8 @@ goog.require('shaka.util.Timer');
  * @param {string} uri
  * @param {shaka.extern.Request} request
  * @param {shaka.net.NetworkingEngine.RequestType} requestType
- * @param {shaka.extern.ProgressUpdated=} progressUpdated Called when a progress
- *        event happened.
+ * @param {shaka.extern.ProgressUpdated} progressUpdated Called when a progress
+ *   event happened.
  * @return {!shaka.extern.IAbortableOperation.<shaka.extern.Response>}
  * @export
  */
@@ -98,7 +98,7 @@ shaka.net.HttpFetchPlugin = function(
  * @param {shaka.net.NetworkingEngine.RequestType} requestType
  * @param {!RequestInit} init
  * @param {shaka.net.HttpFetchPlugin.AbortStatus} abortStatus
- * @param {shaka.extern.ProgressUpdated=} progressUpdated
+ * @param {shaka.extern.ProgressUpdated} progressUpdated
  * @return {!Promise<!shaka.extern.Response>}
  * @private
  */

package/lib/net/http_plugin_utils.js

@@ -42,12 +42,10 @@ shaka.net.HttpPluginUtils.makeResponse =
     function(headers, data, status, uri, responseURL, requestType) {
   if (status >= 200 && status <= 299 && status != 202) {
     // Most 2xx HTTP codes are success cases.
-    if (responseURL) {
-      uri = responseURL;
-    }
     /** @type {shaka.extern.Response} */
     let response = {
-      uri: uri,
+      uri: responseURL || uri,
+      originalUri: uri,
       data: data,
       headers: headers,
       fromCache: !!headers['x-shaka-from-cache'],

package/lib/net/http_xhr_plugin.js

@@ -30,8 +30,8 @@ goog.require('shaka.util.Error');
  * @param {string} uri
  * @param {shaka.extern.Request} request
  * @param {shaka.net.NetworkingEngine.RequestType} requestType
- * @param {shaka.extern.ProgressUpdated=} progressUpdated Called when a
- *        progress event happened.
+ * @param {shaka.extern.ProgressUpdated} progressUpdated Called when a
+ *   progress event happened.
  * @return {!shaka.extern.IAbortableOperation.<shaka.extern.Response>}
  * @export
  */

package/lib/net/networking_engine.js

@@ -282,6 +282,7 @@ shaka.net.NetworkingEngine.makeRequest = function(uris, retryParams) {
     allowCrossSiteCredentials: false,
     retryParameters: retryParams,
     licenseRequestType: null,
+    sessionId: null,
   };
 };
 

package/lib/offline/offline_scheme.js

@@ -30,11 +30,14 @@ goog.require('shaka.util.Error');
  * @summary A plugin that handles requests for offline content.
  * @param {string} uri
  * @param {shaka.extern.Request} request
- * @param {shaka.net.NetworkingEngine.RequestType=} requestType
+ * @param {shaka.net.NetworkingEngine.RequestType} requestType
+ * @param {shaka.extern.ProgressUpdated} progressUpdated Called when a
+ *   progress event happened.
  * @return {!shaka.extern.IAbortableOperation.<shaka.extern.Response>}
  * @export
  */
-shaka.offline.OfflineScheme = function(uri, request, requestType) {
+shaka.offline.OfflineScheme = function(
+    uri, request, requestType, progressUpdated) {
   let offlineUri = shaka.offline.OfflineUri.parse(uri);
 
   if (offlineUri && offlineUri.isManifest()) {
@@ -64,6 +67,7 @@ shaka.offline.OfflineScheme.getManifest_ = function(uri) {
   /** @type {shaka.extern.Response} */
   let response = {
     uri: uri,
+    originalUri: uri,
     data: new ArrayBuffer(0),
     headers: {'content-type': 'application/x-offline-manifest'},
   };
@@ -95,6 +99,7 @@ shaka.offline.OfflineScheme.getSegment_ = function(id, uri) {
 
         return {
           uri: uri,
+          originalUri: uri,
           data: segment.data,
           headers: {},
         };

package/lib/player.js

@@ -429,7 +429,7 @@ shaka.Player.prototype.destroy = async function() {
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v2.5.1-uncompiled';
+shaka.Player.version = 'v2.5.5-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.
@@ -1213,7 +1213,6 @@ shaka.Player.prototype.onUnload_ = async function(has, wants) {
 
   // Remove everything that has to do with loading content from our payload
   // since we are releasing everything that depended on it.
-  has.currentTime = null;
   has.factory = null;
   has.mimeType = null;
   has.startTime = null;
@@ -1729,7 +1728,8 @@ shaka.Player.prototype.onLoad_ = async function(has, wants) {
   // active one, update abr manager with filtered variants for the current
   // period.
   /** @type {shaka.extern.Period} */
-  const currentPeriod = this.getPresentationPeriod_();
+  const currentPeriod =
+      this.getPresentationPeriod_() || this.manifest_.periods[0];
   const hasPrimary = currentPeriod.variants.some((v) => v.primary);
 
   if (!this.config_.preferredAudioLanguage && !hasPrimary) {
@@ -2738,12 +2738,15 @@ shaka.Player.prototype.trickPlay = function(rate) {
     return;
   }
 
-  if (this.loadMode_ == shaka.Player.LoadMode.SRC_EQUALS) {
-    this.playRateController_.set(rate);
+  if (this.video_.paused) {
+    // Our fast forward is implemented with playbackRate and needs the video to
+    // be playing (to not be paused) to take immediate effect.
+    // If the video is paused, "unpause" it.
+    this.video_.play();
   }
+  this.playRateController_.set(rate);
 
   if (this.loadMode_ == shaka.Player.LoadMode.MEDIA_SOURCE) {
-    this.playRateController_.set(rate);
     this.streamingEngine_.setTrickPlay(Math.abs(rate) > 1);
   }
 };
@@ -3120,8 +3123,15 @@ shaka.Player.prototype.selectTextLanguage = function(language, role) {
 
     this.currentTextLanguage_ = language;
     this.currentTextRole_ = role || '';
-    // TODO: Refactor to only change text and not affect audio.
-    this.chooseStreamsAndSwitch_(period);
+
+    const chosenText = this.chooseTextStream_(period.textStreams);
+    if (chosenText) {
+      this.addTextStreamToSwitchHistory_(
+          period, chosenText, /* fromAdaptation= */ false);
+      if (this.shouldStreamText_()) {
+        this.switchTextStream_(chosenText);
+      }
+    }
   } else {
     const track = this.getTextTracks().filter((t) => t.language == language)[0];
     if (track) {

package/lib/polyfill/input_event.js

@@ -42,15 +42,18 @@ shaka.polyfill.InputEvent.install = function() {
     return;
   }
 
-  if (HTMLInputElement.prototype.addEventListener ==
-      shaka.polyfill.InputEvent.addEventListener_) {
+  // In our tests, we can end up with multiple independent "shaka" namespaces.
+  // So we can't compare addEventListener with the polyfill directly.
+  // Instead, store the original in a globally accessible place and check if
+  // that has been used yet.
+  if (HTMLInputElement.prototype['originalAddEventListener']) {
     // The polyfill was already installed.
     return;
   }
 
   shaka.log.info('Patching input event support on IE.');
 
-  shaka.polyfill.InputEvent.originalAddEventListener_ =
+  HTMLInputElement.prototype['originalAddEventListener'] =
       HTMLInputElement.prototype.addEventListener;
 
   HTMLInputElement.prototype['addEventListener'] =
@@ -58,13 +61,6 @@ shaka.polyfill.InputEvent.install = function() {
 };
 
 
-/**
- * The original addEventListener from HTMLInputElement.
- * @private Function
- */
-shaka.polyfill.InputEvent.originalAddEventListener_;
-
-
 /**
  * Add an event listener to this object and translate the event types to those
  * that work on IE11.
@@ -89,7 +85,7 @@ shaka.polyfill.InputEvent.addEventListener_ =
     }
   }
 
-  shaka.polyfill.InputEvent.originalAddEventListener_.call(
+  HTMLInputElement.prototype['originalAddEventListener'].call(
       this, type, listener, options);
 };
 

package/lib/polyfill/mediasource.js

@@ -277,7 +277,7 @@ shaka.polyfill.MediaSource.rejectTsContent_ = function() {
     let basicMimeType = pieces[0];
     let container = basicMimeType.split('/')[1];
 
-    if (container == 'mp2t') {
+    if (container.toLowerCase() == 'mp2t') {
       return false;
     }
 

package/lib/polyfill/patchedmediakeys_apple.js

@@ -17,7 +17,6 @@
 
 goog.provide('shaka.polyfill.PatchedMediaKeysApple');
 
-goog.require('goog.Uri');
 goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.polyfill.register');
@@ -25,7 +24,6 @@ goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.FakeEventTarget');
 goog.require('shaka.util.PublicPromise');
-goog.require('shaka.util.StringUtils');
 goog.require('shaka.util.Uint8ArrayUtils');
 
 
@@ -455,6 +453,7 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeySession.prototype.
     // initData into a Uint8Array.
     this.nativeMediaKeySession_ = this.nativeMediaKeys_.createSession(
         'video/mp4', new Uint8Array(initData));
+    this.sessionId = this.nativeMediaKeySession_.sessionId || '';
 
     // Attach session event handlers here.
     this.eventManager_.listen(this.nativeMediaKeySession_, 'webkitkeymessage',
@@ -533,71 +532,6 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeySession.prototype.
 };
 
 
-/**
- * Rebuild FairPlay init data according to Apple's docs.  It's unclear why this
- * is not done by the browser, or if the unprefixed version will do it for us.
- *
- * @param {BufferSource} initData
- * @param {BufferSource} certificate
- * @return {BufferSource}
- */
-shaka.polyfill.PatchedMediaKeysApple.rebuildInitData_ =
-    function(initData, certificate) {
-  // TODO: Move this into DrmEngine if it is still needed with unprefixed EME.
-  // FairPlay init data is in two parts and must be processed a bit.
-  // The first part is a 4 byte little-endian int, which is the length of the
-  // second part.
-  const initDataArray = new Uint8Array(initData);
-  const dataview = new DataView(initDataArray.buffer);
-  const length = dataview.getUint32(
-      /* position= */ 0, /* littleEndian= */ true);
-  if (length + 4 != initDataArray.byteLength) {
-    throw new Error('Malformed init data!');
-  }
-
-  // The second part is a UTF-16 LE URI from the manifest.
-  const uriString = shaka.util.StringUtils.fromUTF16(
-      initDataArray.slice(4), /* littleEndian= */ true);
-
-  // The domain of that URI is the content ID according to Apple's FPS sample.
-  const uri = new goog.Uri(uriString);
-  const contentId = uri.getDomain();
-
-  // From that, we build a new init data to use in the session.  This is
-  // composed of several parts.  First, the raw init data we already got.
-  // Second, a 4-byte LE length followed by the content ID in UTF-16-LE.
-  // Third, a 4-byte LE length followed by the certificate.
-  const contentIdArray = new Uint8Array(
-      shaka.util.StringUtils.toUTF16(contentId, /* littleEndian= */ true));
-
-  const rebuiltInitData = new Uint8Array(
-      initDataArray.byteLength +
-      4 + contentIdArray.byteLength +
-      4 + certificate.byteLength);
-
-  let offset = 0;
-  /** @param {!Uint8Array} array */
-  const append = (array) => {
-    rebuiltInitData.set(array, offset);
-    offset += array.byteLength;
-  };
-  /** @param {!Uint8Array} array */
-  const appendWithLength = (array) => {
-    const view = new DataView(rebuiltInitData.buffer);
-    const value = array.byteLength;
-    view.setUint32(offset, value, /* littleEndian= */ true);
-    offset += 4;
-    append(array);
-  };
-
-  append(initDataArray);
-  appendWithLength(contentIdArray);
-  appendWithLength(new Uint8Array(certificate));
-
-  return rebuiltInitData;
-};
-
-
 /**
  * Handler for the native media elements webkitneedkey event.
  *
@@ -617,16 +551,12 @@ shaka.polyfill.PatchedMediaKeysApple.onWebkitNeedKey_ = function(event) {
 
   goog.asserts.assert(event.initData != null, 'missing init data!');
 
-  const certificate = mediaKeys.certificate;
-  goog.asserts.assert(certificate != null, 'missing certificate!');
-
   // NOTE: Because "this" is a real EventTarget, the event we dispatch here must
   // also be a real Event.
   const event2 = new Event('encrypted');
   // TODO: validate this initDataType against the unprefixed version
   event2.initDataType = 'cenc';
-  event2.initData = PatchedMediaKeysApple.rebuildInitData_(
-      event.initData, certificate);
+  event2.initData = event.initData;
 
   this.dispatchEvent(event2);
 };

package/lib/text/cue.js

@@ -141,7 +141,7 @@ shaka.text.Cue = function(startTime, endTime, payload) {
    * @override
    * @exportInterface
    */
-  this.backgroundImage = null;
+  this.backgroundImage = '';
 
   /**
    * @override

package/lib/text/ttml_text_parser.js

@@ -594,7 +594,7 @@ shaka.text.TtmlTextParser.addStyle_ = function(
   if (imageElement) {
     const backgroundImageType = imageElement.getAttribute('imagetype');
     const backgroundImageEncoding = imageElement.getAttribute('encoding');
-    const backgroundImageData = imageElement.textContent;
+    const backgroundImageData = imageElement.textContent.trim();
     if (backgroundImageType == 'PNG' &&
         backgroundImageEncoding == 'Base64' &&
         backgroundImageData) {

package/lib/util/config_utils.js

@@ -108,6 +108,7 @@ shaka.util.ConfigUtils.mergeConfigObjects =
  * @param {string} fieldName
  * @param {*} value
  * @return {!Object}
+ * @export
  */
 shaka.util.ConfigUtils.convertToConfigObject = function(fieldName, value) {
   const configObject = {};