shaka-player 4.2.4 → 4.2.5

package/docs/tutorials/ui.md

@@ -30,7 +30,7 @@ Set up controls with HTML data attributes:
          The data-shaka-player-cast-receiver-id tag allows you to provide a Cast Application ID that
            the cast button will cast to; the value provided here is the sample cast receiver. -->
     <div data-shaka-player-container style="max-width:40em"
-         data-shaka-player-cast-receiver-id="07AEE832">
+         data-shaka-player-cast-receiver-id="A67E4E9A">
        <!-- The data-shaka-player tag will make the UI library use this video element.
             If no video is provided, the UI will automatically make one inside the container div. -->
       <video autoplay data-shaka-player id="video" style="width:100%;height:100%"></video>
@@ -111,7 +111,7 @@ set up a listener for the 'caststatuschanged' events.
 <!-- Add a data-shaka-player-cast-receiver-id tag to provide a Cast Application ID that
            the cast button will cast to; the value provided here is the sample cast receiver. -->
     <div data-shaka-player-container style="max-width:40em"
-         data-shaka-player-cast-receiver-id="07AEE832">
+         data-shaka-player-cast-receiver-id="A67E4E9A">
     </div>
 ```
 
@@ -139,7 +139,7 @@ casting to an Android receiver app.
 
 ```html
     <div data-shaka-player-container style="max-width:40em"
-         data-shaka-player-cast-receiver-id="E7271BEC"
+         data-shaka-player-cast-receiver-id="A67E4E9A"
          data-shaka-player-cast-android-receiver-compatible="true">
       <!-- The manifest url in the src attribute will be automatically loaded -->
       <video autoplay data-shaka-player id="video" style="width:100%;height:100%"
@@ -154,7 +154,7 @@ or a `<source>` tag inside it to enable auto loading of the specified content.
 
 ```html
     <div data-shaka-player-container style="max-width:40em"
-         data-shaka-player-cast-receiver-id="07AEE832">
+         data-shaka-player-cast-receiver-id="A67E4E9A">
       <!-- The manifest url in the src attribute will be automatically loaded -->
       <video autoplay data-shaka-player id="video" style="width:100%;height:100%"
        src="https://storage.googleapis.com/shaka-demo-assets/angel-one/dash.mpd"></video>
@@ -165,7 +165,7 @@ or
 
 ```html
     <div data-shaka-player-container style="max-width:40em"
-         data-shaka-player-cast-receiver-id="07AEE832">
+         data-shaka-player-cast-receiver-id="A67E4E9A">
       <video autoplay data-shaka-player id="video" style="width:100%;height:100%">
         <!-- The manifest url in the src attribute will be auto loaded -->
        <source src="https://storage.googleapis.com/shaka-demo-assets/angel-one/dash.mpd"/>
@@ -178,7 +178,7 @@ call to the first one fails.
 
 ```html
     <div data-shaka-player-container style="max-width:40em"
-         data-shaka-player-cast-receiver-id="07AEE832">
+         data-shaka-player-cast-receiver-id="A67E4E9A">
       <video autoplay data-shaka-player id="video" style="width:100%;height:100%">
         <!-- Try this first -->
         <source src="https://storage.googleapis.com/shaka-demo-assets/angel-one/dash.mpd"/>
@@ -222,7 +222,7 @@ const video = controls.getVideo();
 // Receiver Compatability.
 ui.configure({
   // Set the castReceiverAppId
-  'castReceiverAppId': '07AEE832',
+  'castReceiverAppId': 'A67E4E9A',
   // Enable casting to native Android Apps (e.g. Android TV Apps)
   'castAndroidReceiverCompatible': true,
 });

package/docs/tutorials/welcome.md

@@ -29,8 +29,8 @@ You can build Shaka on Linux, Windows, or Mac.
 To get the sources and compile the library, you will need:
   * {@link https://git-scm.com/downloads Git v1.9+}
   * {@link https://www.python.org/downloads/ Python v2.7 or v3.5+}
-  * {@link https://java.com/en/download/ Java Runtime Environment v8+}
-  * {@link https://nodejs.org/en/download/ NodeJS v10+}
+  * {@link https://java.com/en/download/ Java Runtime Environment v14+}
+  * {@link https://nodejs.org/en/download/ NodeJS v14+}
   * A local web server, such as {@link https://httpd.apache.org/ Apache}
     * _NOTE: A local web server is required because browsers place restrictions
       on applications from file:/// URLs._

package/externs/shaka/player.js

@@ -131,7 +131,8 @@ shaka.extern.StateChange;
  * @property {number} manifestTimeSeconds
  *   The amount of time it took to download and parse the manifest.
  * @property {number} drmTimeSeconds
- *   The amount of time it took to download the first drm key.
+ *   The amount of time it took to download the first drm key, and load that key
+ *   into the drm system.
  * @property {number} playTime
  *   The total time spent in a playing state in seconds.
  * @property {number} pauseTime

package/lib/cea/cea708_window.js

@@ -420,7 +420,7 @@ shaka.cea.Cea708Window.TextJustification = {
 shaka.cea.Cea708Window.MAX_COLS = 42;
 
 /**
- * Maximum of 15 rows that can be indexed from 0 to 14.
+ * Maximum of 16 rows that can be indexed from 0 to 15.
  * @private @const {number}
  */
-shaka.cea.Cea708Window.MAX_ROWS = 15;
+shaka.cea.Cea708Window.MAX_ROWS = 16;

package/lib/dash/segment_template.js

@@ -67,7 +67,7 @@ shaka.dash.SegmentTemplate = class {
         },
       };
     } else if (info.segmentDuration) {
-      if (!isUpdate) {
+      if (!isUpdate && context.adaptationSet.contentType !== 'image') {
         context.presentationTimeline.notifyMaxSegmentDuration(
             info.segmentDuration);
         context.presentationTimeline.notifyMinSegmentStartTime(

package/lib/hls/hls_parser.js

@@ -1049,7 +1049,7 @@ shaka.hls.HlsParser = class {
       shaka.log.debug('Guessing audio-only.');
       type = ContentType.AUDIO;
       ignoreStream = true;
-    } else if (res.video.length) {
+    } else if (res.video.length && !res.audio.length) {
       // There are associated video streams.  Assume this is audio.
       shaka.log.debug('Guessing audio-only.');
       type = ContentType.AUDIO;
@@ -1665,9 +1665,16 @@ shaka.hls.HlsParser = class {
     /** @type {!Map.<number, number>} */
     const mediaSequenceToStartTime = new Map();
 
+    const prevLowLatencyMode = this.lowLatencyMode_;
     const segments = this.createSegments_(verbatimMediaPlaylistUri, playlist,
         type, mimeType, mediaSequenceToStartTime, mediaVariables, codecs);
 
+    // This happens when autoLowLatencyMode is true, so we need set the
+    // correct lowLatencyPresentationDelay_
+    if (prevLowLatencyMode != this.lowLatencyMode_) {
+      this.determinePresentationType_(playlist);
+    }
+
     const lastEndTime = segments[segments.length - 1].endTime;
     /** @type {!shaka.media.SegmentIndex} */
     const segmentIndex = new shaka.media.SegmentIndex(segments);
@@ -1796,8 +1803,11 @@ shaka.hls.HlsParser = class {
             shaka.util.Error.Code.HLS_AES_128_INVALID_KEY_LENGTH);
       }
 
+      const algorithm = {
+        name: 'AES-CBC',
+      };
       keyInfo.cryptoKey = await window.crypto.subtle.importKey(
-          'raw', keyResponse.data, 'AES-CBC', true, ['decrypt']);
+          'raw', keyResponse.data, algorithm, true, ['decrypt']);
       keyInfo.fetchKey = undefined; // No longer needed.
     };
 

package/lib/media/content_workarounds.js

@@ -69,6 +69,18 @@ shaka.media.ContentWorkarounds = class {
         })
         .fullBox('encv', onEncryptionMetadataBox)
         .fullBox('enca', onEncryptionMetadataBox)
+        .fullBox('hev1', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('hvc1', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
         .fullBox('avc1', (box) => {
           boxesToModify.push({
             box,

package/lib/player.js

@@ -6595,7 +6595,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.2.4-uncompiled';
+shaka.Player.version = 'v4.2.5-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/abort_controller.js

@@ -0,0 +1,143 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.polyfill.AbortController');
+
+goog.require('shaka.polyfill');
+goog.require('shaka.util.FakeEvent');
+goog.require('shaka.util.FakeEventTarget');
+
+/**
+ * @summary A polyfill for systems that do not implement AbortController.
+ * This is used both with the fetch API for HTTP requests and inside the HLS
+ * parser.
+ * @export
+ * @extends AbortController
+ */
+shaka.polyfill.AbortController = class {
+  /**
+   * Install the polyfill if needed.
+   * @export
+   */
+  static install() {
+    if (window.AbortController) {
+      // Not needed.
+      return;
+    }
+
+    window.AbortController = shaka.polyfill.AbortController;
+    window.AbortSignal = shaka.polyfill.AbortController.AbortSignal;
+  }
+
+  /** */
+  constructor() {
+    /** @private {!shaka.polyfill.AbortController.AbortSignal} */
+    this.signal_ = new shaka.polyfill.AbortController.AbortSignal();
+  }
+
+  /**
+   * @override
+   * @suppress {const|duplicate} Since the original is defined as "const", we
+   *   need this suppression to override it.
+   */
+  get signal() {
+    return this.signal_;
+  }
+
+  /**
+   * @param {*=} reason
+   * @override
+   */
+  abort(reason) {
+    this.signal_.doAbort_(reason);
+  }
+};
+
+/**
+ * @summary A polyfill for AbortSignal, part of the AbortController API.
+ * @implements {AbortSignal}
+ */
+shaka.polyfill.AbortController.AbortSignal =
+class extends shaka.util.FakeEventTarget {
+  /** */
+  constructor() {
+    super();
+
+    /** @private {boolean} */
+    this.aborted_ = false;
+
+    /** @private {*} */
+    this.reason_ = undefined;
+
+    /** @type {?function(!Event)} */
+    this.onabort = null;
+  }
+
+  /** @override */
+  get aborted() {
+    return this.aborted_;
+  }
+
+  /** @return {*} */
+  get reason() {
+    return this.reason_;
+  }
+
+  /**
+   * @param {*} reason
+   * @private
+   */
+  doAbort_(reason) {
+    if (this.aborted_) {
+      return;
+    }
+
+    this.aborted_ = true;
+    this.reason_ = reason;
+    if (this.reason_ === undefined) {
+      // This is equivalent to a native implementation.
+      this.reason_ = new DOMException(
+          'signal is aborted without reason', 'AbortError');
+    }
+
+    // According to MDN:
+    // "Event type - A generic Event with no added properties."
+    const event = new shaka.util.FakeEvent('abort');
+    if (this.onabort) {
+      this.onabort(event);
+    }
+    this.dispatchEvent(event);
+  }
+
+
+  /**
+   * @param {*=} reason
+   * @return {!AbortSignal}
+   */
+  static abort(reason) {
+    const signal = new shaka.polyfill.AbortController.AbortSignal();
+    signal.doAbort_(reason);
+    return signal;
+  }
+
+  /**
+   * @param {number} timeMs
+   * @return {!AbortSignal}
+   */
+  static timeout(timeMs) {
+    const signal = new shaka.polyfill.AbortController.AbortSignal();
+
+    window.setTimeout(() => {
+      // This is equivalent to a native implementation.
+      signal.doAbort_(new DOMException('signal timed out', 'TimeoutError'));
+    }, timeMs);
+
+    return signal;
+  }
+};
+
+
+shaka.polyfill.register(shaka.polyfill.AbortController.install);

package/lib/polyfill/media_capabilities.js

@@ -8,6 +8,7 @@ goog.provide('shaka.polyfill.MediaCapabilities');
 
 goog.require('shaka.log');
 goog.require('shaka.polyfill');
+goog.require('shaka.util.Error');
 goog.require('shaka.util.Platform');
 
 
@@ -96,37 +97,48 @@ shaka.polyfill.MediaCapabilities = class {
       return res;
     }
 
+    const videoConfig = mediaDecodingConfig['video'];
+    const audioConfig = mediaDecodingConfig['audio'];
+
     if (mediaDecodingConfig.type == 'media-source') {
       if (!shaka.util.Platform.supportsMediaSource()) {
         return res;
       }
       // Use 'MediaSource.isTypeSupported' to check if the stream is supported.
-      if (mediaDecodingConfig['video']) {
-        const contentType = mediaDecodingConfig['video'].contentType;
-        const isSupported = MediaSource.isTypeSupported(contentType);
+      // Cast platforms will additionally check canDisplayType(), which
+      // accepts extended MIME type parameters.
+      // See: https://github.com/shaka-project/shaka-player/issues/4726
+      if (videoConfig) {
+        let isSupported;
+        if (shaka.util.Platform.isChromecast()) {
+          isSupported =
+              shaka.polyfill.MediaCapabilities.canCastDisplayType_(videoConfig);
+        } else {
+          isSupported = MediaSource.isTypeSupported(videoConfig.contentType);
+        }
         if (!isSupported) {
           return res;
         }
       }
 
-      if (mediaDecodingConfig['audio']) {
-        const contentType = mediaDecodingConfig['audio'].contentType;
+      if (audioConfig) {
+        const contentType = audioConfig.contentType;
         const isSupported = MediaSource.isTypeSupported(contentType);
         if (!isSupported) {
           return res;
         }
       }
     } else if (mediaDecodingConfig.type == 'file') {
-      if (mediaDecodingConfig['video']) {
-        const contentType = mediaDecodingConfig['video'].contentType;
+      if (videoConfig) {
+        const contentType = videoConfig.contentType;
         const isSupported = shaka.util.Platform.supportsMediaType(contentType);
         if (!isSupported) {
           return res;
         }
       }
 
-      if (mediaDecodingConfig['audio']) {
-        const contentType = mediaDecodingConfig['audio'].contentType;
+      if (audioConfig) {
+        const contentType = audioConfig.contentType;
         const isSupported = shaka.util.Platform.supportsMediaType(contentType);
         if (!isSupported) {
           return res;
@@ -201,6 +213,44 @@ shaka.polyfill.MediaCapabilities = class {
 
     return res;
   }
+
+  /**
+   * Checks if the given media parameters of the video or audio streams are
+   * supported by the Cast platform.
+   * @param {!VideoConfiguration} videoConfig The 'video' field of the
+   *     MediaDecodingConfiguration.
+   * @return {boolean} `true` when the stream can be displayed on a Cast device.
+   * @private
+   */
+  static canCastDisplayType_(videoConfig) {
+    if (!(window.cast)) {
+      shaka.log.error('Expected cast namespace to be available!');
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.CAST,
+          shaka.util.Error.Code.CAST_API_UNAVAILABLE);
+    } else if (!(cast.__platform__ && cast.__platform__.canDisplayType)) {
+      shaka.log.warning('Expected cast APIs to be available! Falling back to ' +
+          'MediaSource.isTypeSupported() for type support.');
+      return MediaSource.isTypeSupported(videoConfig.contentType);
+    }
+
+    let displayType = videoConfig.contentType;
+    if (videoConfig.width && videoConfig.height) {
+      displayType +=
+          `; width=${videoConfig.width}; height=${videoConfig.height}`;
+    }
+    if (videoConfig.framerate) {
+      displayType += `; framerate=${videoConfig.framerate}`;
+    }
+    if (videoConfig.transferFunction === 'pq') {
+      // A "PQ" transfer function indicates this is an HDR-capable stream;
+      // "smpte2084" is the published standard. We need to inform the platform
+      // this query is specifically for HDR.
+      displayType += '; eotf=smpte2084';
+    }
+    return cast.__platform__.canDisplayType(displayType);
+  }
 };
 
 /**

package/lib/text/ttml_text_parser.js

@@ -136,7 +136,7 @@ shaka.text.TtmlTextParser = class {
     }
 
     const cue = TtmlTextParser.parseCue_(
-        body, time.periodStart, rateInfo, metadataElements, styles,
+        body, time, rateInfo, metadataElements, styles,
         regionElements, cueRegions, whitespaceTrim,
         cellResolutionInfo, /* parentCueElement= */ null,
         /* isContent= */ false);
@@ -157,7 +157,7 @@ shaka.text.TtmlTextParser = class {
    * Parses a TTML node into a Cue.
    *
    * @param {!Node} cueNode
-   * @param {number} offset
+   * @param {shaka.extern.TextParser.TimeContext} timeContext
    * @param {!shaka.text.TtmlTextParser.RateInfo_} rateInfo
    * @param {!Array.<!Element>} metadataElements
    * @param {!Array.<!Element>} styles
@@ -171,7 +171,7 @@ shaka.text.TtmlTextParser = class {
    * @private
    */
   static parseCue_(
-      cueNode, offset, rateInfo, metadataElements, styles, regionElements,
+      cueNode, timeContext, rateInfo, metadataElements, styles, regionElements,
       cueRegions, whitespaceTrim, cellResolution, parentCueElement, isContent) {
     /** @type {Element} */
     let cueElement;
@@ -236,7 +236,7 @@ shaka.text.TtmlTextParser = class {
       for (const childNode of cueElement.childNodes) {
         const nestedCue = shaka.text.TtmlTextParser.parseCue_(
             childNode,
-            offset,
+            timeContext,
             rateInfo,
             metadataElements,
             styles,
@@ -293,15 +293,20 @@ shaka.text.TtmlTextParser = class {
     if (start == null) {
       start = 0;
     }
-    start += offset;
+    start += timeContext.periodStart;
 
     // If end is null, that means the duration is effectively infinite.
     if (end == null) {
       end = Infinity;
     } else {
-      end += offset;
+      end += timeContext.periodStart;
     }
 
+    // Clip times to segment boundaries.
+    // https://github.com/shaka-project/shaka-player/issues/4631
+    start = Math.max(start, timeContext.segmentStart);
+    end = Math.min(end, timeContext.segmentEnd);
+
     if (!hasTimeAttributes && nestedCues.length > 0) {
       // If no time is defined for this cue, base the timing information on
       // the time of the nested cues. In the case of multiple nested cues with
@@ -569,8 +574,28 @@ shaka.text.TtmlTextParser = class {
 
     const fontFamily = TtmlTextParser.getStyleAttribute_(
         cueElement, region, styles, 'fontFamily', shouldInheritRegionStyles);
+    // See https://github.com/sandflow/imscJS/blob/1.1.3/src/main/js/html.js#L1384
     if (fontFamily) {
-      cue.fontFamily = fontFamily;
+      switch (fontFamily) {
+        case 'monospaceSerif':
+          cue.fontFamily = 'Courier New,Liberation Mono,Courier,monospace';
+          break;
+        case 'proportionalSansSerif':
+          cue.fontFamily = 'Arial,Helvetica,Liberation Sans,sans-serif';
+          break;
+        case 'sansSerif':
+          cue.fontFamily = 'sans-serif';
+          break;
+        case 'monospaceSansSerif':
+          cue.fontFamily = 'Consolas,monospace';
+          break;
+        case 'proportionalSerif':
+          cue.fontFamily = 'serif';
+          break;
+        default:
+          cue.fontFamily = fontFamily;
+          break;
+      }
     }
 
     const fontWeight = TtmlTextParser.getStyleAttribute_(

package/lib/text/ui_text_displayer.js

@@ -199,6 +199,19 @@ shaka.text.UITextDisplayer = class {
     this.isTextVisible_ = on;
   }
 
+  /**
+   * @private
+   */
+  isElementUnderTextContainer_(elemToCheck) {
+    while (elemToCheck != null) {
+      if (elemToCheck == this.textContainer_) {
+        return true;
+      }
+      elemToCheck = elemToCheck.parentElement;
+    }
+    return false;
+  }
+
   /**
    * @param {!Array.<!shaka.extern.Cue>} cues
    * @param {!HTMLElement} container
@@ -260,6 +273,9 @@ shaka.text.UITextDisplayer = class {
           cueRegistry = this.currentCuesMap_.get(cue);
           wrapper = cueRegistry.wrapper;
           updateDOM = true;
+        } else if (!this.isElementUnderTextContainer_(wrapper)) {
+          // We found that the wrapper needs to be in the DOM
+          updateDOM = true;
         }
       }
 
@@ -276,6 +292,7 @@ shaka.text.UITextDisplayer = class {
       const topCue = parents.pop();
       goog.asserts.assert(topCue == cue, 'Parent cues should be kept in order');
     }
+
     if (updateDOM) {
       for (const element of toUproot) {
         // NOTE: Because we uproot shared region elements, too, we might hit an
@@ -578,7 +595,7 @@ 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) {
+    if (cue.line != null) {
       if (cue.lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
         // When setting absolute positioning, you need to set x/y/width/height
         // so the element is positioned correctly.  Set these as default and
@@ -591,21 +608,21 @@ shaka.text.UITextDisplayer = class {
           if (cue.lineAlign == Cue.lineAlign.START) {
             style.top = cue.line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.bottom = cue.line + '%';
+            style.bottom = (100 - cue.line) + '%';
           }
         } else if (cue.writingMode == Cue.writingMode.VERTICAL_LEFT_TO_RIGHT) {
           style.height = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
             style.left = cue.line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.right = cue.line + '%';
+            style.right = (100 - cue.line) + '%';
           }
         } else {
           style.height = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
             style.right = cue.line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.left = cue.line + '%';
+            style.left = (100 - cue.line) + '%';
           }
         }
       }
@@ -615,7 +632,7 @@ shaka.text.UITextDisplayer = class {
 
     // The position defines the indent of the text container in the
     // direction defined by the writing direction.
-    if (cue.position) {
+    if (cue.position != null) {
       if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
         style.paddingLeft = cue.position;
       } else {

package/lib/util/platform.js

@@ -174,7 +174,7 @@ shaka.util.Platform = class {
    * @return {?number} A major version number or null if not Chromium-based.
    */
   static chromeVersion() {
-    if (!shaka.util.Platform.userAgentContains_('Chrome')) {
+    if (!shaka.util.Platform.isChrome()) {
       return null;
     }
 
@@ -213,6 +213,7 @@ shaka.util.Platform = class {
     return !!navigator.vendor && navigator.vendor.includes('Apple') &&
         !shaka.util.Platform.isTizen() &&
         !shaka.util.Platform.isEOS() &&
+        !shaka.util.Platform.isVirginMedia() &&
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV();
   }
@@ -237,6 +238,13 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('PlayStation 4');
   }
 
+  /**
+   * Check if the current platform is Virgin Media device.
+   */
+  static isVirginMedia() {
+    return shaka.util.Platform.userAgentContains_('VirginMedia');
+  }
+
   /**
    * Check if the current platform is Amazon Fire TV.
    * https://developer.amazon.com/docs/fire-tv/identify-amazon-fire-tv-devices.html

package/lib/util/player_configuration.js

@@ -11,6 +11,7 @@ goog.require('shaka.abr.SimpleAbrManager');
 goog.require('shaka.log');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ConfigUtils');
+goog.require('shaka.util.FairPlayUtils');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.Platform');
@@ -67,9 +68,15 @@ shaka.util.PlayerConfiguration = class {
       advanced: {},    // key is arbitrary key system ID, value is a record type
       delayLicenseRequestUntilPlayed: false,
       initDataTransform: (initData, initDataType, drmInfo) => {
-        return shaka.util.ConfigUtils.referenceParametersAndReturn(
-            [initData, initDataType, drmInfo],
-            initData);
+        const keySystem = drmInfo.keySystem;
+        if (keySystem == 'com.apple.fps.1_0' && initDataType == 'skd') {
+          const cert = drmInfo.serverCertificate;
+          const contentId =
+              shaka.util.FairPlayUtils.defaultGetContentId(initData);
+          initData = shaka.util.FairPlayUtils.initDataTransform(
+              initData, contentId, cert);
+        }
+        return initData;
       },
       logLicenseExchange: false,
       updateExpirationTime: 1,