fix: Correct default initDataTransform for legacy Apple Media Keys (s…

…haka-project#4797)
theodab · Dec 7, 2022 · 67a5d56 · 67a5d56
1 parent b491a6b
commit 67a5d56
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/build/types/core b/build/types/core
@@ -72,6 +72,7 @@
 +../../lib/util/ebml_parser.js
 +../../lib/util/error.js
 +../../lib/util/event_manager.js
++../../lib/util/fairplay_utils.js
 +../../lib/util/fake_event.js
 +../../lib/util/fake_event_target.js
 +../../lib/util/functional.js

diff --git a/build/types/fairplay b/build/types/fairplay
@@ -1,4 +1,3 @@
 # FairPlay
 
-+../../lib/polyfill/patchedmediakeys_apple.js
-+../../lib/util/fairplay_utils.js
++../../lib/polyfill/patchedmediakeys_apple.js
diff --git a/lib/util/player_configuration.js b/lib/util/player_configuration.js
@@ -12,6 +12,7 @@ goog.require('shaka.config.AutoShowText');
 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');
@@ -68,9 +69,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,