shaka-player 4.12.8 → 4.13.0

package/lib/{media → drm}/drm_engine.js

@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.media.DrmEngine');
+goog.provide('shaka.drm.DrmEngine');
 
 goog.require('goog.asserts');
 goog.require('shaka.log');
+goog.require('shaka.drm.DrmUtils');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ArrayUtils');
 goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.Destroyer');
-goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
@@ -33,12 +33,12 @@ goog.require('shaka.util.Uint8ArrayUtils');
 
 
 /** @implements {shaka.util.IDestroyable} */
-shaka.media.DrmEngine = class {
+shaka.drm.DrmEngine = class {
   /**
-   * @param {shaka.media.DrmEngine.PlayerInterface} playerInterface
+   * @param {shaka.drm.DrmEngine.PlayerInterface} playerInterface
    */
   constructor(playerInterface) {
-    /** @private {?shaka.media.DrmEngine.PlayerInterface} */
+    /** @private {?shaka.drm.DrmEngine.PlayerInterface} */
     this.playerInterface_ = playerInterface;
 
     /** @private {MediaKeys} */
@@ -63,12 +63,12 @@ shaka.media.DrmEngine = class {
     this.eventManager_ = new shaka.util.EventManager();
 
     /**
-     * @private {!Map.<MediaKeySession,
-     *           shaka.media.DrmEngine.SessionMetaData>}
+     * @private {!Map<MediaKeySession,
+     *           shaka.drm.DrmEngine.SessionMetaData>}
      */
     this.activeSessions_ = new Map();
 
-    /** @private {!Array.<!shaka.net.NetworkingEngine.PendingRequest>} */
+    /** @private {!Array<!shaka.net.NetworkingEngine.PendingRequest>} */
     this.activeRequests_ = [];
 
     /**
@@ -100,7 +100,7 @@ shaka.media.DrmEngine = class {
      * We may not have announced this information to the outside world yet,
      * which we delay to batch up changes and avoid spurious "missing key"
      * errors.
-     * @private {!Map.<string, string>}
+     * @private {!Map<string, string>}
      */
     this.keyStatusByKeyId_ = new Map();
 
@@ -108,7 +108,7 @@ shaka.media.DrmEngine = class {
      * The key statuses most recently announced to other classes.
      * We may have more up-to-date information being collected in
      * this.keyStatusByKeyId_, which has not been batched up and released yet.
-     * @private {!Map.<string, string>}
+     * @private {!Map<string, string>}
      */
     this.announcedKeyStatusByKeyId_ = new Map();
 
@@ -119,7 +119,7 @@ shaka.media.DrmEngine = class {
     /** @private {boolean} */
     this.usePersistentLicenses_ = false;
 
-    /** @private {!Array.<!MediaKeyMessageEvent>} */
+    /** @private {!Array<!MediaKeyMessageEvent>} */
     this.mediaKeyMessageEvents_ = [];
 
     /** @private {boolean} */
@@ -243,7 +243,7 @@ shaka.media.DrmEngine = class {
   /**
    * Initialize the drm engine for storing and deleting stored content.
    *
-   * @param {!Array.<shaka.extern.Variant>} variants
+   * @param {!Array<shaka.extern.Variant>} variants
    *    The variants that are going to be stored.
    * @param {boolean} usePersistentLicenses
    *    Whether or not persistent licenses should be requested and stored for
@@ -270,9 +270,9 @@ shaka.media.DrmEngine = class {
   /**
    * Initialize the drm engine for playback operations.
    *
-   * @param {!Array.<shaka.extern.Variant>} variants
+   * @param {!Array<shaka.extern.Variant>} variants
    *    The variants that we want to support playing.
-   * @param {!Array.<string>} offlineSessionIds
+   * @param {!Array<string>} offlineSessionIds
    * @return {!Promise}
    */
   initForPlayback(variants, offlineSessionIds) {
@@ -302,13 +302,13 @@ shaka.media.DrmEngine = class {
    * @param {string} keySystem
    * @param {string} licenseServerUri
    * @param {Uint8Array} serverCertificate
-   * @param {!Array.<MediaKeySystemMediaCapability>} audioCapabilities
-   * @param {!Array.<MediaKeySystemMediaCapability>} videoCapabilities
+   * @param {!Array<MediaKeySystemMediaCapability>} audioCapabilities
+   * @param {!Array<MediaKeySystemMediaCapability>} videoCapabilities
    * @return {!Promise}
    */
   initForRemoval(keySystem, licenseServerUri, serverCertificate,
       audioCapabilities, videoCapabilities) {
-    /** @type {!Map.<string, MediaKeySystemConfiguration>} */
+    /** @type {!Map<string, MediaKeySystemConfiguration>} */
     const configsByKeySystem = new Map();
 
     /** @type {MediaKeySystemConfiguration} */
@@ -345,7 +345,7 @@ shaka.media.DrmEngine = class {
    * This will assume that both |usePersistentLicences_| and
    * |storedPersistentSessions_| have been properly set.
    *
-   * @param {!Array.<shaka.extern.Variant>} variants
+   * @param {!Array<shaka.extern.Variant>} variants
    *    The variants that we expect to operate with during the drm engine's
    *    lifespan of the drm engine.
    * @return {!Promise} Resolved if/when a key system has been chosen.
@@ -355,21 +355,7 @@ shaka.media.DrmEngine = class {
     goog.asserts.assert(this.config_,
         'DrmEngine configure() must be called before init()!');
 
-    // ClearKey config overrides the manifest DrmInfo if present. The variants
-    // are modified so that filtering in Player still works.
-    // This comes before hadDrmInfo because it influences the value of that.
-    /** @type {?shaka.extern.DrmInfo} */
-    const clearKeyDrmInfo = this.configureClearKey_();
-    if (clearKeyDrmInfo) {
-      for (const variant of variants) {
-        if (variant.video) {
-          variant.video.drmInfos = [clearKeyDrmInfo];
-        }
-        if (variant.audio) {
-          variant.audio.drmInfos = [clearKeyDrmInfo];
-        }
-      }
-    }
+    shaka.drm.DrmEngine.configureClearKey(this.config_.clearKeys, variants);
 
     const hadDrmInfo = variants.some((variant) => {
       if (variant.video && variant.video.drmInfos.length) {
@@ -390,7 +376,7 @@ shaka.media.DrmEngine = class {
     // systems as possible so that we will be ready.
     if (!hadDrmInfo) {
       const servers = shaka.util.MapUtils.asMap(this.config_.servers);
-      shaka.media.DrmEngine.replaceDrmInfo_(variants, servers);
+      shaka.drm.DrmEngine.replaceDrmInfo_(variants, servers);
     }
 
     /** @type {!Set<shaka.extern.DrmInfo>} */
@@ -403,16 +389,79 @@ shaka.media.DrmEngine = class {
     }
 
     for (const info of drmInfos) {
-      shaka.media.DrmEngine.fillInDrmInfoDefaults_(
+      shaka.drm.DrmEngine.fillInDrmInfoDefaults_(
           info,
           shaka.util.MapUtils.asMap(this.config_.servers),
           shaka.util.MapUtils.asMap(this.config_.advanced || {}),
           this.config_.keySystemsMapping);
     }
 
-    /** @type {!Map.<string, MediaKeySystemConfiguration>} */
+    /** @type {!Map<string, MediaKeySystemConfiguration>} */
     let configsByKeySystem;
 
+    /**
+     * Expand robustness into multiple drm infos if multiple video robustness
+     * levels were provided.
+     *
+     * robustness can be either a single item as a string or multiple items as
+     * an array of strings.
+     *
+     * @param {!Array<shaka.extern.DrmInfo>} drmInfos
+     * @param {string} robustnessType
+     * @return {!Array<shaka.extern.DrmInfo>}
+     */
+    const expandRobustness = (drmInfos, robustnessType) => {
+      const newDrmInfos = [];
+      for (const drmInfo of drmInfos) {
+        let items = drmInfo[robustnessType] ||
+            (this.config_.advanced &&
+            this.config_.advanced[drmInfo.keySystem] &&
+            this.config_.advanced[drmInfo.keySystem][robustnessType]) || '';
+        if (items == '' &&
+            shaka.drm.DrmUtils.isWidevineKeySystem(drmInfo.keySystem)) {
+          if (robustnessType == 'audioRobustness') {
+            items = [this.config_.defaultAudioRobustnessForWidevine];
+          } else if (robustnessType == 'videoRobustness') {
+            items = [this.config_.defaultVideoRobustnessForWidevine];
+          }
+        }
+        if (typeof items === 'string') {
+          // if drmInfo's robustness has already been expanded,
+          // use the drmInfo directly.
+          newDrmInfos.push(drmInfo);
+        } else if (Array.isArray(items)) {
+          if (items.length === 0) {
+            items = [''];
+          }
+          for (const item of items) {
+            newDrmInfos.push(
+                Object.assign({}, drmInfo, {[robustnessType]: item}),
+            );
+          }
+        }
+      }
+      return newDrmInfos;
+    };
+
+    for (const variant of variants) {
+      if (variant.video) {
+        variant.video.drmInfos =
+            expandRobustness(variant.video.drmInfos,
+                'videoRobustness');
+        variant.video.drmInfos =
+            expandRobustness(variant.video.drmInfos,
+                'audioRobustness');
+      }
+      if (variant.audio) {
+        variant.audio.drmInfos =
+            expandRobustness(variant.audio.drmInfos,
+                'videoRobustness');
+        variant.audio.drmInfos =
+            expandRobustness(variant.audio.drmInfos,
+                'audioRobustness');
+      }
+    }
+
     // We should get the decodingInfo results for the variants after we filling
     // in the drm infos, and before queryMediaKeys_().
     await shaka.util.StreamUtils.getDecodingInfosForVariants(variants,
@@ -560,7 +609,7 @@ shaka.media.DrmEngine = class {
 
     // Explicit init data for any one stream or an offline session is
     // sufficient to suppress 'encrypted' events for all streams.
-    // Also suppress 'encrypted' events when parsing in-band ppsh
+    // Also suppress 'encrypted' events when parsing in-band pssh
     // from media segments because that serves the same purpose as the
     // 'encrypted' events.
     if (!this.manifestInitData_ && !this.storedPersistentSessions_.size &&
@@ -781,7 +830,7 @@ shaka.media.DrmEngine = class {
 
     // If there are pre-existing sessions that have all been loaded
     // then reset the allSessionsLoaded_ promise, which can now be
-    // used to wait for new sesssions to be loaded
+    // used to wait for new sessions to be loaded
     if (this.activeSessions_.size > 0 && this.areAllSessionsLoaded_()) {
       this.allSessionsLoaded_.resolve();
       this.hasInitData_ = false;
@@ -800,7 +849,7 @@ shaka.media.DrmEngine = class {
   /**
    * Returns the ID of the sessions currently active.
    *
-   * @return {!Array.<string>}
+   * @return {!Array<string>}
    */
   getSessionIds() {
     const sessions = this.activeSessions_.keys();
@@ -813,7 +862,7 @@ shaka.media.DrmEngine = class {
   /**
    * Returns the active sessions metadata
    *
-   * @return {!Array.<shaka.extern.DrmSessionMetadata>}
+   * @return {!Array<shaka.extern.DrmSessionMetadata>}
    */
   getActiveSessionsMetadata() {
     const sessions = this.activeSessions_.keys();
@@ -882,7 +931,7 @@ shaka.media.DrmEngine = class {
   /**
    * Returns the current key statuses.
    *
-   * @return {!Object.<string, string>}
+   * @return {!Object<string, string>}
    */
   getKeyStatuses() {
     return shaka.util.MapUtils.asObject(this.announcedKeyStatusByKeyId_);
@@ -891,17 +940,17 @@ shaka.media.DrmEngine = class {
   /**
    * Returns the current media key sessions.
    *
-   * @return {!Array.<MediaKeySession>}
+   * @return {!Array<MediaKeySession>}
    */
   getMediaKeySessions() {
     return Array.from(this.activeSessions_.keys());
   }
 
   /**
-   * @param {!Map.<string, MediaKeySystemConfiguration>} configsByKeySystem
+   * @param {!Map<string, MediaKeySystemConfiguration>} configsByKeySystem
    *   A dictionary of configs, indexed by key system, with an iteration order
    *   (insertion order) that reflects the preference for the application.
-   * @param {!Array.<shaka.extern.Variant>} variants
+   * @param {!Array<shaka.extern.Variant>} variants
    * @return {!Promise} Resolved if/when a key system has been chosen.
    * @private
    */
@@ -913,6 +962,12 @@ shaka.media.DrmEngine = class {
         await this.getKeySystemAccessByConfigs_(configsByKeySystem);
 
     if (!mediaKeySystemAccess) {
+      if (!navigator.requestMediaKeySystemAccess) {
+        throw new shaka.util.Error(
+            shaka.util.Error.Severity.CRITICAL,
+            shaka.util.Error.Category.DRM,
+            shaka.util.Error.Code.MISSING_EME_SUPPORT);
+      }
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.DRM,
@@ -936,7 +991,7 @@ shaka.media.DrmEngine = class {
         this.currentDrmInfo_ = this.createDrmInfoByInfos_(
             keySystem, drmInfosByKeySystem.get(keySystem));
       } else {
-        this.currentDrmInfo_ = shaka.media.DrmEngine.createDrmInfoByConfigs_(
+        this.currentDrmInfo_ = shaka.drm.DrmEngine.createDrmInfoByConfigs_(
             keySystem, configsByKeySystem.get(keySystem));
       }
       if (!this.currentDrmInfo_.licenseServerUri) {
@@ -1001,8 +1056,8 @@ shaka.media.DrmEngine = class {
 
   /**
    * Get the MediaKeySystemAccess from the decodingInfos of the variants.
-   * @param {!Array.<shaka.extern.Variant>} variants
-   * @param {!Map.<string, !Array.<shaka.extern.DrmInfo>>} drmInfosByKeySystem
+   * @param {!Array<shaka.extern.Variant>} variants
+   * @param {!Map<string, !Array<shaka.extern.DrmInfo>>} drmInfosByKeySystem
    *   A dictionary of drmInfos, indexed by key system.
    * @return {MediaKeySystemAccess}
    * @private
@@ -1071,10 +1126,10 @@ shaka.media.DrmEngine = class {
 
   /**
    * Get the MediaKeySystemAccess by querying requestMediaKeySystemAccess.
-   * @param {!Map.<string, MediaKeySystemConfiguration>} configsByKeySystem
+   * @param {!Map<string, MediaKeySystemConfiguration>} configsByKeySystem
    *   A dictionary of configs, indexed by key system, with an iteration order
    *   (insertion order) that reflects the preference for the application.
-   * @return {!Promise.<MediaKeySystemAccess>} Resolved if/when a
+   * @return {!Promise<MediaKeySystemAccess>} Resolved if/when a
    *   mediaKeySystemAccess has been chosen.
    * @private
    */
@@ -1152,23 +1207,6 @@ shaka.media.DrmEngine = class {
     return mediaKeySystemAccess;
   }
 
-  /**
-   * Create a DrmInfo using configured clear keys.
-   * The server URI will be a data URI which decodes to a clearkey license.
-   * @return {?shaka.extern.DrmInfo} or null if clear keys are not configured.
-   * @private
-   * @see https://bit.ly/2K8gOnv for the spec on the clearkey license format.
-   */
-  configureClearKey_() {
-    const clearKeys = shaka.util.MapUtils.asMap(this.config_.clearKeys);
-    if (clearKeys.size == 0) {
-      return null;
-    }
-
-    const ManifestParserUtils = shaka.util.ManifestParserUtils;
-    return ManifestParserUtils.createDrmInfoFromClearKeys(clearKeys);
-  }
-
   /**
    * Resolves the allSessionsLoaded_ promise when all the sessions are loaded
    *
@@ -1184,7 +1222,7 @@ shaka.media.DrmEngine = class {
    * In case there are no key statuses, consider this session loaded
    * after a reasonable timeout.  It should definitely not take 5
    * seconds to process a license.
-   * @param {!shaka.media.DrmEngine.SessionMetaData} metadata
+   * @param {!shaka.drm.DrmEngine.SessionMetaData} metadata
    * @private
    */
   setLoadSessionTimeoutTimer_(metadata) {
@@ -1194,13 +1232,13 @@ shaka.media.DrmEngine = class {
     });
 
     timer.tickAfter(
-        /* seconds= */ shaka.media.DrmEngine.SESSION_LOAD_TIMEOUT_);
+        /* seconds= */ shaka.drm.DrmEngine.SESSION_LOAD_TIMEOUT_);
   }
 
   /**
    * @param {string} sessionId
    * @param {{initData: ?Uint8Array, initDataType: ?string}} sessionMetadata
-   * @return {!Promise.<MediaKeySession>}
+   * @return {!Promise<MediaKeySession>}
    * @private
    */
   async loadOfflineSession_(sessionId, sessionMetadata) {
@@ -1456,12 +1494,12 @@ shaka.media.DrmEngine = class {
     }
     // NOTE: allowCrossSiteCredentials can be set in a request filter.
 
-    if (shaka.util.DrmUtils.isClearKeySystem(
+    if (shaka.drm.DrmUtils.isClearKeySystem(
         this.currentDrmInfo_.keySystem)) {
       this.fixClearKeyRequest_(request, this.currentDrmInfo_);
     }
 
-    if (shaka.util.DrmUtils.isPlayReadyKeySystem(
+    if (shaka.drm.DrmUtils.isPlayReadyKeySystem(
         this.currentDrmInfo_.keySystem)) {
       this.unpackPlayReadyRequest_(request);
     }
@@ -1611,7 +1649,7 @@ shaka.media.DrmEngine = class {
     goog.asserts.assert(challenge.attributes['encoding'] == 'base64encoded',
         'Unexpected PlayReady challenge encoding!');
     request.body = shaka.util.Uint8ArrayUtils.fromBase64(
-        /** @type{string} */(shaka.util.TXml.getTextContents(challenge)));
+        /** @type {string} */(shaka.util.TXml.getTextContents(challenge)));
   }
 
   /**
@@ -1626,7 +1664,7 @@ shaka.media.DrmEngine = class {
       const body = shaka.util.StringUtils.fromBytesAutoDetect(request.body);
       if (body) {
         const licenseBody =
-          /** @type {shaka.media.DrmEngine.ClearKeyLicenceRequestFormat} */ (
+          /** @type {shaka.drm.DrmEngine.ClearKeyLicenceRequestFormat} */ (
             JSON.parse(body));
         if (!licenseBody.type) {
           licenseBody.type = drmInfo.sessionType;
@@ -1673,7 +1711,7 @@ shaka.media.DrmEngine = class {
       // NOTE that we skip this if byteLength != 16.  This is used for Edge
       // which uses single-byte dummy key IDs.
       // However, unlike Edge and Chromecast, Tizen doesn't have this problem.
-      if (shaka.util.DrmUtils.isPlayReadyKeySystem(
+      if (shaka.drm.DrmUtils.isPlayReadyKeySystem(
           this.currentDrmInfo_.keySystem) &&
           keyId.byteLength == 16 &&
           (shaka.util.Platform.isEdge() || shaka.util.Platform.isPS4())) {
@@ -1719,7 +1757,7 @@ shaka.media.DrmEngine = class {
       if (found && !found.updatePromise) {
         shaka.log.debug('Session has expired', session.sessionId);
         this.activeSessions_.delete(session);
-        session.close().catch(() => {});  // Silence uncaught rejection errors
+        this.closeSession_(session);
       }
     }
 
@@ -1737,7 +1775,7 @@ shaka.media.DrmEngine = class {
     // each of them.  By batching these up, we only send one status change event
     // and at most one EXPIRED error on expiration.
     this.keyStatusTimer_.tickAfter(
-        /* seconds= */ shaka.media.DrmEngine.KEY_STATUS_BATCH_TIME);
+        /* seconds= */ shaka.drm.DrmEngine.KEY_STATUS_BATCH_TIME);
   }
 
   /** @private */
@@ -1768,12 +1806,9 @@ shaka.media.DrmEngine = class {
   /**
    * Returns a Promise to a map of EME support for well-known key systems.
    *
-   * @return {!Promise.<!Object.<string, ?shaka.extern.DrmSupportType>>}
+   * @return {!Promise<!Object<string, ?shaka.extern.DrmSupportType>>}
    */
   static async probeSupport() {
-    goog.asserts.assert(shaka.util.DrmUtils.isBrowserSupported(),
-        'Must have basic EME support');
-
     const testKeySystems = [
       'org.w3.clearkey',
       'com.widevine.alpha',
@@ -1784,6 +1819,27 @@ shaka.media.DrmEngine = class {
       'com.chromecast.playready',
       'com.apple.fps.1_0',
       'com.apple.fps',
+      'com.huawei.wiseplay',
+    ];
+
+    if (!shaka.drm.DrmUtils.isBrowserSupported()) {
+      const result = {};
+      for (const keySystem of testKeySystems) {
+        result[keySystem] = null;
+      }
+      return result;
+    }
+
+    const hdcpVersions = [
+      '1.0',
+      '1.1',
+      '1.2',
+      '1.3',
+      '1.4',
+      '2.0',
+      '2.1',
+      '2.2',
+      '2.3',
     ];
 
     const widevineRobustness = [
@@ -1829,7 +1885,7 @@ shaka.media.DrmEngine = class {
       'cbcs-1-9',
     ];
 
-    /** @type {!Map.<string, ?shaka.extern.DrmSupportType>} */
+    /** @type {!Map<string, ?shaka.extern.DrmSupportType>} */
     const support = new Map();
 
     /**
@@ -1838,8 +1894,9 @@ shaka.media.DrmEngine = class {
      * @return {!Promise}
      */
     const processMediaKeySystemAccess = async (keySystem, access) => {
+      let mediaKeys;
       try {
-        await access.createMediaKeys();
+        mediaKeys = await access.createMediaKeys();
       } catch (error) {
         // In some cases, we can get a successful access object but fail to
         // create a MediaKeys instance.  When this happens, don't update the
@@ -1869,6 +1926,7 @@ shaka.media.DrmEngine = class {
         encryptionSchemes: [],
         videoRobustnessLevels: [],
         audioRobustnessLevels: [],
+        minHdcpVersions: [],
       };
       if (support.has(keySystem) && support.get(keySystem)) {
         // Update the existing non-null value.
@@ -1898,6 +1956,24 @@ shaka.media.DrmEngine = class {
           !supportValue.audioRobustnessLevels.includes(audioRobustness)) {
         supportValue.audioRobustnessLevels.push(audioRobustness);
       }
+
+      if ('getStatusForPolicy' in mediaKeys) {
+        const promises = [];
+        for (const hdcpVersion of hdcpVersions) {
+          if (supportValue.minHdcpVersions.includes(hdcpVersion)) {
+            continue;
+          }
+          promises.push(mediaKeys.getStatusForPolicy({
+            minHdcpVersion: hdcpVersion,
+          }).then((status) => {
+            if (status == 'usable' &&
+                !supportValue.minHdcpVersions.includes(hdcpVersion)) {
+              supportValue.minHdcpVersions.push(hdcpVersion);
+            }
+          }));
+        }
+        await Promise.all(promises);
+      }
     };
 
     const testSystemEme = async (keySystem, encryptionScheme,
@@ -1923,10 +1999,10 @@ shaka.media.DrmEngine = class {
         // requestMediaKeySystemAccess will
         // not resolve or reject, at least if RESOURCE_PROTECTED_MEDIA_ID
         // is not set.  This is a workaround for that issue.
-        const TIMEOUT_FOR_CHECKACCESS_IN_SECONDS = 1;
+        const TIMEOUT_FOR_CHECK_ACCESS_IN_SECONDS = 1;
         const access =
           await shaka.util.Functional.promiseWithTimeout(
-              TIMEOUT_FOR_CHECKACCESS_IN_SECONDS,
+              TIMEOUT_FOR_CHECK_ACCESS_IN_SECONDS,
               navigator.requestMediaKeySystemAccess(keySystem, configs),
           );
         await processMediaKeySystemAccess(keySystem, access);
@@ -1986,17 +2062,47 @@ shaka.media.DrmEngine = class {
       support.set(keySystem, null);
     }
 
+    const checkKeySystem = (keySystem) => {
+      // Our Polyfill will reject anything apart com.apple.fps key systems.
+      // It seems the Safari modern EME API will allow to request a
+      // MediaKeySystemAccess for the ClearKey CDM, create and update a key
+      // session but playback will never start
+      // Safari bug: https://bugs.webkit.org/show_bug.cgi?id=231006
+      if (shaka.drm.DrmUtils.isClearKeySystem(keySystem) &&
+          shaka.util.Platform.isSafari()) {
+        return false;
+      }
+      // FairPlay is a proprietary DRM from Apple and will never work on
+      // Windows.
+      if (shaka.drm.DrmUtils.isFairPlayKeySystem(keySystem) &&
+          shaka.util.Platform.isWindows()) {
+        return false;
+      }
+      // PlayReady is a proprietary DRM from Microsoft and will never work on
+      // Apple platforms
+      if (shaka.drm.DrmUtils.isPlayReadyKeySystem(keySystem) &&
+          (shaka.util.Platform.isMac() || shaka.util.Platform.isApple())) {
+        return false;
+      }
+      // Mozilla has no intention of supporting PlayReady according to
+      // comments posted on Bugzilla.
+      if (shaka.drm.DrmUtils.isPlayReadyKeySystem(keySystem) &&
+          shaka.util.Platform.isFirefox()) {
+        return false;
+      }
+      // We are sure that WisePlay is not supported on Windows or macOS.
+      if (shaka.drm.DrmUtils.isWisePlayKeySystem(keySystem) &&
+          (shaka.util.Platform.isWindows() || shaka.util.Platform.isMac())) {
+        return false;
+      }
+      return true;
+    };
+
     // Test each key system and encryption scheme.
     const tests = [];
     for (const encryptionScheme of testEncryptionSchemes) {
       for (const keySystem of testKeySystems) {
-        // Our Polyfill will reject anything apart com.apple.fps key systems.
-        // It seems the Safari modern EME API will allow to request a
-        // MediaKeySystemAccess for the ClearKey CDM, create and update a key
-        // session but playback will never start
-        // Safari bug: https://bugs.webkit.org/show_bug.cgi?id=231006
-        if (keySystem === 'org.w3.clearkey' &&
-            shaka.util.Platform.isSafari()) {
+        if (!checkKeySystem(keySystem)) {
           continue;
         }
         tests.push(testSystemEme(keySystem, encryptionScheme, '', ''));
@@ -2006,6 +2112,9 @@ shaka.media.DrmEngine = class {
 
     for (const keySystem of testKeySystems) {
       for (const robustness of (testRobustness[keySystem] || [])) {
+        if (!checkKeySystem(keySystem)) {
+          continue;
+        }
         tests.push(testSystemEme(keySystem, null, robustness, ''));
         tests.push(testSystemEme(keySystem, null, '', robustness));
         tests.push(testSystemMcap(keySystem, null, robustness, ''));
@@ -2039,8 +2148,8 @@ shaka.media.DrmEngine = class {
   async closeSession_(session) {
     try {
       await shaka.util.Functional.promiseWithTimeout(
-          shaka.media.DrmEngine.CLOSE_TIMEOUT_,
-          Promise.all([session.close(), session.closed]));
+          shaka.drm.DrmEngine.CLOSE_TIMEOUT_,
+          Promise.all([session.close().catch(() => {}), session.closed]));
     } catch (e) {
       shaka.log.warning('Timeout waiting for session close');
     }
@@ -2085,7 +2194,7 @@ shaka.media.DrmEngine = class {
   /**
    * Concat the audio and video drmInfos in a variant.
    * @param {shaka.extern.Variant} variant
-   * @return {!Array.<!shaka.extern.DrmInfo>}
+   * @return {!Array<!shaka.extern.DrmInfo>}
    * @private
    */
   getVariantDrmInfos_(variant) {
@@ -2147,8 +2256,8 @@ shaka.media.DrmEngine = class {
    * Replace the drm info used in each variant in |variants| to reflect each
    * key service in |keySystems|.
    *
-   * @param {!Array.<shaka.extern.Variant>} variants
-   * @param {!Map.<string, string>} keySystems
+   * @param {!Array<shaka.extern.Variant>} variants
+   * @param {!Map<string, string>} keySystems
    * @private
    */
   static replaceDrmInfo_(variants, keySystems) {
@@ -2185,34 +2294,34 @@ shaka.media.DrmEngine = class {
    * engine.
    *
    * @param {string} keySystem
-   * @param {!Array.<shaka.extern.DrmInfo>} drmInfos
+   * @param {!Array<shaka.extern.DrmInfo>} drmInfos
    * @return {shaka.extern.DrmInfo}
    *
    * @private
    */
   createDrmInfoByInfos_(keySystem, drmInfos) {
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const encryptionSchemes = [];
 
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const licenseServers = [];
 
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const serverCertificateUris = [];
 
-    /** @type {!Array.<!Uint8Array>} */
+    /** @type {!Array<!Uint8Array>} */
     const serverCerts = [];
 
-    /** @type {!Array.<!shaka.extern.InitDataOverride>} */
+    /** @type {!Array<!shaka.extern.InitDataOverride>} */
     const initDatas = [];
 
-    /** @type {!Set.<string>} */
+    /** @type {!Set<string>} */
     const keyIds = new Set();
 
-    /** @type {!Set.<string>} */
+    /** @type {!Set<string>} */
     const keySystemUris = new Set();
 
-    shaka.media.DrmEngine.processDrmInfos_(
+    shaka.drm.DrmEngine.processDrmInfos_(
         drmInfos, encryptionSchemes, licenseServers, serverCerts,
         serverCertificateUris, initDatas, keyIds, keySystemUris);
 
@@ -2283,26 +2392,26 @@ shaka.media.DrmEngine = class {
    * @private
    */
   static createDrmInfoByConfigs_(keySystem, config) {
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const encryptionSchemes = [];
 
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const licenseServers = [];
 
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const serverCertificateUris = [];
 
-    /** @type {!Array.<!Uint8Array>} */
+    /** @type {!Array<!Uint8Array>} */
     const serverCerts = [];
 
-    /** @type {!Array.<!shaka.extern.InitDataOverride>} */
+    /** @type {!Array<!shaka.extern.InitDataOverride>} */
     const initDatas = [];
 
-    /** @type {!Set.<string>} */
+    /** @type {!Set<string>} */
     const keyIds = new Set();
 
     // TODO: refactor, don't stick drmInfos onto MediaKeySystemConfiguration
-    shaka.media.DrmEngine.processDrmInfos_(
+    shaka.drm.DrmEngine.processDrmInfos_(
         config['drmInfos'], encryptionSchemes, licenseServers, serverCerts,
         serverCertificateUris, initDatas, keyIds);
 
@@ -2353,21 +2462,23 @@ shaka.media.DrmEngine = class {
    * Extract license server, server cert, and init data from |drmInfos|, taking
    * care to eliminate duplicates.
    *
-   * @param {!Array.<shaka.extern.DrmInfo>} drmInfos
-   * @param {!Array.<string>} licenseServers
-   * @param {!Array.<string>} encryptionSchemes
-   * @param {!Array.<!Uint8Array>} serverCerts
-   * @param {!Array.<string>} serverCertificateUris
-   * @param {!Array.<!shaka.extern.InitDataOverride>} initDatas
-   * @param {!Set.<string>} keyIds
-   * @param {!Set.<string>} [keySystemUris]
+   * @param {!Array<shaka.extern.DrmInfo>} drmInfos
+   * @param {!Array<string>} encryptionSchemes
+   * @param {!Array<string>} licenseServers
+   * @param {!Array<!Uint8Array>} serverCerts
+   * @param {!Array<string>} serverCertificateUris
+   * @param {!Array<!shaka.extern.InitDataOverride>} initDatas
+   * @param {!Set<string>} keyIds
+   * @param {!Set<string>} [keySystemUris]
    * @private
    */
   static processDrmInfos_(
       drmInfos, encryptionSchemes, licenseServers, serverCerts,
       serverCertificateUris, initDatas, keyIds, keySystemUris) {
-    /** @type {function(shaka.extern.InitDataOverride,
-     *                  shaka.extern.InitDataOverride):boolean} */
+    /**
+     * @type {function(shaka.extern.InitDataOverride,
+     *                 shaka.extern.InitDataOverride):boolean}
+     */
     const initDataOverrideEqual = (a, b) => {
       if (a.keyId && a.keyId == b.keyId) {
         // Two initDatas with the same keyId are considered to be the same,
@@ -2461,10 +2572,10 @@ shaka.media.DrmEngine = class {
    * 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
+   * @param {!Map<string, string>} servers
+   * @param {!Map<string,
+   *               shaka.extern.AdvancedDrmConfiguration>} advancedConfigs
+   * @param {!Object<string, string>} keySystemsMapping
    * @private
    */
   static fillInDrmInfoDefaults_(drmInfo, servers, advancedConfigs,
@@ -2522,13 +2633,8 @@ shaka.media.DrmEngine = class {
             advancedConfig.persistentStateRequired;
       }
 
-      if (!drmInfo.videoRobustness) {
-        drmInfo.videoRobustness = advancedConfig.videoRobustness;
-      }
-
-      if (!drmInfo.audioRobustness) {
-        drmInfo.audioRobustness = advancedConfig.audioRobustness;
-      }
+      // robustness will be filled in with defaults, if needed, in
+      // expandRobustness
 
       if (!drmInfo.serverCertificate) {
         drmInfo.serverCertificate = advancedConfig.serverCertificate;
@@ -2597,6 +2703,31 @@ shaka.media.DrmEngine = class {
     this.newInitData('cenc', combinedData);
     return this.allSessionsLoaded_;
   }
+
+  /**
+   * Create a DrmInfo using configured clear keys and assign it to each variant.
+   * Only modify variants if clear keys have been set.
+   * @see https://bit.ly/2K8gOnv for the spec on the clearkey license format.
+   *
+   * @param {!Object<string, string>} configClearKeys
+   * @param {!Array<shaka.extern.Variant>} variants
+   */
+  static configureClearKey(configClearKeys, variants) {
+    const clearKeys = shaka.util.MapUtils.asMap(configClearKeys);
+    if (clearKeys.size == 0) {
+      return;
+    }
+    const clearKeyDrmInfo =
+        shaka.util.ManifestParserUtils.createDrmInfoFromClearKeys(clearKeys);
+    for (const variant of variants) {
+      if (variant.video) {
+        variant.video.drmInfos = [clearKeyDrmInfo];
+      }
+      if (variant.audio) {
+        variant.audio.drmInfos = [clearKeyDrmInfo];
+      }
+    }
+  }
 };
 
 
@@ -2630,14 +2761,14 @@ shaka.media.DrmEngine = class {
  *   call.  This is used to track the 'license-release' message when calling
  *   remove().
  */
-shaka.media.DrmEngine.SessionMetaData;
+shaka.drm.DrmEngine.SessionMetaData;
 
 
 /**
  * @typedef {{
  *   netEngine: !shaka.net.NetworkingEngine,
  *   onError: function(!shaka.util.Error),
- *   onKeyStatus: function(!Object.<string,string>),
+ *   onKeyStatus: function(!Object<string,string>),
  *   onExpirationUpdated: function(string,number),
  *   onEvent: function(!Event)
  * }}
@@ -2648,7 +2779,7 @@ shaka.media.DrmEngine.SessionMetaData;
  *   Called when an error occurs.  If the error is recoverable (see
  *   {@link shaka.util.Error}) then the caller may invoke either
  *   StreamingEngine.switch*() or StreamingEngine.seeked() to attempt recovery.
- * @property {function(!Object.<string,string>)} onKeyStatus
+ * @property {function(!Object<string,string>)} onKeyStatus
  *   Called when key status changes.  The argument is a map of hex key IDs to
  *   statuses.
  * @property {function(string,number)} onExpirationUpdated
@@ -2656,29 +2787,29 @@ shaka.media.DrmEngine.SessionMetaData;
  * @property {function(!Event)} onEvent
  *   Called when an event occurs that should be sent to the app.
  */
-shaka.media.DrmEngine.PlayerInterface;
+shaka.drm.DrmEngine.PlayerInterface;
 
 /**
  * @typedef {{
- *   kids: !Array.<string>,
+ *   kids: !Array<string>,
  *   type: string
  * }}
  *
- * @property {!Array.<string>} kids
+ * @property {!Array<string>} kids
  *   An array of key IDs. Each element of the array is the base64url encoding of
  *   the octet sequence containing the key ID value.
  * @property {string} type
  *   The requested MediaKeySessionType.
  * @see https://www.w3.org/TR/encrypted-media/#clear-key-request-format
  */
-shaka.media.DrmEngine.ClearKeyLicenceRequestFormat;
+shaka.drm.DrmEngine.ClearKeyLicenceRequestFormat;
 
 /**
  * The amount of time, in seconds, we wait to consider a session closed.
  * This allows us to work around Chrome bug https://crbug.com/1108158.
  * @private {number}
  */
-shaka.media.DrmEngine.CLOSE_TIMEOUT_ = 1;
+shaka.drm.DrmEngine.CLOSE_TIMEOUT_ = 1;
 
 
 /**
@@ -2687,7 +2818,7 @@ shaka.media.DrmEngine.CLOSE_TIMEOUT_ = 1;
  * without key statuses.
  * @private {number}
  */
-shaka.media.DrmEngine.SESSION_LOAD_TIMEOUT_ = 5;
+shaka.drm.DrmEngine.SESSION_LOAD_TIMEOUT_ = 5;
 
 
 /**
@@ -2695,4 +2826,4 @@ shaka.media.DrmEngine.SESSION_LOAD_TIMEOUT_ = 5;
  * This allows us to avoid multiple expiration events in most cases.
  * @type {number}
  */
-shaka.media.DrmEngine.KEY_STATUS_BATCH_TIME = 0.5;
+shaka.drm.DrmEngine.KEY_STATUS_BATCH_TIME = 0.5;