fix: Re-add initDataTransform config

Some FairPlay providers still need this part, so we should never have removed it. The default is to do no transformation.
shaka-project · May 17, 2022 · 442a270 · 442a270
1 parent 80e81f1
commit 442a270
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git a/externs/shaka/player.js b/externs/shaka/player.js
@@ -618,6 +618,9 @@ 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>
@@ -641,6 +644,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.

diff --git a/lib/media/drm_engine.js b/lib/media/drm_engine.js
@@ -1253,6 +1253,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);
@@ -1287,6 +1303,16 @@ shaka.media.DrmEngine = class {
     });
   }
 
+  /**
+   * @param {!Uint8Array} initData
+   * @param {string} initDataType
+   * @param {?shaka.extern.DrmInfo} drmInfo
+   * @return {!Uint8Array}
+   */
+  static defaultInitDataTransform(initData, initDataType, drmInfo) {
+    return initData;
+  }
+
   /**
    * @param {!MediaKeyMessageEvent} event
    * @private

diff --git a/lib/util/player_configuration.js b/lib/util/player_configuration.js
@@ -9,6 +9,7 @@ goog.provide('shaka.util.PlayerConfiguration');
 goog.require('goog.asserts');
 goog.require('shaka.abr.SimpleAbrManager');
 goog.require('shaka.log');
+goog.require('shaka.media.DrmEngine');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ConfigUtils');
 goog.require('shaka.util.LanguageUtils');
@@ -74,6 +75,7 @@ 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: shaka.media.DrmEngine.defaultInitDataTransform,
       logLicenseExchange: false,
       updateExpirationTime: 1,
       preferredKeySystems: [],