Merge pull request #1611 from canalplus/fix/same-key-system-type-cache

Reuse cache even if key system type given in API is not the same
canalplus · Jan 7, 2025 · a117437 · a117437
2 parents 24b5958 + 8aec1c3
commit a117437
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main_thread/decrypt/__tests__/find_key_system.test.ts b/src/main_thread/decrypt/__tests__/find_key_system.test.ts
@@ -150,6 +150,7 @@ describe("find_key_systems - ", () => {
   it("should create a media key the first time and then reuse the previous one if it's the same configuration", async () => {
     requestMediaKeySystemAccessMock.mockImplementation(() => {
       return {
+        keySystem: "com.widevine.alpha",
         createMediaKeys: () => ({
           createSession: () => ({
             // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -200,6 +201,7 @@ describe("find_key_systems - ", () => {
   it("should create a media key the first time and then create another one if the previous is not compatible.", async () => {
     requestMediaKeySystemAccessMock.mockImplementation(() => {
       return {
+        keySystem: "com.widevine.alpha",
         createMediaKeys: () => ({
           createSession: () => ({
             // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -258,6 +260,7 @@ describe("find_key_systems - ", () => {
   it("should create a media key the first time and then reuse the previous one if it's a different configuration but it's a compatible configuration.", async () => {
     requestMediaKeySystemAccessMock.mockImplementation(() => {
       return {
+        keySystem: "com.widevine.alpha",
         createMediaKeys: () => ({
           createSession: () => ({
             // eslint-disable-next-line @typescript-eslint/no-empty-function

diff --git a/src/main_thread/decrypt/find_key_system.ts b/src/main_thread/decrypt/find_key_system.ts
@@ -478,7 +478,7 @@ export default function getMediaKeySystemAccess(
         currentState !== null &&
         !shouldRenewMediaKeySystemAccess() &&
         // TODO: Do it with MediaKeySystemAccess.prototype.keySystem instead?
-        keyType === currentState.keySystemOptions.type &&
+        keyType === currentState.mediaKeySystemAccess.keySystem &&
         eme.implementation === currentState.emeImplementation.implementation &&
         isNewMediaKeySystemConfigurationCompatibleWithPreviousOne(
           keySystemConfiguration,