shaka-player 2.5.4 → 2.5.5

package/lib/dash/content_protection.js

@@ -21,6 +21,7 @@ goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.Pssh');
 goog.require('shaka.util.Uint8ArrayUtils');
 goog.require('shaka.util.XmlUtils');
 
@@ -442,6 +443,36 @@ shaka.dash.ContentProtection.getPlayReadyLicenseUrl = function(element) {
 };
 
 
+/**
+ * Gets a PlayReady initData from a content protection element
+ * containing a PlayReady Pro Object
+ *
+ * @param {shaka.dash.ContentProtection.Element} element
+ * @return {?Array.<shaka.extern.InitDataOverride>}
+ * @private
+ */
+shaka.dash.ContentProtection.getInitDataFromPro_ = function(element) {
+  const proNode = shaka.util.XmlUtils.findChildNS(
+      element.node, 'urn:microsoft:playready', 'pro');
+  if (!proNode) {
+    return null;
+  }
+  const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
+  const data = Uint8ArrayUtils.fromBase64(proNode.textContent);
+  const systemId = new Uint8Array([
+    0x9a, 0x04, 0xf0, 0x79, 0x98, 0x40, 0x42, 0x86,
+    0xab, 0x92, 0xe6, 0x5b, 0xe0, 0x88, 0x5f, 0x95,
+  ]);
+  const pssh = shaka.util.Pssh.createPssh(data, systemId);
+  return [
+    {
+      initData: pssh,
+      initDataType: 'cenc',
+      keyId: element.keyId,
+    },
+  ];
+};
+
 /**
  * Creates DrmInfo objects from the given element.
  *
@@ -468,7 +499,8 @@ shaka.dash.ContentProtection.convertElements_ = function(
           !element.init || element.init.length,
           'Init data must be null or non-empty.');
 
-      const initData = element.init || defaultInit;
+        const proInitData = ContentProtection.getInitDataFromPro_(element);
+        const initData = element.init || defaultInit || proInitData;
       const info = ManifestParserUtils.createDrmInfo(keySystem, initData);
       const licenseParser = licenseUrlParsers.get(keySystem);
       if (licenseParser) {

package/lib/dash/dash_parser.js

@@ -1016,7 +1016,7 @@ shaka.dash.DashParser.prototype.parseAdaptationSet_ = function(context, elem) {
         case 'subtitle':
           kind = value;
           break;
-      }
+        }
     }
   }
 
@@ -1038,12 +1038,12 @@ shaka.dash.DashParser.prototype.parseAdaptationSet_ = function(context, elem) {
   let closedCaptions = new Map();
   for (const prop of accessibilities) {
     let schemeId = prop.getAttribute('schemeIdUri');
+    let value = prop.getAttribute('value');
     if (schemeId == 'urn:scte:dash:cc:cea-608:2015' ||
         schemeId == 'urn:scte:dash:cc:cea-708:2015') {
       let channelId = 1;
-      let closedCaptionsValue = prop.getAttribute('value');
-      if (closedCaptionsValue != null) {
-        closedCaptionsValue.split(';').forEach((captionStr) => {
+      if (value != null) {
+        value.split(';').forEach((captionStr) => {
           let channel;
           let language;
           // Some closed caption descriptions have channel number and language,
@@ -1075,6 +1075,14 @@ shaka.dash.DashParser.prototype.parseAdaptationSet_ = function(context, elem) {
         // 'CC1' as channel id and 'und' as language info.
         closedCaptions.set('CC1', 'und');
       }
+    } else if (schemeId == 'urn:mpeg:dash:role:2011') {
+      // See DASH IOP 3.9.2 Table 4.
+      if (value != null) {
+        roleValues.push(value);
+        if (value == 'captions') {
+          kind = ManifestParserUtils.TextStreamKind.CLOSED_CAPTION;
+        }
+      }
     }
   }
 

package/lib/hls/hls_parser.js

@@ -539,8 +539,15 @@ shaka.hls.HlsParser.prototype.createPeriod_ = async function(playlist) {
     return type == 'SUBTITLES';
   }.bind(this));
 
-  let textStreamPromises = textStreamTags.map(function(tag) {
-    return this.createTextStream_(tag, playlist);
+  let textStreamPromises = textStreamTags.map(async function(tag) {
+    try {
+      return await this.createTextStream_(tag, playlist);
+    } catch (e) {
+      if (this.config_.hls.ignoreTextStreamFailures) {
+        return null;
+      }
+      throw e;
+    }
   }.bind(this));
 
   const closedCaptionsTags = mediaTags.filter((tag) => {
@@ -567,7 +574,7 @@ shaka.hls.HlsParser.prototype.createPeriod_ = async function(playlist) {
   return {
     startTime: 0,
     variants: variants,
-    textStreams: textStreams,
+    textStreams: textStreams.filter((t) => t != null),
   };
 };
 
@@ -660,7 +667,9 @@ shaka.hls.HlsParser.prototype.createVariantsForTag_ =
         // attached to the stream.
         const textStreamInfo =
             this.mediaTagsToStreamInfosMap_.get(textTags[0].id);
-        textStreamInfo.stream.codecs = textCodecs;
+        if (textStreamInfo) {
+          textStreamInfo.stream.codecs = textCodecs;
+        }
       }
     }
 
@@ -1672,6 +1681,13 @@ shaka.hls.HlsParser.prototype.getStartTime_ = async function(
     return this.getStartTimeFromTextSegment_(mimeType, codecs, response.data);
   }
 
+    if (mimeType == 'video/webm') {
+      shaka.log.warning(
+          'Hls+WebM combination is not supported at the moment. Skipping.');
+      return null;
+    }
+
+
   // TODO(vaage): Add support for additional formats.
   //
   //   Formats:

package/lib/media/drm_engine.js

@@ -22,6 +22,7 @@ goog.require('shaka.log');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
+goog.require('shaka.util.FairPlayUtils');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.Iterables');
@@ -1115,6 +1116,29 @@ shaka.media.DrmEngine.prototype.createTemporarySession_ =
   };
   this.activeSessions_.set(session, metadata);
 
+    try {
+      if (this.config_.initDataTransform) {
+        initData = this.config_.initDataTransform(initData);
+      } else if (this.keySystem().startsWith('com.apple.fps')) {
+        const cert = this.currentDrmInfo_.serverCertificate;
+        const contentId =
+            shaka.util.FairPlayUtils.defaultGetContentId(initData);
+        initData = shaka.util.FairPlayUtils.initDataTransform(
+            initData, contentId, cert);
+      }
+    } catch (error) {
+      let shakaError = error;
+      if (!(error instanceof shaka.util.Error)) {
+        shakaError = new shaka.util.Error(
+            shaka.util.Error.Severity.CRITICAL,
+            shaka.util.Error.Category.DRM,
+            shaka.util.Error.Code.INIT_DATA_TRANSFORM_ERROR,
+            error);
+      }
+      this.onError_(shakaError);
+      return;
+    }
+
   session.generateRequest(initDataType, initData.buffer).catch((error) => {
     if (this.isDestroying_) { return; }
 
@@ -1186,13 +1210,15 @@ shaka.media.DrmEngine.prototype.sendLicenseRequest_ = function(event) {
   request.body = event.message;
   request.method = 'POST';
   request.licenseRequestType = event.messageType;
+  request.sessionId = session.sessionId;
   // NOTE: allowCrossSiteCredentials can be set in a request filter.
 
   if (this.currentDrmInfo_.keySystem == 'com.microsoft.playready' ||
       this.currentDrmInfo_.keySystem == 'com.chromecast.playready') {
     this.unpackPlayReadyRequest_(request);
   }
-  if (this.currentDrmInfo_.keySystem.startsWith('com.apple.fps')) {
+  if (this.currentDrmInfo_.keySystem.startsWith('com.apple.fps') &&
+      this.config_.fairPlayTransform) {
     this.formatFairPlayRequest_(request);
   }
 
@@ -1200,7 +1226,8 @@ shaka.media.DrmEngine.prototype.sendLicenseRequest_ = function(event) {
       .then(function(response) {
         if (this.isDestroying_) { return Promise.reject(); }
 
-        if (this.currentDrmInfo_.keySystem.startsWith('com.apple.fps')) {
+        if (this.currentDrmInfo_.keySystem.startsWith('com.apple.fps') &&
+            this.config_.fairPlayTransform) {
           this.parseFairPlayResponse_(response);
         }
 

package/lib/media/media_source_engine.js

@@ -704,9 +704,13 @@ shaka.media.MediaSourceEngine.prototype.setStreamProperties = function(
  */
 shaka.media.MediaSourceEngine.prototype.endOfStream = function(reason) {
   return this.enqueueBlockingOperation_(function() {
-    // Chrome won't let us pass undefined, but it will let us omit the
-    // argument.  Firefox does not have this problem.
-    // TODO: File a bug about this.
+    // If endOfStream() has already been called on the media source,
+    // don't call it again.
+    if (this.ended()) {
+      return;
+    }
+    // Tizen and IE11 won't let us pass undefined, but it will let us omit the
+    // argument.
     if (reason) {
       this.mediaSource_.endOfStream(reason);
     } else {

package/lib/media/playhead.js

@@ -86,9 +86,14 @@ shaka.media.SrcEqualsPlayhead = class {
     // We listen for the loaded-metadata-event so that we know when we can
     // interact with |currentTime|.
     const onLoaded = () => {
-      this.started_ = true;
-
-      if (this.startTime_ != null) {
+      if (this.startTime_ == null) {
+        this.started_ = true;
+      } else {
+        // Startup is complete only when the video element acknowledges the
+        // seek.
+        this.eventManager_.listenOnce(this.mediaElement_, 'seeking', () => {
+          this.started_ = true;
+        });
         this.mediaElement_.currentTime = this.startTime_;
       }
     };

package/lib/media/streaming_engine.js

@@ -1339,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;
@@ -1443,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);
@@ -2199,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(
@@ -2239,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));
@@ -2325,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

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/networking_engine.js

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

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.4-uncompiled';
+shaka.Player.version = 'v2.5.5-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.
@@ -1728,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) {

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/util/error.js

@@ -733,6 +733,18 @@ shaka.util.Error.Code = {
    */
   'EXPIRED': 6014,
 
+  /**
+   * A server certificate wasn't given when it is required.  FairPlay requires
+   * setting an explicit server certificate in the configuration.
+   */
+  'SERVER_CERTIFICATE_REQUIRED': 6015,
+
+  /**
+   * An error was thrown while executing the init data transformation.
+   * <br> error.data[0] is the original error.
+   */
+  'INIT_DATA_TRANSFORM_ERROR': 6016,
+
 
   /**
    * The call to Player.load() was interrupted by a call to Player.unload()

package/lib/util/fairplay_utils.js

@@ -0,0 +1,122 @@
+/**
+ * @license
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('shaka.util.FairPlayUtils');
+
+goog.require('goog.Uri');
+
+
+/**
+ * @summary A set of FairPlay utility functions.
+ * @exportInterface
+ */
+shaka.util.FairPlayUtils = class {
+  /**
+   * Using the default method, extract a content ID from the init data.  This is
+   * based on the FairPlay example documentation.
+   *
+   * @param {!BufferSource} initData
+   * @return {string}
+   * @export
+   */
+  static defaultGetContentId(initData) {
+    const uint8 = new Uint8Array(initData);
+    const dataview = new DataView(
+        uint8.buffer, uint8.byteOffset, uint8.byteLength);
+    // The first part is a 4 byte little-endian int, which is the length of
+    // the second part.
+    const length = dataview.getUint32(
+        /* position= */ 0, /* littleEndian= */ true);
+    if (length + 4 != uint8.byteLength) {
+      throw new RangeError('Malformed FairPlay init data');
+    }
+
+    // The second part is a UTF-16 LE URI from the manifest.
+    const uriString = shaka.util.StringUtils.fromUTF16(
+        uint8.subarray(4), /* littleEndian= */ true);
+
+    // The domain of that URI is the content ID according to Apple's FPS
+    // sample.
+    const uri = new goog.Uri(uriString);
+    return uri.getDomain();
+  }
+
+  /**
+   * Transforms the init data buffer using the given data.  The format is:
+   *
+   * <pre>
+   * [4 bytes] initDataSize
+   * [initDataSize bytes] initData
+   * [4 bytes] contentIdSize
+   * [contentIdSize bytes] contentId
+   * [4 bytes] certSize
+   * [certSize bytes] cert
+   * </pre>
+   *
+   * @param {!BufferSource} initData
+   * @param {!BufferSource|string} contentId
+   * @param {?BufferSource} cert  The server certificate; this will throw if not
+   *   provided.
+   * @return {!Uint8Array}
+   * @export
+   */
+  static initDataTransform(initData, contentId, cert) {
+    if (!cert || !cert.byteLength) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.DRM,
+          shaka.util.Error.Code.SERVER_CERTIFICATE_REQUIRED);
+    }
+
+    // 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.
+    /** @type {!Uint8Array} */
+    let contentIdArray;
+    if (typeof contentId == 'string') {
+      contentIdArray = new Uint8Array(
+          shaka.util.StringUtils.toUTF16(contentId, /* littleEndian= */ true));
+    } else {
+      contentIdArray = new Uint8Array(contentId);
+    }
+
+    const rebuiltInitData = new Uint8Array(
+        8 + initData.byteLength + contentIdArray.byteLength + cert.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(new Uint8Array(initData));
+    appendWithLength(contentIdArray);
+    appendWithLength(new Uint8Array(cert));
+
+    return rebuiltInitData;
+  }
+};

package/lib/util/player_configuration.js

@@ -83,6 +83,8 @@ shaka.util.PlayerConfiguration = class {
       clearKeys: {},  // key is arbitrary key system ID, value must be string
       advanced: {},    // key is arbitrary key system ID, value is a record type
       delayLicenseRequestUntilPlayed: false,
+      initDataTransform: (initData) => initData,
+      fairPlayTransform: true,
     };
 
     const manifest = {
@@ -102,6 +104,9 @@ shaka.util.PlayerConfiguration = class {
         ignoreMinBufferTime: false,
         autoCorrectDrift: true,
       },
+      hls: {
+        ignoreTextStreamFailures: false,
+      },
     };
 
     const streaming = {