Merge pull request #1498 from canalplus/fix/firefox-workaround-v2

DRM: Don't work-around firefox issue if the application asked for specific capabilities
canalplus · Aug 13, 2024 · 3f8b756 · 3f8b756
2 parents e90c43a + 6bf41cd
commit 3f8b756
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/src/main_thread/decrypt/find_key_system.ts b/src/main_thread/decrypt/find_key_system.ts
@@ -275,6 +275,31 @@ function buildKeySystemConfigurations(
     sessionTypes,
   };
 
+  if (audioCapabilitiesConfig !== undefined) {
+    if (videoCapabilitiesConfig !== undefined) {
+      return [wantedMediaKeySystemConfiguration];
+    }
+    return [
+      wantedMediaKeySystemConfiguration,
+      {
+        ...wantedMediaKeySystemConfiguration,
+        // Re-try without `videoCapabilities` in case the EME implementation is
+        // buggy
+        videoCapabilities: undefined,
+      } as unknown as MediaKeySystemConfiguration,
+    ];
+  } else if (videoCapabilitiesConfig !== undefined) {
+    return [
+      wantedMediaKeySystemConfiguration,
+      {
+        ...wantedMediaKeySystemConfiguration,
+        // Re-try without `audioCapabilities` in case the EME implementation is
+        // buggy
+        audioCapabilities: undefined,
+      } as unknown as MediaKeySystemConfiguration,
+    ];
+  }
+
   return [
     wantedMediaKeySystemConfiguration,