shaka-player 4.0.0 → 4.1.0

package/docs/design/chromecast.md

@@ -26,11 +26,13 @@ the `Player` and `HTMLMediaElement` objects.  Receiver apps only have to worry
 about their UI, while the `CastReceiver` takes care of playback and
 communication.
 
+To enable an Android (TV) receiver apps set `androidReceiverCompatible` to true.
+
 
 #### `CastProxy` API sketch
 
 ```js
-new shaka.cast.CastProxy(video, player, receiverAppId)
+new shaka.cast.CastProxy(video, player, receiverAppId, androidReceiverCompatible)
 
 // Also destroys the underlying local Player object
 shaka.cast.CastProxy.prototype.destroy() => Promise

package/docs/tutorials/drm-config.md

@@ -75,6 +75,22 @@ player.configure({
 If the browser supports it and you configured a license server URL for it, we'll
 use it.
 
+Alternative there are a config for make a mapping of keysystem if you know that
+is broadly supported. For example, `com.microsoft.playready.recommendation`:
+
+```js
+player.configure({
+  drm: {
+    keySystemsMapping: {
+      'com.microsoft.playready': 'com.microsoft.playready.recommendation',
+    }
+  }
+});
+```
+
+With the previous configuration you will choose the `recommendation` keySystem
+when your manifest (HLS or DASH) uses PlayReady.
+
 
 #### Clear Key
 

package/docs/tutorials/ui.md

@@ -130,6 +130,23 @@ Next, let's add a listener to the 'caststatuschanged' event in myapp.js:
   }
 ```
 
+
+#### Enabling Android Receiver Apps
+
+If you'd like to take advantage of Android Receiver App support,
+you will need to provide a boolean flag to enable support for
+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-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%"
+       src="https://storage.googleapis.com/shaka-demo-assets/angel-one/dash.mpd"></video>
+    </div
+
+
 #### Providing source(s) for auto load.
 
 It's also possible to provide the `src` attribute on the `<video>` element
@@ -200,6 +217,15 @@ const controls = ui.getControls();
 // your API calls will be routed to the remote playback session.
 const player = controls.getPlayer();
 const video = controls.getVideo();
+
+// Programatically configure the Chromecast Receiver App Id and Android
+// Receiver Compatability.
+ui.configure({
+  // Set the castReceiverAppId
+  'castReceiverAppId': 'BBED8D28',
+  // Enable casting to native Android Apps (e.g. Android TV Apps)
+  'castAndroidReceiverCompatible': true,
+});
 ```
 
 

package/docs/tutorials/upgrade.md

@@ -42,10 +42,12 @@ application:
       `manifest.defaultPresentationDelay` (deprecated in v3.0.0)
     - Configuration of factories should be plain factory functions, not
       constructors; these will not be invoked with `new` (deprecated in v3.1.0)
-    - `drm.initDataTransform` has been removed (no longer needed since the
-      minimum supported version of iOS is now 13)
+    - `drm.initDataTransform` now defaults to a no-op
     - `streaming.smallGapLimit` and `streaming.jumpLargeGaps` have been removed;
       all gaps will now be jumped
+    - `manifest.hls.useFullSegmentsForStartTime` has been removed; this setting
+      is no longer necessary, as we no longer fetch segments for start times in
+      the HLS parser
 
   - Player API changes:
     - `shaka.Player.prototype.addTextTrack()` has been replaced by

package/externs/chromecast.js

@@ -270,6 +270,13 @@ chrome.cast.Session = class {
 
 
 chrome.cast.SessionRequest = class {
-  /** @param {string} appId */
-  constructor(appId) {}
+  /**
+   * @param {string} appId
+   * @param {Array.<Object>} capabilities
+   * @param {?number} timeout
+   * @param {boolean} androidReceiverCompatible
+   * @param {Object} credentialsData
+   */
+  constructor(appId, capabilities, timeout, androidReceiverCompatible,
+      credentialsData) {}
 };

package/externs/shaka/manifest.js

@@ -176,6 +176,7 @@ shaka.extern.DrmInfo;
  * @typedef {{
  *   id: number,
  *   language: string,
+ *   disabledUntilTime: number,
  *   primary: boolean,
  *   audio: ?shaka.extern.Stream,
  *   video: ?shaka.extern.Stream,
@@ -198,6 +199,12 @@ shaka.extern.DrmInfo;
  *   The Variant's language, specified as a language code. <br>
  *   See {@link https://tools.ietf.org/html/rfc5646} <br>
  *   See {@link http://www.iso.org/iso/home/standards/language_codes.htm}
+ * @property {number} disabledUntilTime
+ *   <i>Defaults to 0.</i> <br>
+ *   0 means the variant is enabled. The Player will set this value to
+ *   "(Date.now() / 1000) + config.streaming.maxDisabledTime" and once this
+ *   maxDisabledTime has passed Player will set the value to 0 in order to
+ *   reenable the variant.
  * @property {boolean} primary
  *   <i>Defaults to false.</i> <br>
  *   True indicates that the player should use this Variant over others if user

package/externs/shaka/player.js

@@ -82,6 +82,9 @@ shaka.extern.StateChange;
  *
  *   maxSegmentDuration: number,
  *
+ *   gapsJumped: number,
+ *   stallsDetected: number,
+ *
  *   switchHistory: !Array.<shaka.extern.TrackChoice>,
  *   stateHistory: !Array.<shaka.extern.StateChange>
  * }}
@@ -112,6 +115,11 @@ shaka.extern.StateChange;
  * @property {number} estimatedBandwidth
  *   The current estimated network bandwidth (in bit/sec).
  *
+ * @property {number} gapsJumped
+ *   The total number of playback gaps jumped by the GapJumpingController.
+ * @property {number} stallsDetected
+ *   The total number of playback stalls detected by the StallDetector.
+ *
  * @property {number} completionPercent
  *   This is the greatest completion percent that the user has experienced in
  *   playback.  Also known as the "high water mark".  Is NaN when there is no
@@ -618,9 +626,13 @@ shaka.extern.AdvancedDrmConfiguration;
  *   clearKeys: !Object.<string, string>,
  *   delayLicenseRequestUntilPlayed: boolean,
  *   advanced: Object.<string, shaka.extern.AdvancedDrmConfiguration>,
+ *   initDataTransform:
+ *       ((function(!Uint8Array, string, ?shaka.extern.DrmInfo):!Uint8Array)|
+ *         undefined),
  *   logLicenseExchange: boolean,
  *   updateExpirationTime: number,
- *   preferredKeySystems: !Array.<string>
+ *   preferredKeySystems: !Array.<string>,
+ *   keySystemsMapping: !Object.<string, string>
  * }}
  *
  * @property {shaka.extern.RetryParameters} retryParameters
@@ -641,6 +653,14 @@ shaka.extern.AdvancedDrmConfiguration;
  *   <i>Optional.</i> <br>
  *   A dictionary which maps key system IDs to advanced DRM configuration for
  *   those key systems.
+ * @property
+ *     {((function(!Uint8Array, string, ?shaka.extern.DrmInfo):!Uint8Array)|
+ *        undefined)}
+ *   initDataTransform
+ *   <i>Optional.</i><br>
+ *   If given, this function is called with the init data from the
+ *   manifest/media and should return the (possibly transformed) init data to
+ *   pass to the browser.
  * @property {boolean} logLicenseExchange
  *   <i>Optional.</i><br>
  *   If set to <code>true</code>, prints logs containing the license exchange.
@@ -653,6 +673,8 @@ shaka.extern.AdvancedDrmConfiguration;
  * @property {!Array.<string>} preferredKeySystems
  *   <i>Defaults to an empty array. </i> <br>
  *   Specifies the priorties of available DRM key systems.
+ * @property {Object.<string, string>} keySystemsMapping
+ *   A map of key system name to key system name.
  *
  * @exportDoc
  */
@@ -852,7 +874,8 @@ shaka.extern.ManifestConfiguration;
  *   preferNativeHls: boolean,
  *   updateIntervalSeconds: number,
  *   dispatchAllEmsgBoxes: boolean,
- *   observeQualityChanges: boolean
+ *   observeQualityChanges: boolean,
+ *   maxDisabledTime: number
  * }}
  *
  * @description
@@ -957,6 +980,10 @@ shaka.extern.ManifestConfiguration;
  * @property {boolean} observeQualityChanges
  *   If true, monitor media quality changes and emit
  *   <code.shaka.Player.MediaQualityChangedEvent</code>.
+ * @property {number} maxDisabledTime
+ *   The maximum time a variant can be disabled when NETWORK HTTP_ERROR
+ *   is reached, in seconds.
+ *   If all variants are disabled this way, NETWORK HTTP_ERROR will be thrown.
  * @exportDoc
  */
 shaka.extern.StreamingConfiguration;
@@ -1253,11 +1280,14 @@ shaka.extern.Thumbnail;
 
 /**
  * @typedef {{
+ *   id: string,
  *   title: string,
  *   startTime: number,
  *   endTime: number
  * }}
  *
+ * @property {string} id
+ *    The id of the chapter.
  * @property {string} title
  *    The title of the chapter.
  * @property {number} startTime

package/externs/shaka/text.js

@@ -297,6 +297,13 @@ shaka.extern.Cue = class {
      */
     this.fontFamily;
 
+    /**
+     * Text shadow color as a CSS text-shadow value.
+     * @type {string}
+     * @exportDoc
+     */
+    this.textShadow = '';
+
     /**
      * Text stroke color as a CSS color, e.g. "#FFFFFF" or "white".
      * @type {string}

package/karma.conf.js

@@ -363,6 +363,8 @@ module.exports = (config) => {
     // If testing custom assets, we don't serve other unit or integration tests.
     // External asset tests are the basis for custom asset testing, so this file
     // is automatically included.
+    clientArgs.testFiles.push('demo/common/asset.js');
+    clientArgs.testFiles.push('demo/common/assets.js');
     clientArgs.testFiles.push('test/player_external.js');
   } else {
     // In a normal test run, we serve unit tests.
@@ -374,6 +376,8 @@ module.exports = (config) => {
     }
     if (settings.external) {
       // If --external is present, we serve external asset tests.
+      clientArgs.testFiles.push('demo/common/asset.js');
+      clientArgs.testFiles.push('demo/common/assets.js');
       clientArgs.testFiles.push('test/**/*_external.js');
     }
   }

package/lib/abr/simple_abr_manager.js

@@ -219,8 +219,9 @@ shaka.abr.SimpleAbrManager = class {
    * @export
    */
   getBandwidthEstimate() {
+    const defaultBandwidthEstimate = this.getDefaultBandwidth_();
     return this.bandwidthEstimator_.getBandwidthEstimate(
-        this.config_.defaultBandwidthEstimate);
+        defaultBandwidthEstimate);
   }
 
 

package/lib/cast/cast_proxy.js

@@ -43,8 +43,11 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @param {string} receiverAppId The ID of the cast receiver application.
    *   If blank, casting will not be available, but the proxy will still
    *   function otherwise.
+   * @param {boolean} androidReceiverCompatible Indicates if the app is
+   *   compatible with an Android Receiver.
    */
-  constructor(video, player, receiverAppId) {
+  constructor(video, player, receiverAppId,
+      androidReceiverCompatible = false) {
     super();
 
     /** @private {HTMLMediaElement} */
@@ -71,6 +74,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
     /** @private {string} */
     this.receiverAppId_ = receiverAppId;
 
+    /** @private {boolean} */
+    this.androidReceiverCompatible_ = androidReceiverCompatible;
+
     /** @private {!Map} */
     this.compiledToExternNames_ = new Map();
 
@@ -81,7 +87,8 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
         () => this.onFirstCastStateUpdate_(),
         (targetName, event) => this.onRemoteEvent_(targetName, event),
         () => this.onResumeLocal_(),
-        () => this.getInitState_());
+        () => this.getInitState_(),
+        androidReceiverCompatible);
 
 
     this.init_();
@@ -225,15 +232,18 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
 
   /**
    * @param {string} newAppId
+   * @param {boolean=} newCastAndroidReceiver
    * @export
    */
-  async changeReceiverId(newAppId) {
-    if (newAppId == this.receiverAppId_) {
+  async changeReceiverId(newAppId, newCastAndroidReceiver = false) {
+    if (newAppId == this.receiverAppId_ &&
+        newCastAndroidReceiver == this.androidReceiverCompatible_) {
       // Nothing to change
       return;
     }
 
     this.receiverAppId_ = newAppId;
+    this.androidReceiverCompatible_ = newCastAndroidReceiver;
 
     // Destroy the old sender
     this.sender_.forceDisconnect();
@@ -248,7 +258,8 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
         () => this.onFirstCastStateUpdate_(),
         (targetName, event) => this.onRemoteEvent_(targetName, event),
         () => this.onResumeLocal_(),
-        () => this.getInitState_());
+        () => this.getInitState_(),
+        newCastAndroidReceiver);
 
     this.sender_.init();
   }
@@ -267,8 +278,8 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
           (event) => this.videoProxyLocalEvent_(event));
     }
 
-    for (const key in shaka.Player.EventName) {
-      const name = shaka.Player.EventName[key];
+    for (const key in shaka.util.FakeEvent.EventName) {
+      const name = shaka.util.FakeEvent.EventName[key];
       this.eventManager_.listen(this.localPlayer_, name,
           (event) => this.playerProxyLocalEvent_(event));
     }
@@ -526,7 +537,7 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
       // Pass any errors through to the app.
       goog.asserts.assert(error instanceof shaka.util.Error,
           'Wrong error type!');
-      const eventType = shaka.Player.EventName.Error;
+      const eventType = shaka.util.FakeEvent.EventName.Error;
       const data = (new Map()).set('detail', error);
       const event = new shaka.util.FakeEvent(eventType, data);
       this.localPlayer_.dispatchEvent(event);

package/lib/cast/cast_receiver.js

@@ -281,8 +281,8 @@ shaka.cast.CastReceiver = class extends shaka.util.FakeEventTarget {
           this.video_, name, (event) => this.proxyEvent_('video', event));
     }
 
-    for (const key in shaka.Player.EventName) {
-      const name = shaka.Player.EventName[key];
+    for (const key in shaka.util.FakeEvent.EventName) {
+      const name = shaka.util.FakeEvent.EventName[key];
       this.eventManager_.listen(
           this.player_, name, (event) => this.proxyEvent_('player', event));
     }
@@ -409,7 +409,7 @@ shaka.cast.CastReceiver = class extends shaka.util.FakeEventTarget {
         // Pass any errors through to the app.
         goog.asserts.assert(error instanceof shaka.util.Error,
             'Wrong error type!');
-        const eventType = shaka.Player.EventName.Error;
+        const eventType = shaka.util.FakeEvent.EventName.Error;
         const data = (new Map()).set('detail', error);
         const event = new shaka.util.FakeEvent(eventType, data);
         // Only dispatch the event if the player still exists.

package/lib/cast/cast_sender.js

@@ -32,12 +32,18 @@ shaka.cast.CastSender = class {
    *   should resume playback.  Called before the cached remote state is wiped.
    * @param {function()} onInitStateRequired A callback to get local player's.
    *   state.  Invoked when casting is initiated from Chrome's cast button.
+   * @param {boolean} androidReceiverCompatible Indicates if the app is
+   *   compatible with an Android Receiver.
    */
   constructor(receiverAppId, onStatusChanged, onFirstCastStateUpdate,
-      onRemoteEvent, onResumeLocal, onInitStateRequired) {
+      onRemoteEvent, onResumeLocal, onInitStateRequired,
+      androidReceiverCompatible) {
     /** @private {string} */
     this.receiverAppId_ = receiverAppId;
 
+    /** @private {boolean} */
+    this.androidReceiverCompatible_ = androidReceiverCompatible;
+
     /** @private {shaka.util.Timer} */
     this.statusChangeTimer_ = new shaka.util.Timer(onStatusChanged);
 
@@ -211,7 +217,11 @@ shaka.cast.CastSender = class {
     // Use static versions of the API callbacks, since the ChromeCast API is
     // static. If we used local versions, we might end up retaining references
     // to destroyed players here.
-    const sessionRequest = new chrome.cast.SessionRequest(this.receiverAppId_);
+    const sessionRequest = new chrome.cast.SessionRequest(this.receiverAppId_,
+        /* capabilities= */ [],
+        /* timeout= */ null,
+        this.androidReceiverCompatible_,
+        /* credentialsData= */null);
     const apiConfig = new chrome.cast.ApiConfig(sessionRequest,
         (session) => CastSender.onExistingSessionJoined_(session),
         (availability) => CastSender.onReceiverStatusChanged_(availability),

package/lib/dash/dash_parser.js

@@ -765,8 +765,8 @@ shaka.dash.DashParser = class {
             // currently support that.  Just choose one.
             // TODO: https://github.com/shaka-project/shaka-player/issues/1528
             stream.trickModeVideo = trickModeSet.streams.find((trickStream) =>
-              shaka.util.MimeUtils.getCodecBase(stream.codecs) ==
-              shaka.util.MimeUtils.getCodecBase(trickStream.codecs));
+              shaka.util.MimeUtils.getNormalizedCodec(stream.codecs) ==
+              shaka.util.MimeUtils.getNormalizedCodec(trickStream.codecs));
           }
         }
       }

package/lib/hls/hls_parser.js

@@ -460,6 +460,7 @@ shaka.hls.HlsParser = class {
       variants.push({
         id: 0,
         language: 'und',
+        disabledUntilTime: 0,
         primary: true,
         audio: type == 'audio' ? streamInfo.stream : null,
         video: type == 'video' ? streamInfo.stream : null,
@@ -1825,7 +1826,7 @@ shaka.hls.HlsParser = class {
    * @param {!Map.<string, string>} variables
    * @param {string} absoluteMediaPlaylistUri
    * @param {string} type
-   * @return {!shaka.media.SegmentReference}
+   * @return {shaka.media.SegmentReference}
    * @private
    */
   createSegmentReference_(
@@ -1870,17 +1871,42 @@ shaka.hls.HlsParser = class {
       status = shaka.media.SegmentReference.Status.MISSING;
     }
 
+    if (!extinfTag) {
+      if (hlsSegment.partialSegments.length == 0) {
+        // EXTINF tag must be available if the segment has no partial segments.
+        throw new shaka.util.Error(
+            shaka.util.Error.Severity.CRITICAL,
+            shaka.util.Error.Category.MANIFEST,
+            shaka.util.Error.Code.HLS_REQUIRED_TAG_MISSING, 'EXTINF');
+      } else if (!this.lowLatencyMode_) {
+        // Without EXTINF and without low-latency mode, partial segments get
+        // ignored.
+        return null;
+      }
+    }
+
     // Create SegmentReferences for the partial segments.
     const partialSegmentRefs = [];
-    if (this.lowLatencyMode_ && hlsSegment.partialSegments.length) {
+    if (this.lowLatencyMode_) {
       for (let i = 0; i < hlsSegment.partialSegments.length; i++) {
         const item = hlsSegment.partialSegments[i];
         const pPreviousReference = i == 0 ?
           previousReference : partialSegmentRefs[partialSegmentRefs.length - 1];
         const pStartTime = (i == 0) ? startTime : pPreviousReference.endTime;
-        const pDuration = Number(item.getAttributeValue('DURATION'));
-        // A preload hinted partial segment doesn't have duration information,
-        // so its startTime and endTime are the same.
+
+        // If DURATION is missing from this partial segment, use the target
+        // partial duration from the top of the playlist, which is a required
+        // attribute for content with partial segments.
+        const pDuration = Number(item.getAttributeValue('DURATION')) ||
+            this.partialTargetDuration_;
+
+        // If for some reason we have neither an explicit duration, nor a target
+        // partial duration, we should SKIP this partial segment to avoid
+        // duplicating content in the presentation timeline.
+        if (!pDuration) {
+          continue;
+        }
+
         const pEndTime = pStartTime + pDuration;
 
         let pStartByte = 0;
@@ -1901,6 +1927,11 @@ shaka.hls.HlsParser = class {
         const pAbsoluteUri = shaka.hls.Utils.constructAbsoluteUri(
             absoluteMediaPlaylistUri, pUri);
 
+        let partialStatus = shaka.media.SegmentReference.Status.AVAILABLE;
+        if (item.getAttributeValue('GAP') == 'YES') {
+          partialStatus = shaka.media.SegmentReference.Status.MISSING;
+        }
+
         const partial = new shaka.media.SegmentReference(
             pStartTime,
             pEndTime,
@@ -1910,17 +1941,14 @@ shaka.hls.HlsParser = class {
             initSegmentReference,
             /* timestampOffset= */ 0, // This value is ignored in sequence mode.
             /* appendWindowStart= */ 0,
-            /* appendWindowEnd= */ Infinity);
+            /* appendWindowEnd= */ Infinity,
+            /* partialReferences= */ [],
+            /* tilesLayout= */ '',
+            /* tileDuration= */ null,
+            /* syncTime= */ null,
+            partialStatus);
         partialSegmentRefs.push(partial);
       } // for-loop of hlsSegment.partialSegments
-    } else {
-      // EXTINF tag must be available if the segment has no partial segments.
-      if (!extinfTag) {
-        throw new shaka.util.Error(
-            shaka.util.Error.Severity.CRITICAL,
-            shaka.util.Error.Category.MANIFEST,
-            shaka.util.Error.Code.HLS_REQUIRED_TAG_MISSING, 'EXTINF');
-      }
     }
 
     // If the segment has EXTINF tag, set the segment's end time, start byte
@@ -1939,6 +1967,7 @@ shaka.hls.HlsParser = class {
     } else {
       endTime = partialSegmentRefs[partialSegmentRefs.length - 1].endTime;
     }
+
     // If the segment has EXT-X-BYTERANGE tag, set the start byte and end byte
     // base on the byterange information. If segment has no EXT-X-BYTERANGE tag
     // and has partial segments, set the start byte and end byte base on the
@@ -2107,7 +2136,9 @@ shaka.hls.HlsParser = class {
           playlist.absoluteUri,
           type);
 
-      references.push(reference);
+      if (reference) {
+        references.push(reference);
+      }
     }
 
     // If some segments have sync times, but not all, extrapolate the sync

package/lib/media/drm_engine.js

@@ -355,7 +355,8 @@ shaka.media.DrmEngine = class {
         shaka.media.DrmEngine.fillInDrmInfoDefaults_(
             info,
             shaka.util.MapUtils.asMap(this.config_.servers),
-            shaka.util.MapUtils.asMap(this.config_.advanced || {}));
+            shaka.util.MapUtils.asMap(this.config_.advanced || {}),
+            this.config_.keySystemsMapping);
       }
     }
 
@@ -1253,6 +1254,22 @@ shaka.media.DrmEngine = class {
     };
     this.activeSessions_.set(session, metadata);
 
+    try {
+      initData = this.config_.initDataTransform(
+          initData, initDataType, this.currentDrmInfo_);
+    } 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;
+    }
+
     if (this.config_.logLicenseExchange) {
       const str = shaka.util.Uint8ArrayUtils.toBase64(initData);
       shaka.log.info('EME init data: type=', initDataType, 'data=', str);
@@ -1408,6 +1425,9 @@ shaka.media.DrmEngine = class {
       }
       return;
     }
+    if (this.destroyer_.destroyed()) {
+      return;
+    }
 
     const updateEvent = new shaka.util.FakeEvent('drmsessionupdate');
     this.playerInterface_.onEvent(updateEvent);
@@ -2205,16 +2225,20 @@ shaka.media.DrmEngine = class {
    * that the parser left blank. Before working with any drmInfo, it should be
    * passed through here as it is uncommon for drmInfo to be complete when
    * fetched from a manifest because most manifest formats do not have the
-   * required information.
+   * required information. Also applies the key systems mapping.
    *
    * @param {shaka.extern.DrmInfo} drmInfo
    * @param {!Map.<string, string>} servers
    * @param {!Map.<string, shaka.extern.AdvancedDrmConfiguration>}
    *   advancedConfigs
+   * @param {!Object.<string, string>} keySystemsMapping
    * @private
    */
-  static fillInDrmInfoDefaults_(drmInfo, servers, advancedConfigs) {
-    if (!drmInfo.keySystem) {
+  static fillInDrmInfoDefaults_(drmInfo, servers, advancedConfigs,
+      keySystemsMapping) {
+    const originalKeySystem = drmInfo.keySystem;
+
+    if (!originalKeySystem) {
       // This is a placeholder from the manifest parser for an unrecognized key
       // system.  Skip this entry, to avoid logging nonsensical errors.
       return;
@@ -2235,14 +2259,14 @@ shaka.media.DrmEngine = class {
     // The only way to get license servers from the manifest is not to specify
     // any in your player config.
 
-    if (drmInfo.keySystem == 'org.w3.clearkey' && drmInfo.licenseServerUri) {
+    if (originalKeySystem == 'org.w3.clearkey' && drmInfo.licenseServerUri) {
       // Preference 1: Clear Key with pre-configured keys will have a data URI
       // assigned as its license server.  Don't change anything.
       return;
     } else if (servers.size) {
       // Preference 2: If anything is configured at the application level,
       // override whatever was in the manifest.
-      const server = servers.get(drmInfo.keySystem) || '';
+      const server = servers.get(originalKeySystem) || '';
 
       drmInfo.licenseServerUri = server;
     } else {
@@ -2254,7 +2278,7 @@ shaka.media.DrmEngine = class {
       drmInfo.keyIds = new Set();
     }
 
-    const advancedConfig = advancedConfigs.get(drmInfo.keySystem);
+    const advancedConfig = advancedConfigs.get(originalKeySystem);
 
     if (advancedConfig) {
       if (!drmInfo.distinctiveIdentifierRequired) {
@@ -2288,6 +2312,10 @@ shaka.media.DrmEngine = class {
       }
     }
 
+    if (keySystemsMapping[originalKeySystem]) {
+      drmInfo.keySystem = keySystemsMapping[originalKeySystem];
+    }
+
     // Chromecast has a variant of PlayReady that uses a different key
     // system ID.  Since manifest parsers convert the standard PlayReady
     // UUID to the standard PlayReady key system ID, here we will switch
@@ -2296,7 +2324,7 @@ shaka.media.DrmEngine = class {
     // player config uses the standard PlayReady ID for license server
     // configuration.
     if (window.cast && window.cast.__platform__) {
-      if (drmInfo.keySystem == 'com.microsoft.playready') {
+      if (originalKeySystem == 'com.microsoft.playready') {
         drmInfo.keySystem = 'com.chromecast.playready';
       }
     }