Key system priority (Dash-Industry-Forum#3107)

* Add priorityIndex field in ProtectionData * Reorder key systems according to priority index provided for each key system in input protection data * rename priorityIndex by priority * rename priorityIndex by priority * Reorder key systems according to priority index provided for each key system in input protection data
Orange-OpenSource · Mar 31, 2020 · 4adafb4 · 4adafb4
1 parent 20a8fe9
commit 4adafb4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -834,6 +834,9 @@ declare namespace dashjs {
          * Corresponding property values are keys, base64-encoded (no padding).
          */
         clearkeys?: { [key: string]: string };
+
+        /** Priority level of the key system to be selected (0 is the highest prority, -1 for undefined priority) */
+        priority?: number = -1;
     }
 
     export interface KeySystem {

diff --git a/src/streaming/protection/controllers/ProtectionController.js b/src/streaming/protection/controllers/ProtectionController.js
@@ -392,6 +392,13 @@ function ProtectionController(config) {
         const self = this;
         const requestedKeySystems = [];
 
+        // Reorder key systems according to priority order provided in protectionData
+        supportedKS = supportedKS.sort((ksA, ksB) => {
+            let indexA = (protDataSet && protDataSet[ksA.ks.systemString] && protDataSet[ksA.ks.systemString].priority >= 0) ? protDataSet[ksA.ks.systemString].priority : supportedKS.length;
+            let indexB = (protDataSet && protDataSet[ksB.ks.systemString] && protDataSet[ksB.ks.systemString].priority >= 0) ? protDataSet[ksB.ks.systemString].priority : supportedKS.length;
+            return indexA - indexB;
+        });
+
         let ksIdx;
         if (keySystem) {
             // We have a key system