feat: Add config to ignore duplicate init data (shaka-project#5853)

Closes shaka-project#4572
Robloche · Nov 30, 2023 · 9ca6b80 · 9ca6b80
1 parent 1d68185
commit 9ca6b80
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/demo/config.js b/demo/config.js
@@ -128,7 +128,9 @@ shakaDemo.Config = class {
             /* canBeUnset= */ true)
         .addBoolInput_('Parse inband "pssh" from media segments',
             'drm.parseInbandPsshEnabled')
-        .addTextInput_('Min HDCP version', 'drm.minHdcpVersion');
+        .addTextInput_('Min HDCP version', 'drm.minHdcpVersion')
+        .addBoolInput_('Ignore duplicate init data',
+            'drm.ignoreDuplicateInitData');
     const advanced = shakaDemoMain.getConfiguration().drm.advanced || {};
     const addDRMAdvancedField = (name, valueName, suggestions) => {
       // All advanced fields of a given type are set at once.

diff --git a/externs/shaka/player.js b/externs/shaka/player.js
@@ -757,7 +757,8 @@ shaka.extern.PersistentSessionMetadata;
  *   preferredKeySystems: !Array.<string>,
  *   keySystemsMapping: !Object.<string, string>,
  *   parseInbandPsshEnabled: boolean,
- *   minHdcpVersion: string
+ *   minHdcpVersion: string,
+ *   ignoreDuplicateInitData: boolean
  * }}
  *
  * @property {shaka.extern.RetryParameters} retryParameters
@@ -813,7 +814,12 @@ shaka.extern.PersistentSessionMetadata;
  *   <i>By default (''), do not check the HDCP version.</i><br>
  *   Indicates the minimum version of HDCP to start the playback of encrypted
  *   streams. <b>May be ignored if not supported by the device.</b>
- *
+ * @property {boolean} ignoreDuplicateInitData
+ *   <i>Defaults to false on Tizen 2, and true for all other browsers.</i><br>
+ *   When true indicate that the player doesn't ignore duplicate init data.
+ *   Note: Tizen 2015 and 2016 models will send multiple webkitneedkey events
+ *   with the same init data. If the duplicates are supressed, playback
+ *   will stall without errors.
  * @exportDoc
  */
 shaka.extern.DrmConfiguration;

diff --git a/lib/media/drm_engine.js b/lib/media/drm_engine.js
@@ -715,11 +715,8 @@ shaka.media.DrmEngine = class {
 
     const metadatas = this.activeSessions_.values();
     for (const metadata of metadatas) {
-      // Tizen 2015 and 2016 models will send multiple webkitneedkey events
-      // with the same init data. If the duplicates are supressed, playback
-      // will stall without errors.
       if (shaka.util.BufferUtils.equal(initData, metadata.initData) &&
-          !shaka.util.Platform.isTizen2()) {
+          this.config_.ignoreDuplicateInitData) {
         shaka.log.debug('Ignoring duplicate init data.');
         return;
       }

diff --git a/lib/util/player_configuration.js b/lib/util/player_configuration.js
@@ -91,6 +91,7 @@ shaka.util.PlayerConfiguration = class {
       // segments to detect key changes.
       parseInbandPsshEnabled: shaka.util.Platform.isXboxOne(),
       minHdcpVersion: '',
+      ignoreDuplicateInitData: !shaka.util.Platform.isTizen2(),
     };
 
     const manifest = {