fix: Allow by default variants without pssh in the manifest (#6144)

Fixes #5176
shaka-project · Jan 23, 2024 · e1cd031 · e1cd031
1 parent ee600c4
commit e1cd031
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/lib/media/drm_engine.js b/lib/media/drm_engine.js
@@ -542,6 +542,15 @@ shaka.media.DrmEngine = class {
     }
   }
 
+  /**
+   * Returns true if the manifest has init data.
+   *
+   * @return {boolean}
+   */
+  hasManifestInitData() {
+    return !!this.manifestInitData_;
+  }
+
   /**
    * Sets the server certificate based on the current DrmInfo.
    *

diff --git a/lib/player.js b/lib/player.js
@@ -6523,6 +6523,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const restrictedStatuses = shaka.Player.restrictedStatuses_;
     let tracksChanged = false;
 
+    goog.asserts.assert(this.drmEngine_, 'drmEngine should be non-null here.');
+
     // Only filter tracks for keys if we have some key statuses to look at.
     if (keyIds.length) {
       for (const variant of this.manifest_.variants) {
@@ -6538,8 +6540,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
             for (const keyId of stream.keyIds) {
               const keyStatus = keyStatusMap[isGlobalStatus ? '00' : keyId];
-              variant.allowedByKeySystem = variant.allowedByKeySystem &&
-                  !!keyStatus && !restrictedStatuses.includes(keyStatus);
+              if (keyStatus || this.drmEngine_.hasManifestInitData()) {
+                variant.allowedByKeySystem = variant.allowedByKeySystem &&
+                    !!keyStatus && !restrictedStatuses.includes(keyStatus);
+              }
             }
           }
 

diff --git a/test/test/util/fake_drm_engine.js b/test/test/util/fake_drm_engine.js
@@ -100,4 +100,11 @@ shaka.test.FakeDrmEngine = class {
     // Copy the values to break the reference to the input value.
     this.offlineSessions_ = sessions.map((s) => s);
   }
+
+  /**
+   * @override
+   */
+  hasManifestInitData() {
+    return true;
+  }
 };