From f441f7a7d2960c2de5e6bb0bc61c7c69c5d0dcdd Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Mon, 31 May 2021 13:25:38 +0200
Subject: [PATCH 01/12] Initial commit, changed DRM selection, added Clearkey,
 added manual HTTP-Header

---
 package-lock.json                            | 391 +++++++++----------
 package.json                                 |   2 +-
 samples/dash-if-reference-player/app/main.js | 132 ++++++-
 samples/dash-if-reference-player/index.html  |  50 ++-
 4 files changed, 372 insertions(+), 203 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 06a9cf7816..a5a8619a3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -396,28 +396,28 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
-          "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+          "version": "4.16.6",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001181",
-            "colorette": "^1.2.1",
-            "electron-to-chromium": "^1.3.649",
+            "caniuse-lite": "^1.0.30001219",
+            "colorette": "^1.2.2",
+            "electron-to-chromium": "^1.3.723",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.70"
+            "node-releases": "^1.1.71"
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001204",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz",
-          "integrity": "sha512-JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ==",
+          "version": "1.0.30001231",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001231.tgz",
+          "integrity": "sha512-WAFFv31GgU4DiwNAy77qMo3nNyycEhH3ikcCVHvkQpPe/fO8Tb2aRYzss8kgyLQBm8mJ7OryW4X6Y4vsBCIqag==",
           "dev": true
         },
         "electron-to-chromium": {
-          "version": "1.3.702",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.702.tgz",
-          "integrity": "sha512-qJVUKFWQnF6wP7MmTngDkmm8/KPzaiTXNFOAg5j7DSa6J7kPou7mTBqC8jpUOxauQWwHR3pn4dMRdV8IE1xdtA==",
+          "version": "1.3.742",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz",
+          "integrity": "sha512-ihL14knI9FikJmH2XUIDdZFWJxvr14rPSdOhJ7PpS27xbz8qmaRwCwyg/bmFwjWKmWK9QyamiCZVCvXm5CH//Q==",
           "dev": true
         },
         "escalade": {
@@ -3246,9 +3246,9 @@
           "dev": true
         },
         "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         },
         "ms": {
@@ -3271,9 +3271,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         },
         "to-fast-properties": {
@@ -3457,9 +3457,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         }
       }
@@ -3471,24 +3471,13 @@
       "dev": true
     },
     "@theintern/common": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@theintern/common/-/common-0.2.3.tgz",
-      "integrity": "sha512-91kL3C6USiNfumAm5m07HjGdc40IJaNzEczhcdW5T8fjsHVNg8ttVSXCzy5C9BM57WLevVjR5eHUNjEl4foGMQ==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@theintern/common/-/common-0.2.4.tgz",
+      "integrity": "sha512-zq1Z/yZp9w6EHcLR+kn2cQ0Iu0/6G9e92Q74GOWGs4ITk07n9D1FQC5MK90nrtbkCt+EUue6QoIl9RUWY3BTCg==",
       "dev": true,
       "requires": {
-        "axios": "~0.19.0",
+        "axios": "~0.21.1",
         "tslib": "~1.9.3"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.19.2",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-          "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
-          "dev": true,
-          "requires": {
-            "follow-redirects": "1.5.10"
-          }
-        }
       }
     },
     "@theintern/digdug": {
@@ -3504,9 +3493,9 @@
       }
     },
     "@theintern/leadfoot": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@theintern/leadfoot/-/leadfoot-2.3.2.tgz",
-      "integrity": "sha512-NskDofysJMJad5uEYUc7Y3AlP3IdhY3t+H6XyiTDPur/p4pzVvKGGoCygE5FsN/K26i0XOmhNEIOwJtOMh47Hg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@theintern/leadfoot/-/leadfoot-2.3.3.tgz",
+      "integrity": "sha512-zn7MeYk8G3PIXFVSk7PjyTxllnWCe8vE4dcyHPmlrdunYByI8PF6AaDzK70whoBSkE+LkcxrsUslquHRNsWRCA==",
       "dev": true,
       "requires": {
         "@theintern/common": "~0.2.3",
@@ -3970,9 +3959,9 @@
       }
     },
     "acorn": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
       "dev": true
     },
     "acorn-jsx": {
@@ -4304,6 +4293,23 @@
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
       "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
+    "axios": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "dev": true,
+      "requires": {
+        "follow-redirects": "^1.10.0"
+      },
+      "dependencies": {
+        "follow-redirects": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+          "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+          "dev": true
+        }
+      }
+    },
     "babel": {
       "version": "5.8.38",
       "resolved": "https://registry.npmjs.org/babel/-/babel-5.8.38.tgz",
@@ -4416,6 +4422,15 @@
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
           "dev": true
+        },
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.0.0"
+          }
         }
       }
     },
@@ -5360,8 +5375,7 @@
         },
         "kind-of": {
           "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "resolved": "",
           "dev": true
         }
       }
@@ -5861,20 +5875,12 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "catharsis": {
-      "version": "0.8.11",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz",
-      "integrity": "sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
+      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.14"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
+        "lodash": "^4.17.15"
       }
     },
     "center-align": {
@@ -6318,28 +6324,28 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
-          "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+          "version": "4.16.6",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001181",
-            "colorette": "^1.2.1",
-            "electron-to-chromium": "^1.3.649",
+            "caniuse-lite": "^1.0.30001219",
+            "colorette": "^1.2.2",
+            "electron-to-chromium": "^1.3.723",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.70"
+            "node-releases": "^1.1.71"
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001205",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz",
-          "integrity": "sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og==",
+          "version": "1.0.30001231",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001231.tgz",
+          "integrity": "sha512-WAFFv31GgU4DiwNAy77qMo3nNyycEhH3ikcCVHvkQpPe/fO8Tb2aRYzss8kgyLQBm8mJ7OryW4X6Y4vsBCIqag==",
           "dev": true
         },
         "electron-to-chromium": {
-          "version": "1.3.704",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.704.tgz",
-          "integrity": "sha512-6cz0jvawlUe4h5AbfQWxPzb+8LzVyswGAWiGc32EJEmfj39HTQyNPkLXirc7+L4x5I6RgRkzua8Ryu5QZqc8cA==",
+          "version": "1.3.742",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz",
+          "integrity": "sha512-ihL14knI9FikJmH2XUIDdZFWJxvr14rPSdOhJ7PpS27xbz8qmaRwCwyg/bmFwjWKmWK9QyamiCZVCvXm5CH//Q==",
           "dev": true
         },
         "escalade": {
@@ -6687,9 +6693,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -6867,9 +6873,9 @@
       "dev": true
     },
     "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
       "dev": true,
       "requires": {
         "ip": "^1.1.0",
@@ -6986,18 +6992,32 @@
       "dev": true
     },
     "elliptic": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
-      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+          "dev": true
+        }
       }
     },
     "emoji-regex": {
@@ -9221,9 +9241,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         },
         "mime-db": {
@@ -10023,25 +10043,25 @@
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "jsdoc": {
-      "version": "3.6.6",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz",
-      "integrity": "sha512-znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ==",
+      "version": "3.6.7",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz",
+      "integrity": "sha512-sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.9.4",
         "bluebird": "^3.7.2",
-        "catharsis": "^0.8.11",
+        "catharsis": "^0.9.0",
         "escape-string-regexp": "^2.0.0",
         "js2xmlparser": "^4.0.1",
         "klaw": "^3.0.0",
         "markdown-it": "^10.0.0",
         "markdown-it-anchor": "^5.2.7",
-        "marked": "^0.8.2",
+        "marked": "^2.0.3",
         "mkdirp": "^1.0.4",
         "requizzle": "^0.2.3",
         "strip-json-comments": "^3.1.0",
         "taffydb": "2.6.2",
-        "underscore": "~1.10.2"
+        "underscore": "~1.13.1"
       },
       "dependencies": {
         "bluebird": {
@@ -10061,18 +10081,6 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
           "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
           "dev": true
-        },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-          "dev": true
-        },
-        "underscore": {
-          "version": "1.10.2",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
-          "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==",
-          "dev": true
         }
       }
     },
@@ -10359,9 +10367,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.clonedeep": {
       "version": "4.5.0",
@@ -10400,9 +10408,9 @@
       "dev": true
     },
     "lodash.mergewith": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
       "dev": true
     },
     "lodash.sortby": {
@@ -10524,9 +10532,9 @@
       "dev": true
     },
     "marked": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz",
-      "integrity": "sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.6.tgz",
+      "integrity": "sha512-S2mYj0FzTQa0dLddssqwRVW4EOJOVJ355Xm2Vcbm+LU7GQRGWvwbO5K87OaPSOux2AwTSgtPPaXmc8sDPrhn2A==",
       "dev": true
     },
     "math-random": {
@@ -10649,18 +10657,18 @@
       "dev": true
     },
     "minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "requires": {
-        "brace-expansion": "^1.0.0"
+        "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "mississippi": {
@@ -10682,9 +10690,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -10703,20 +10711,12 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "dev": true,
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
+        "minimist": "^1.2.5"
       }
     },
     "mocha": {
@@ -10784,6 +10784,21 @@
             "sigmund": "~1.0.0"
           }
         },
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
         "ms": {
           "version": "0.7.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
@@ -10919,9 +10934,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -11875,9 +11890,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -12184,9 +12199,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         },
         "micromatch": {
@@ -12607,9 +12622,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         },
         "request-promise-core": {
@@ -12648,14 +12663,6 @@
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
       }
     },
     "resolve": {
@@ -12935,9 +12942,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -13229,8 +13236,7 @@
         },
         "kind-of": {
           "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "resolved": "",
           "dev": true
         }
       }
@@ -13556,9 +13562,9 @@
       }
     },
     "ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
       "dev": true,
       "requires": {
         "figgy-pudding": "^3.5.1"
@@ -13759,6 +13765,12 @@
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true
     },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -14227,6 +14239,12 @@
         "through": "^2.3.8"
       }
     },
+    "underscore": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
+      "dev": true
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -14256,38 +14274,15 @@
       "dev": true
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "unique-filename": {
@@ -16346,9 +16341,9 @@
       }
     },
     "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
     "whatwg-encoding": {
@@ -16582,9 +16577,9 @@
           }
         },
         "y18n": {
-          "version": "5.0.2",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.2.tgz",
-          "integrity": "sha512-CkwaeZw6dQgqgPGeTWKMXCRmMcBgETFlTml1+ZOO+q7kGst8NREJ+eWwFNPVUQ4QGdAaklbqCZHH6Zuep1RjiA==",
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
           "dev": true
         },
         "yargs-parser": {
diff --git a/package.json b/package.json
index dbcf2effab..ec7265d4b6 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "ink-docstrap": "^1.3.2",
     "intern": "4.8.7",
     "istanbul": "^0.4.5",
-    "jsdoc": "^3.6.2",
+    "jsdoc": "^3.6.7",
     "jsdom": "^13.2.0",
     "mocha": "^2.3.4",
     "replace-in-file": "^6.2.0",
diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index 169e911988..26fca6c938 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -177,9 +177,65 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     $scope.mediaSettingsCacheEnabled = true;
     $scope.metricsTimer = null;
     $scope.updateMetricsInterval = 1000;
-    $scope.drmKeySystems = ['com.widevine.alpha', 'com.microsoft.playready'];
+    $scope.drmKeySystems = ['com.widevine.alpha', 'com.microsoft.playready', 'org.w3.clearkey'];
     $scope.drmKeySystem = '';
     $scope.drmLicenseURL = '';
+    $scope.drmRequestHeader = '';
+
+
+    //Default DRM-Headers
+    $scope.defaultRequestHeaderPlayready = 
+    'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4Iiw'
+    + 'ibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1I'
+    + 'iwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJ'
+    + 'lbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY'
+    + '3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnl'
+    + 'wdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0Z'
+    + 'WRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9'
+    + 'rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tle'
+    + 'SI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5Ijo'
+    + 'iL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6d'
+    + 'TZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to'
+
+    $scope.defaultRequestHeaderWidevine =
+    'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4Iiw'
+    + 'ibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImZpcnN0X3BsYXlfZXhwaXJhdGlvbiI6NjAsInBsYXlyZWFkeSI6eyJyZWFsX3RpbWVfZ'
+    + 'XhwaXJhdGlvbiI6dHJ1ZX0sImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09'
+    + 'qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.FAbIiPxX8BHi9RwfzD7Yn-wugU19ghrkBFKsaCPrZmU'
+
+    //Default DRM KID and KEY.
+    $scope.defaultKidClearkey = 'nrQFDeRLSAKTLifXUIPiZg'
+
+    $scope.defaultKeyClearkey = 'FmY0xnWCPCNaSpRG-tUuTQ'
+
+
+    $scope.drmPlayready = {
+        isActive: false,
+        drmKeySystem: 'com.microsoft.playready',
+        licenseServerUrl: 'https://drm-playready-licensing.axtest.net/AcquireLicense',
+        httpRequestHeader: $scope.defaultRequestHeaderPlayready,
+        priority: 1
+    }
+
+    $scope.drmWidevine = {
+        isActive: false,
+        drmKeySystem: 'com.widevine.alphay',
+        licenseServerUrl: 'https://drm-widevine-licensing.axtest.net/AcquireLicense',
+        httpRequestHeader: $scope.defaultRequestHeaderWidevine,
+        priority: 0
+    }
+
+    $scope.drmClearkey = {
+        isActive: false,
+        drmKeySystem: 'org.w3.clearkey',
+        licenseServerUrl: '',
+        httpRequestHeader: '',
+        kid: $scope.defaultKidClearkey,
+        key: $scope.defaultKeyClearkey,
+        inputMode: false,
+        priority: 2
+      }
+    
 
     $scope.isDynamic = false;
 
@@ -836,6 +892,80 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         $scope.drmKeySystem = item;
     };
 
+    /** Handle form input */
+    $scope.setDrm = function (){
+        console.log(this.drmPlayready, this.drmWidevine, this.drmClearkey);
+
+        let drmInputs = [this.drmPlayready, this.drmWidevine, this.drmClearkey];
+        let protectionData = [];
+
+        for(let input of drmInputs){
+            if(input.isActive){
+
+                // Check if the provided DRM is Clearkey and whether KID=KEY or LicenseServer + Header is selected; Default is KID=KEY
+               if(input.hasOwnProperty('inputMode') && input.inputMode === false){
+                  // Check if priority is enabled
+                  if(this.prioritiesEnabled){
+                    protectionData.push({
+                      [input.drmKeySystem]: {
+                        "clearkeys": {
+                          [input.kid]: input.key
+                        },
+                        "priority": input.priority
+                      }    
+                    });
+                  }
+                  else{
+                    protectionData.push({
+                      [input.drmKeySystem]: {
+                        "clearkeys": {
+                          [input.kid]: input.key
+                        }
+                      }
+                    })
+                  }
+                  
+                }
+      
+                else{
+                  // Validate URL. If the provided information is not a valid url, the DRM is skipped.
+                  if(this.isValidURL(input.licenseServerUrl)){
+                    if(this.prioritiesEnabled){
+                      protectionData.push({
+                        [input.drmKeySystem]: {
+                          "serverURL": input.licenseServerUrl,
+                          "httpRequestHeaders": input.httpRequestHeader,
+                          "priority": input.priority
+                        }    
+                      }); 
+                    }
+                    else
+                    protectionData.push({
+                      [input.drmKeySystem]: {
+                        "serverURL": input.licenseServerUrl,
+                        "httpRequestHeaders": input.httpRequestHeader
+                      }    
+                    }); 
+                  }
+                  else {
+                    console.log(input.licenseServerUrl, "is not a valid url!")
+                  }
+      
+                }
+            }
+        }
+        console.log(protectionData);
+        $scope.player.setProtectionData(protectionData);
+        //$scope.player.doLoad();
+        console.log($scope.player.getProtectionController());
+    }
+
+    $scope.isValidURL = function (str) {
+        let res = str.match(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g);
+        return (res !== null)
+      };
+    
+
     // from: https://gist.github.com/siongui/4969449
     $scope.safeApply = function (fn) {
         var phase = this.$root.$$phase;
diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index 802fca9b58..47d7756e19 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -324,7 +324,49 @@
         <div class="options-item">
             <div class="options-item-title">DRM Options</div>
             <div class="options-item-body">
-                <div class="dropdown" data-toggle="tooltip" data-placement="left"
+            <form>
+                <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
+                       title="">
+                    <input type="checkbox" ng-model="drmPlayreadyChecked" ng-change="drmPlayready.isActive = drmPlayreadyChecked">
+                    Playready
+                </label>
+
+                <div id="drmPlayreadyLicenseForm" ng-show="drmPlayreadyChecked === true">
+                    <label class="options-label">License URL:</label>
+                    <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.licenseServerUrl">
+                    <label class="options-label">HTTP Request Header:</label>
+                    <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.httpRequestHeader">
+                </div>
+
+                <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
+                       title="">
+                    <input type="checkbox" ng-model="drmWidevineChecked" ng-change="drmWidevine.isActive = drmWidevineChecked">
+                    Widevine
+                </label>
+
+                <div id="drmWidevineLicenseForm" ng-show="drmWidevineChecked === true">
+                    <label class="options-label">License URL:</label>
+                    <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.licenseServerUrl">
+                    <label class="options-label">HTTP Request Header:</label>
+                    <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.httpRequestHeader">
+                </div>
+
+                <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
+                       title="">
+                    <input type="checkbox" ng-model="drmClearkeyChecked" ng-change="drmClearkey.isActive = drmClearkeyChecked">
+                    Clearkey
+                </label>
+
+                <div id="drmClearkeyLicenseForm" ng-show="drmClearkeyChecked === true">
+                    <label class="options-label">Kid:</label>
+                    <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.kid">
+                    <label class="options-label">Key:</label>
+                    <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.key">
+                </div>
+
+                <input type="submit" class="btn btn-primary" ng-click="setDrm()" value="Submit"\>
+            </form>
+                <!-- <div class="dropdown" data-toggle="tooltip" data-placement="left"
                      title="Please select a DRM Key System">
                     <button class="btn btn-primary dropdown-toggle" type="button" id="menu1" data-toggle="dropdown">DRM
                         KeySystem
@@ -338,8 +380,10 @@
                 <div id="drmLicenseForm" ng-show="drmKeySystem">
                     <label class="options-label">License URL:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmLicenseURL">
-                </div>
-            </div>
+                    <label class="options-label">HTTP Request Header:</label>
+                    <input type="text" class="form-control" placeholder="" ng-model="drmRequestHeader">
+                </div>-->
+            </div> 
         </div>
         <div class="options-item">
             <div class="options-item-title">Initial Settings</div>

From cbc764ddb1e095765557462dc4d96e835a9225b8 Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Mon, 31 May 2021 18:25:52 +0200
Subject: [PATCH 02/12] Added priority-selection

---
 .../dash-if-reference-player/app/css/main.css |   8 +-
 samples/dash-if-reference-player/app/main.js  | 102 ++++++++----------
 .../dashjs_config.json                        |   2 +-
 samples/dash-if-reference-player/index.html   |  38 ++++++-
 4 files changed, 84 insertions(+), 66 deletions(-)

diff --git a/samples/dash-if-reference-player/app/css/main.css b/samples/dash-if-reference-player/app/css/main.css
index 1a7b2fd773..59b4e8ea51 100644
--- a/samples/dash-if-reference-player/app/css/main.css
+++ b/samples/dash-if-reference-player/app/css/main.css
@@ -4,7 +4,7 @@ body {
     overflow-x: hidden;
 }
 
-label input {
+label input select {
     display: inline;
 }
 
@@ -95,14 +95,16 @@ a:hover {
 }
 
 .options-item-body input,
-.options-item-body label {
+.options-item-body label,
+.options-item-body select {
     cursor: pointer;
     clear: both;
     float: left;
     margin-bottom: 2px !important;
 }
 
-.options-item-body input {
+.options-item-body input,
+.options-item-body select {
     margin-right: 5px;
 }
 
diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index 26fca6c938..30d984f45b 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -182,46 +182,23 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     $scope.drmLicenseURL = '';
     $scope.drmRequestHeader = '';
 
-
-    //Default DRM-Headers
-    $scope.defaultRequestHeaderPlayready = 
-    'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4Iiw'
-    + 'ibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiMDg3Mjc4NmUtZjllNy00NjVmLWEzYTItNGU1YjBlZjhmYTQ1I'
-    + 'iwiZW5jcnlwdGVkX2tleSI6IlB3NitlRVlOY3ZqWWJmc2gzWDNmbWc9PSJ9LHsiaWQiOiJjMTRmMDcwOS1mMmI5LTQ0MjctOTE2Yi02MWI1MjU4NjUwNmEiLCJ'
-    + 'lbmNyeXB0ZWRfa2V5IjoiLzErZk5paDM4bXFSdjR5Y1l6bnQvdz09In0seyJpZCI6IjhiMDI5ZTUxLWQ1NmEtNDRiZC05MTBmLWQ0YjVmZDkwZmJhMiIsImVuY'
-    + '3J5cHRlZF9rZXkiOiJrcTBKdVpFanBGTjhzYVRtdDU2ME9nPT0ifSx7ImlkIjoiMmQ2ZTkzODctNjBjYS00MTQ1LWFlYzItYzQwODM3YjRiMDI2IiwiZW5jcnl'
-    + 'wdGVkX2tleSI6IlRjUlFlQld4RW9IT0tIcmFkNFNlVlE9PSJ9LHsiaWQiOiJkZTAyZjA3Zi1hMDk4LTRlZTAtYjU1Ni05MDdjMGQxN2ZiYmMiLCJlbmNyeXB0Z'
-    + 'WRfa2V5IjoicG9lbmNTN0dnbWVHRmVvSjZQRUFUUT09In0seyJpZCI6IjkxNGU2OWY0LTBhYjMtNDUzNC05ZTlmLTk4NTM2MTVlMjZmNiIsImVuY3J5cHRlZF9'
-    + 'rZXkiOiJlaUkvTXNsbHJRNHdDbFJUL0xObUNBPT0ifSx7ImlkIjoiZGE0NDQ1YzItZGI1ZS00OGVmLWIwOTYtM2VmMzQ3YjE2YzdmIiwiZW5jcnlwdGVkX2tle'
-    + 'SI6IjJ3K3pkdnFycERWM3hSMGJKeTR1Z3c9PSJ9LHsiaWQiOiIyOWYwNWU4Zi1hMWFlLTQ2ZTQtODBlOS0yMmRjZDQ0Y2Q3YTEiLCJlbmNyeXB0ZWRfa2V5Ijo'
-    + 'iL3hsU0hweHdxdTNnby9nbHBtU2dhUT09In0seyJpZCI6IjY5ZmU3MDc3LWRhZGQtNGI1NS05NmNkLWMzZWRiMzk5MTg1MyIsImVuY3J5cHRlZF9rZXkiOiJ6d'
-    + 'TZpdXpOMnBzaTBaU3hRaUFUa1JRPT0ifV19fQ.BXr93Et1krYMVs-CUnf7F3ywJWFRtxYdkR7Qn4w3-to'
-
-    $scope.defaultRequestHeaderWidevine =
-    'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lkIjoiYjMzNjRlYjUtNTFmNi00YWUzLThjOTgtMzNjZWQ1ZTMxYzc4Iiw'
-    + 'ibWVzc2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImZpcnN0X3BsYXlfZXhwaXJhdGlvbiI6NjAsInBsYXlyZWFkeSI6eyJyZWFsX3RpbWVfZ'
-    + 'XhwaXJhdGlvbiI6dHJ1ZX0sImtleXMiOlt7ImlkIjoiOWViNDA1MGQtZTQ0Yi00ODAyLTkzMmUtMjdkNzUwODNlMjY2IiwiZW5jcnlwdGVkX2tleSI6ImxLM09'
-    + 'qSExZVzI0Y3Iya3RSNzRmbnc9PSJ9XX19.FAbIiPxX8BHi9RwfzD7Yn-wugU19ghrkBFKsaCPrZmU'
-
-    //Default DRM KID and KEY.
-    $scope.defaultKidClearkey = 'nrQFDeRLSAKTLifXUIPiZg'
-
-    $scope.defaultKeyClearkey = 'FmY0xnWCPCNaSpRG-tUuTQ'
-
+    
+    $scope.protectionData = {};
+    $scope.prioritiesEnabled = false;
 
     $scope.drmPlayready = {
         isActive: false,
         drmKeySystem: 'com.microsoft.playready',
         licenseServerUrl: 'https://drm-playready-licensing.axtest.net/AcquireLicense',
-        httpRequestHeader: $scope.defaultRequestHeaderPlayready,
+        httpRequestHeader: '',
         priority: 1
     }
 
     $scope.drmWidevine = {
         isActive: false,
-        drmKeySystem: 'com.widevine.alphay',
+        drmKeySystem: 'com.widevine.alpha',
         licenseServerUrl: 'https://drm-widevine-licensing.axtest.net/AcquireLicense',
-        httpRequestHeader: $scope.defaultRequestHeaderWidevine,
+        httpRequestHeader: '',
         priority: 0
     }
 
@@ -230,8 +207,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         drmKeySystem: 'org.w3.clearkey',
         licenseServerUrl: '',
         httpRequestHeader: '',
-        kid: $scope.defaultKidClearkey,
-        key: $scope.defaultKeyClearkey,
+        kid: '',
+        key: '',
         inputMode: false,
         priority: 2
       }
@@ -694,16 +671,24 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     $scope.doLoad = function () {
         $scope.initSession();
 
+        $scope.setDrm();
+
         var protData = {};
         if ($scope.selectedItem.hasOwnProperty('protData')) {
             protData = $scope.selectedItem.protData;
-        } else if ($scope.drmLicenseURL !== '' && $scope.drmKeySystem !== '') {
+        }
+        else if ($scope.protectionData !== {}) {
+            protData = $scope.protectionData;
+        }
+        else if ($scope.drmLicenseURL !== '' && $scope.drmKeySystem !== '') {
             protData[$scope.drmKeySystem] = {
                 serverURL: $scope.drmLicenseURL
             };
         } else {
             protData = null;
         }
+        console.log($scope.selectedItem)
+        console.log(protData)
 
         // Check if persistent license session ID is stored for current stream
         var sessionId = $scope.persistentSessionId[$scope.selectedItem.url];
@@ -892,12 +877,16 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         $scope.drmKeySystem = item;
     };
 
+    $scope.doLog = function (){
+        console.log($scope.drmPlayready.priority);
+    }
+
     /** Handle form input */
     $scope.setDrm = function (){
-        console.log(this.drmPlayready, this.drmWidevine, this.drmClearkey);
+        console.log($scope.drmPlayready, $scope.drmWidevine, $scope.drmClearkey);
 
-        let drmInputs = [this.drmPlayready, this.drmWidevine, this.drmClearkey];
-        let protectionData = [];
+        let drmInputs = [$scope.drmPlayready, $scope.drmWidevine, $scope.drmClearkey];
+        let protectionData = {};
 
         for(let input of drmInputs){
             if(input.isActive){
@@ -906,24 +895,22 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                if(input.hasOwnProperty('inputMode') && input.inputMode === false){
                   // Check if priority is enabled
                   if(this.prioritiesEnabled){
-                    protectionData.push({
-                      [input.drmKeySystem]: {
+                    protectionData[input.drmKeySystem] = {
                         "clearkeys": {
                           [input.kid]: input.key
                         },
-                        "priority": input.priority
+                        "priority": parseInt(input.priority)
                       }    
-                    });
-                  }
+                    }
+                  
                   else{
-                    protectionData.push({
-                      [input.drmKeySystem]: {
+                    protectionData[input.drmKeySystem] = {
                         "clearkeys": {
                           [input.kid]: input.key
                         }
                       }
-                    })
-                  }
+                    }
+                
                   
                 }
       
@@ -931,21 +918,21 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                   // Validate URL. If the provided information is not a valid url, the DRM is skipped.
                   if(this.isValidURL(input.licenseServerUrl)){
                     if(this.prioritiesEnabled){
-                      protectionData.push({
-                        [input.drmKeySystem]: {
+                      protectionData[input.drmKeySystem] = {
                           "serverURL": input.licenseServerUrl,
-                          "httpRequestHeaders": input.httpRequestHeader,
-                          "priority": input.priority
-                        }    
-                      }); 
+                          "httpRequestHeaders": {
+                              'X-AxDRM-Message': ''
+                          },
+                          "priority": parseInt(input.priority)
+                        }     
                     }
                     else
-                    protectionData.push({
-                      [input.drmKeySystem]: {
+                    protectionData[input.drmKeySystem] = {
                         "serverURL": input.licenseServerUrl,
-                        "httpRequestHeaders": input.httpRequestHeader
-                      }    
-                    }); 
+                        "httpRequestHeaders": {
+                            'X-AxDRM-Message': input.httpRequestHeader
+                        }
+                      }     
                   }
                   else {
                     console.log(input.licenseServerUrl, "is not a valid url!")
@@ -954,10 +941,9 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                 }
             }
         }
-        console.log(protectionData);
+        
+        $scope.protectionData = protectionData;
         $scope.player.setProtectionData(protectionData);
-        //$scope.player.doLoad();
-        console.log($scope.player.getProtectionController());
     }
 
     $scope.isValidURL = function (str) {
diff --git a/samples/dash-if-reference-player/dashjs_config.json b/samples/dash-if-reference-player/dashjs_config.json
index f1b3e72d65..24493c09fc 100644
--- a/samples/dash-if-reference-player/dashjs_config.json
+++ b/samples/dash-if-reference-player/dashjs_config.json
@@ -1,5 +1,5 @@
 {
     "debug": {
-        "logLevel": 5
+        "logLevel": 0
     }
 }
\ No newline at end of file
diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index 47d7756e19..cf3a44f588 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -336,6 +336,14 @@
                     <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.licenseServerUrl">
                     <label class="options-label">HTTP Request Header:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.httpRequestHeader">
+                    <div ng-show="prioritiesEnabled">
+                        <label class="options-label">Priority</label>
+                        <select name="playreadyPriority" ng-model="drmPlayready.priority" ng-init="drmPlayready.priority='1'">
+                            <option value=0>0</option>
+                            <option value=1>1</option>
+                            <option value=2>2</option>
+                        </select>
+                    </div>         
                 </div>
 
                 <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
@@ -349,6 +357,14 @@
                     <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.licenseServerUrl">
                     <label class="options-label">HTTP Request Header:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.httpRequestHeader">
+                    <div ng-show="prioritiesEnabled">
+                        <label class="options-label">Priority</label>
+                        <select name="widevinePriority" ng-model="drmWidevine.priority" ng-init="drmWidevine.priority='0'">
+                            <option value=0>0</option>
+                            <option value=1>1</option>
+                            <option value=2>2</option>
+                        </select>
+                    </div>
                 </div>
 
                 <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
@@ -362,10 +378,26 @@
                     <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.kid">
                     <label class="options-label">Key:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.key">
+                    <div ng-show="prioritiesEnabled">
+                        <label class="options-label">Priority</label>
+                        <select name="clearkeyPriority" ng-model="drmClearkey.priority" ng-init="drmClearkey.priority='2'">
+                            <option value=0>0</option>
+                            <option value=1>1</option>
+                            <option value=2>2</option>
+                        </select>
+                    </div>
                 </div>
-
-                <input type="submit" class="btn btn-primary" ng-click="setDrm()" value="Submit"\>
             </form>
+            <div class="sub-options-item">
+                <div class="sub-options-item-title">Priorities</div>
+                <div class="sub-options-item-body">
+                    <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
+                       title="Enable DRM-Priorisation">
+                    <input type="checkbox" ng-model="prioritiesEnabled">
+                    DRM Priorisation
+                </label>
+                </div>
+            </div>
                 <!-- <div class="dropdown" data-toggle="tooltip" data-placement="left"
                      title="Please select a DRM Key System">
                     <button class="btn btn-primary dropdown-toggle" type="button" id="menu1" data-toggle="dropdown">DRM
@@ -380,8 +412,6 @@
                 <div id="drmLicenseForm" ng-show="drmKeySystem">
                     <label class="options-label">License URL:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmLicenseURL">
-                    <label class="options-label">HTTP Request Header:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmRequestHeader">
                 </div>-->
             </div> 
         </div>

From 695de4e99a1755cc34d36ef4d337225c9c1dabed Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Tue, 1 Jun 2021 15:55:33 +0200
Subject: [PATCH 03/12] Added method to provide multiple request headers, added
 switching between input modes for Clearkey, added handling DRM-data provided
 by sources.json

---
 .../dash-if-reference-player/app/css/main.css |  41 +++
 samples/dash-if-reference-player/app/main.js  | 249 +++++++++++++++---
 samples/dash-if-reference-player/index.html   | 119 ++++++++-
 3 files changed, 364 insertions(+), 45 deletions(-)

diff --git a/samples/dash-if-reference-player/app/css/main.css b/samples/dash-if-reference-player/app/css/main.css
index 59b4e8ea51..fcdc75712f 100644
--- a/samples/dash-if-reference-player/app/css/main.css
+++ b/samples/dash-if-reference-player/app/css/main.css
@@ -591,4 +591,45 @@ Conformance warnings
     margin-top: 15px;
     margin-bottom: 15px;
     padding: 12px;
+}
+
+/********************************************************
+DRM Header Dialogue
+*********************************************************/
+
+.requestHeaderDialogue {
+    display: none;
+    position: fixed;
+    z-index: 1;
+    padding-top: 100px;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    text-align: center;
+    background-color: rgb(255, 255, 255);
+    background-color: rgba(255, 255, 255, 0.4);
+}
+
+.requestHeaderDialogueContent {
+    display: inline-block;
+    background-color: #fefefe;
+    padding: 20px;
+    border: 1px solid #888;
+    width: 80%; /* Could be more or less, depending on screen size */
+}
+
+.close {
+    color: rgb(255, 0, 0);
+    float: right;
+    font-size: 28px;
+    font-weight: bold;
+}
+
+.close:hover,
+.close:focus {
+    color: black;
+    text-decoration: none;
+    cursor: pointer;
 }
\ No newline at end of file
diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index 30d984f45b..578394e9a9 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -190,7 +190,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         isActive: false,
         drmKeySystem: 'com.microsoft.playready',
         licenseServerUrl: 'https://drm-playready-licensing.axtest.net/AcquireLicense',
-        httpRequestHeader: '',
+        httpRequestHeaders: {},
+        xAxDrmMessage: '',
         priority: 1
     }
 
@@ -198,7 +199,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         isActive: false,
         drmKeySystem: 'com.widevine.alpha',
         licenseServerUrl: 'https://drm-widevine-licensing.axtest.net/AcquireLicense',
-        httpRequestHeader: '',
+        httpRequestHeaders: {},
+        xAxDrmMessage: '',
         priority: 0
     }
 
@@ -206,13 +208,19 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         isActive: false,
         drmKeySystem: 'org.w3.clearkey',
         licenseServerUrl: '',
-        httpRequestHeader: '',
+        httpRequestHeaders: {},
+        xAxDrmMessage: '',
         kid: '',
         key: '',
         inputMode: false,
         priority: 2
       }
-    
+
+    $scope.playreadyRequestHeaders = [];
+
+    $scope.widevineRequestHeaders = [];
+
+    $scope.clearkeyRequestHeaders = [];
 
     $scope.isDynamic = false;
 
@@ -670,12 +678,18 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
     $scope.doLoad = function () {
         $scope.initSession();
-
-        $scope.setDrm();
+        
+        // $scope.handleRequestHeaders();
+        // $scope.setDrm();
 
         var protData = {};
         if ($scope.selectedItem.hasOwnProperty('protData')) {
             protData = $scope.selectedItem.protData;
+            $scope.handleProtectionData(protData);
+            $scope.handleRequestHeaders();
+            $scope.setDrm();
+            protData = $scope.protectionData;
+            console.log($scope.protectionData);
         }
         else if ($scope.protectionData !== {}) {
             protData = $scope.protectionData;
@@ -687,8 +701,6 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         } else {
             protData = null;
         }
-        console.log($scope.selectedItem)
-        console.log(protData)
 
         // Check if persistent license session ID is stored for current stream
         var sessionId = $scope.persistentSessionId[$scope.selectedItem.url];
@@ -883,7 +895,6 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
     /** Handle form input */
     $scope.setDrm = function (){
-        console.log($scope.drmPlayready, $scope.drmWidevine, $scope.drmClearkey);
 
         let drmInputs = [$scope.drmPlayready, $scope.drmWidevine, $scope.drmClearkey];
         let protectionData = {};
@@ -893,46 +904,60 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
                 // Check if the provided DRM is Clearkey and whether KID=KEY or LicenseServer + Header is selected; Default is KID=KEY
                if(input.hasOwnProperty('inputMode') && input.inputMode === false){
-                  // Check if priority is enabled
-                  if(this.prioritiesEnabled){
-                    protectionData[input.drmKeySystem] = {
-                        "clearkeys": {
-                          [input.kid]: input.key
-                        },
-                        "priority": parseInt(input.priority)
-                      }    
-                    }
-                  
-                  else{
-                    protectionData[input.drmKeySystem] = {
-                        "clearkeys": {
-                          [input.kid]: input.key
+                    //Check if kid and key have been specified
+                    if(input.kid !== '' && input.key !== ''){
+                        // Check if priority is enabled
+                        if(this.prioritiesEnabled){
+                            protectionData[input.drmKeySystem] = {
+                                "clearkeys": {
+                                [input.kid]: input.key
+                                },
+                                "priority": parseInt(input.priority)
+                            }    
+                        }
+                        
+                        else {
+                            protectionData[input.drmKeySystem] = {
+                                "clearkeys": {
+                                [input.kid]: input.key
+                                }
+                            }
                         }
-                      }
+
+                        if(!angular.equals(input.httpRequestHeaders, {})){
+                            protectionData[input.drmKeySystem]['httpRequestHeaders'] = input.httpRequestHeaders; 
+                         }
+                    }
+                    else {
+                        alert("Kid and Key must be specified!");
                     }
-                
-                  
+ 
                 }
       
                 else{
                   // Validate URL. If the provided information is not a valid url, the DRM is skipped.
                   if(this.isValidURL(input.licenseServerUrl)){
+                    // Check if DRM-Priorisation is enabled
                     if(this.prioritiesEnabled){
-                      protectionData[input.drmKeySystem] = {
+                        protectionData[input.drmKeySystem] = {
                           "serverURL": input.licenseServerUrl,
-                          "httpRequestHeaders": {
-                              'X-AxDRM-Message': ''
-                          },
                           "priority": parseInt(input.priority)
-                        }     
+                        }
+                        if(!angular.equals(input.httpRequestHeaders, {}))
+                        protectionData[input.drmKeySystem]['httpRequestHeaders'] = input.httpRequestHeaders;
+                         
                     }
-                    else
+                    else {
                     protectionData[input.drmKeySystem] = {
                         "serverURL": input.licenseServerUrl,
-                        "httpRequestHeaders": {
-                            'X-AxDRM-Message': input.httpRequestHeader
-                        }
-                      }     
+                      }  
+                    }
+
+                    // Only set request header if any have been specified
+                    if(!angular.equals(input.httpRequestHeaders, {})){
+                       protectionData[input.drmKeySystem]['httpRequestHeaders'] = input.httpRequestHeaders; 
+                    } 
+                      
                   }
                   else {
                     console.log(input.licenseServerUrl, "is not a valid url!")
@@ -946,11 +971,125 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         $scope.player.setProtectionData(protectionData);
     }
 
+    $scope.addRequestHeader = function (keySystem) {
+
+        switch(keySystem){
+            case 'playready':
+                $scope.playreadyRequestHeaders.push({
+                    id: $scope.playreadyRequestHeaders.length + 1,
+                    key: '',
+                    value: ''
+                })
+                break;
+            case 'widevine':
+                $scope.widevineRequestHeaders.push({
+                    id: $scope.widevineRequestHeaders.length + 1,
+                    key: '',
+                    value: ''
+                })
+                break;
+            case 'clearkey':
+                $scope.clearkeyRequestHeaders.push({
+                    id: $scope.clearkeyRequestHeaders.length + 1,
+                    key: '',
+                    value: ''
+                })
+                break;
+        }
+    }
+
+    $scope.removeRequestHeader = function (keySystem, index){
+        switch(keySystem){
+            case 'playready':
+                $scope.playreadyRequestHeaders.splice(index, 1);
+                break;
+            case 'widevine':
+                $scope.widevineRequestHeaders.splice(index, 1);
+                break;
+            case 'clearkey':
+                $scope.clearkeyRequestHeaders.splice(index, 1);
+                break;
+        }
+        
+    }
+
+    $scope.handleRequestHeaders = function (){
+        // Initialize with current headers as empty
+        $scope.drmPlayready.httpRequestHeaders = {};
+        $scope.drmWidevine.httpRequestHeaders = {};
+        $scope.drmClearkey.httpRequestHeaders = {};
+
+        if($scope.drmPlayready.xAxDrmMessage !== ''){
+            $scope.drmPlayready.httpRequestHeaders['X-AxDRM-Message'] = $scope.drmPlayready.xAxDrmMessage;
+        }
+        if($scope.drmWidevine.xAxDrmMessage !== ''){
+            $scope.drmWidevine.httpRequestHeaders['X-AxDRM-Message'] = $scope.drmWidevine.xAxDrmMessage;
+        }
+        if($scope.drmClearkey.xAxDrmMessage !== ''){
+            $scope.drmClearkey.httpRequestHeaders['X-AxDRM-Message'] = $scope.drmClearkey.xAxDrmMessage;
+        }
+
+        // fill headers with current inputs
+        for(let header of $scope.playreadyRequestHeaders){
+            $scope.drmPlayready.httpRequestHeaders[header.key] = header.value;
+        }
+        for(let header of $scope.widevineRequestHeaders){
+            $scope.drmWidevine.httpRequestHeaders[header.key] = header.value;
+        }
+        for(let header of $scope.clearkeyRequestHeaders){
+            $scope.drmClearkey.httpRequestHeaders[header.key] = header.value;
+        }
+        console.log($scope.drmPlayready)
+    }
+
+    $scope.handleProtectionData = function (protectionData){
+        for(let data in protectionData){
+            switch(data){
+                case 'com.microsoft.playready':
+                    $scope.drmPlayready.isActive = true;
+                    $scope.drmPlayready.licenseServerUrl = protectionData[data]['serverURL'];
+                    //$scope.drmPlayready.httpRequestHeaders = protectionData[data]['httpRequestHeaders'];
+                    for(let header in protectionData[data]['httpRequestHeaders']){
+                        if(header !== 'X-AxDRM-Message'){
+                            $scope.playreadyRequestHeaders.push({
+                                id: $scope.playreadyRequestHeaders.length + 1,
+                                key: header,
+                                value: protectionData[data][header]
+                            });
+                        }
+                    }
+                    $scope.drmPlayready.xAxDrmMessage = protectionData[data]['httpRequestHeaders']['X-AxDRM-Message'];
+                    console.log($scope.drmPlayready)
+                    break;
+                case 'com.widevine.alpha':
+                    $scope.drmWidevine.isActive = true;
+                    $scope.drmWidevine.licenseServerUrl = protectionData[data]['serverURL'];
+                    for(let header in protectionData[data]['httpRequestHeaders']){
+                        if(header !== 'X-AxDRM-Message'){
+                            $scope.widevineRequestHeaders.push({
+                                id: $scope.widevineRequestHeaders.length + 1,
+                                key: header,
+                                value: protectionData[data][header]
+                            });
+                        }
+                    }
+                    $scope.drmWidevine.xAxDrmMessage = protectionData[data]['httpRequestHeaders']['X-AxDRM-Message'];
+                    console.log($scope.drmWidevine)
+                    break;
+                case 'org.w3.clearkey':
+                    break;
+            }
+        }
+    }
+
     $scope.isValidURL = function (str) {
         let res = str.match(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g);
         return (res !== null)
       };
-    
+
+    $scope.toggleInputMode = function (){
+        $scope.drmClearkey.inputMode = !$scope.drmClearkey.inputMode;
+    }    
 
     // from: https://gist.github.com/siongui/4969449
     $scope.safeApply = function (fn) {
@@ -961,6 +1100,42 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
             this.$apply(fn);
     };
 
+    $scope.openDialogue = function (keySystem){
+        switch(keySystem){
+            case 'playready':
+                document.getElementById('playreadyRequestHeaderDialogue').style.display = 'inline-block';
+                break;
+            case 'widevine':
+                document.getElementById('widevineRequestHeaderDialogue').style.display = 'block';
+                break;
+            case 'clearkey':
+                document.getElementById('clearkeyRequestHeaderDialogue').style.display = 'block';
+                break;
+        }
+    }
+
+    $scope.closeDialogue = function (keySystem){
+        switch(keySystem){
+            case 'playready':
+                document.getElementById('playreadyRequestHeaderDialogue').style.display = 'none';
+                break;
+            case 'widevine':
+                document.getElementById('widevineRequestHeaderDialogue').style.display = 'none';
+                break;
+            case 'clearkey':
+                document.getElementById('clearkeyRequestHeaderDialogue').style.display = 'none';
+                break;
+        }
+    }
+
+    window.onclick = function(event){
+        if(event.target == document.getElementById('playreadyRequestHeaderDialogue') ||
+           event.target == document.getElementById('widevineRequestHeaderDialogue')  ||
+           event.target == document.getElementById('clearkeyRequestHeaderDialogue')  ){
+               event.target.style.display = 'none';
+        }
+    }
+
     ////////////////////////////////////////
     //
     // Metrics
diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index cf3a44f588..ebaa63e76d 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -334,8 +334,34 @@
                 <div id="drmPlayreadyLicenseForm" ng-show="drmPlayreadyChecked === true">
                     <label class="options-label">License URL:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.licenseServerUrl">
-                    <label class="options-label">HTTP Request Header:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.httpRequestHeader">
+                    <label class="options-label">X-AxDRM-Message:</label>
+                    <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.xAxDrmMessage"> 
+
+                    <!-- Open Header Dialogue Window -->
+                    <button id="playreadyRequestHeaderDialogueBtn" class="btn btn-primary" ng-click="openDialogue('playready')">
+                                Add Request-Headers</button>
+
+                    <!-- Header Dialogue Window Content -->
+                    <div id="playreadyRequestHeaderDialogue" class="requestHeaderDialogue">
+                        <div class="requestHeaderDialogueContent">
+                            <button class="close" ng-click="closeDialogue('playready')">&times;</button>
+                            <button class="btn btn-primary" ng-click="addRequestHeader('playready')">Add additional Header</button>
+
+                            <section ng-repeat="header in playreadyRequestHeaders track by $index" ng-value="{{$index}}">
+
+                                <label class="options-label">Request Header Key: </label>
+                                <input type="text" class="form-control" placeholder="" 
+                                        ng-model="header.key" name="playreadyKey_{{header.id}}">
+                                <label class="options-label">Request Header Value: </label>
+                                <input type="text" class="form-control" placeholder="" 
+                                        ng-model="header.value" name="playreadyValue_{{header.id}}">
+                                <button class="btn btn-danger" ng-click="removeRequestHeader('playready', $index)">Remove Header</button>
+
+                            </section>   
+                            
+                        </div>
+                    </div>
+
                     <div ng-show="prioritiesEnabled">
                         <label class="options-label">Priority</label>
                         <select name="playreadyPriority" ng-model="drmPlayready.priority" ng-init="drmPlayready.priority='1'">
@@ -355,8 +381,34 @@
                 <div id="drmWidevineLicenseForm" ng-show="drmWidevineChecked === true">
                     <label class="options-label">License URL:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.licenseServerUrl">
-                    <label class="options-label">HTTP Request Header:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.httpRequestHeader">
+                    <label class="options-label">X-AxDRM-Message:</label>
+                    <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.xAxDrmMessage">
+
+                    <!-- Open Header Dialogue Window -->
+                    <button id="widevineRequestHeaderDialogueBtn" class="btn btn-primary" ng-click="openDialogue('widevine')">
+                        Add Request-Headers</button>
+
+                    <!-- Header Dialogue Window Content -->
+                    <div id="widevineRequestHeaderDialogue" class="requestHeaderDialogue">
+                        <div class="requestHeaderDialogueContent">
+                            <button class="close" ng-click="closeDialogue('widevine')">&times;</button>
+                            <button class="btn btn-primary" ng-click="addRequestHeader('widevine')">Add additional Header</button>
+
+                            <section ng-repeat="header in widevineRequestHeaders track by $index" ng-value="{{$index}}">
+
+                                <label class="options-label">Request Header Key: </label>
+                                <input type="text" class="form-control" placeholder="" 
+                                        ng-model="header.key" name="widevineKey_{{header.id}}">
+                                <label class="options-label">Request Header Value: </label>
+                                <input type="text" class="form-control" placeholder="" 
+                                        ng-model="header.value" name="widevineValue_{{header.id}}">
+                                <button class="btn btn-danger" ng-click="removeRequestHeader('widevine', $index)">Remove Header</button>
+
+                            </section>   
+                            
+                        </div>
+                    </div>
+                    
                     <div ng-show="prioritiesEnabled">
                         <label class="options-label">Priority</label>
                         <select name="widevinePriority" ng-model="drmWidevine.priority" ng-init="drmWidevine.priority='0'">
@@ -374,10 +426,44 @@
                 </label>
 
                 <div id="drmClearkeyLicenseForm" ng-show="drmClearkeyChecked === true">
-                    <label class="options-label">Kid:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.kid">
-                    <label class="options-label">Key:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.key">
+                    <div id="drmClearkeyKidKeyMode" ng-show="drmClearkey.inputMode === false">
+                        <label class="options-label">Kid:</label>
+                        <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.kid">
+                        <label class="options-label">Key:</label>
+                        <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.key">
+                    </div>
+                    <div id="drmClearkeyLicenseserverMode" ng-show="drmClearkey.inputMode === true">
+                        <label class="options-label">License URL:</label>
+                        <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.licenseServerUrl">
+                        <label class="options-label">X-AxDRM-Message:</label>
+                        <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.xAxDrmMessage">
+                    </div>
+
+                    <!-- Open Header Dialogue Window -->
+                    <button id="clearkeyRequestHeaderDialogueBtn" class="btn btn-primary" ng-click="openDialogue('clearkey')">
+                        Add Request-Headers</button>
+
+                    <!-- Header Dialogue Window Content -->
+                    <div id="clearkeyRequestHeaderDialogue" class="requestHeaderDialogue">
+                        <div class="requestHeaderDialogueContent">
+                            <button class="close" ng-click="closeDialogue('clearkey')">&times;</button>
+                            <button class="btn btn-primary" ng-click="addRequestHeader('clearkey')">Add additional Header</button>
+
+                            <section ng-repeat="header in clearkeyRequestHeaders track by $index" ng-value="{{$index}}">
+                                
+
+                                <label class="options-label">Request Header Key: </label>
+                                <input type="text" class="form-control" placeholder="" 
+                                        ng-model="header.key" name="clearkeyKey_{{header.id}}">
+                                <label class="options-label">Request Header Value: </label>
+                                <input type="text" class="form-control" placeholder="" 
+                                        ng-model="header.value" name="clearkeyValue_{{header.id}}">
+                                <button class="btn btn-danger" ng-click="removeRequestHeader('playready', $index)">Remove Header</button>
+                            </section>   
+                            
+                        </div>
+                    </div>
+
                     <div ng-show="prioritiesEnabled">
                         <label class="options-label">Priority</label>
                         <select name="clearkeyPriority" ng-model="drmClearkey.priority" ng-init="drmClearkey.priority='2'">
@@ -397,6 +483,23 @@
                     DRM Priorisation
                 </label>
                 </div>
+            </div>
+            <div class="sub-options-item">
+                <div class="sub-options-item-title">Clearkey Options</div>
+                <div class="sub-options-item-body">
+                    <label data-toggle="tooltip" data-placement="right"
+                            title="Use KID=Key to specify Clearkey DRM.">
+                        <input type="radio" id="kidKey" autocomplete="off" name="inputMode" checked="checked"
+                                ng-click="toggleInputMode()">
+                        KID=KEY
+                    </label>
+                    <label data-toggle="tooltip" data-placement="right"
+                            title="Use Licenseserver-URL to specify Clearkey DRM">
+                        <input type="radio" id="licenseServer" autocomplete="off" name="inputMode"
+                                ng-click="toggleInputMode()">
+                        License Server
+                    </label>
+                </div>
             </div>
                 <!-- <div class="dropdown" data-toggle="tooltip" data-placement="left"
                      title="Please select a DRM Key System">

From be2c0dc3505ffa97de4998276fa3eb6cd0c8a1b4 Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Thu, 3 Jun 2021 12:34:50 +0200
Subject: [PATCH 04/12] Added logic to make Clearkey work with the new
 drm-handling, added handling additional incoming parameters.

---
 samples/dash-if-reference-player/app/main.js | 102 +++++++++++++++----
 samples/dash-if-reference-player/index.html  |  12 +--
 2 files changed, 91 insertions(+), 23 deletions(-)

diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index 578394e9a9..016e61fd68 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -210,8 +210,7 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         licenseServerUrl: '',
         httpRequestHeaders: {},
         xAxDrmMessage: '',
-        kid: '',
-        key: '',
+        clearkeys: {},
         inputMode: false,
         priority: 2
       }
@@ -904,26 +903,37 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
                 // Check if the provided DRM is Clearkey and whether KID=KEY or LicenseServer + Header is selected; Default is KID=KEY
                if(input.hasOwnProperty('inputMode') && input.inputMode === false){
-                    //Check if kid and key have been specified
-                    if(input.kid !== '' && input.key !== ''){
+                    //Check clearkeys has at least one entry
+                    if(input.clearkeys !== {}){
                         // Check if priority is enabled
+                        protectionData[input.drmKeySystem] = {
+                            'clearkeys' : {},
+                            'priority' : 0
+                        };
                         if(this.prioritiesEnabled){
-                            protectionData[input.drmKeySystem] = {
-                                "clearkeys": {
-                                [input.kid]: input.key
-                                },
-                                "priority": parseInt(input.priority)
-                            }    
+                            for(let key in input.clearkeys){
+                                protectionData[input.drmKeySystem]['clearkeys'][key] = input.clearkeys[key];   
+                            }
+                            protectionData[input.drmKeySystem]['priority'] = parseInt(input.priority);
                         }
                         
                         else {
-                            protectionData[input.drmKeySystem] = {
-                                "clearkeys": {
-                                [input.kid]: input.key
-                                }
+                            for(let key in input.clearkeys){
+                                protectionData[input.drmKeySystem]['clearkeys'][key] = input.clearkeys[key];   
                             }
                         }
 
+                        for(let key in input){
+                            if(key !== 'isActive' &&
+                                key !== 'drmKeySystem' &&
+                                key !== 'licenseServerUrl' &&
+                                key !== 'httpRequestHeaders' &&
+                                key !== 'xAxDrmMessage' &&
+                                key !== 'priority'){
+                                    protectionData[input.drmKeySystem][key] = input[key];
+                                }
+                        }
+
                         if(!angular.equals(input.httpRequestHeaders, {})){
                             protectionData[input.drmKeySystem]['httpRequestHeaders'] = input.httpRequestHeaders; 
                          }
@@ -953,6 +963,17 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                       }  
                     }
 
+                    for(let key in input){
+                        if(key !== 'isActive' &&
+                            key !== 'drmKeySystem' &&
+                            key !== 'licenseServerUrl' &&
+                            key !== 'httpRequestHeaders' &&
+                            key !== 'xAxDrmMessage' &&
+                            key !== 'priority'){
+                                protectionData[input.drmKeySystem][key] = input[key];
+                            }
+                    }
+
                     // Only set request header if any have been specified
                     if(!angular.equals(input.httpRequestHeaders, {})){
                        protectionData[input.drmKeySystem]['httpRequestHeaders'] = input.httpRequestHeaders; 
@@ -1042,13 +1063,16 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         console.log($scope.drmPlayready)
     }
 
+    /** Handle inherent protection data passed by selectedItem */
     $scope.handleProtectionData = function (protectionData){
         for(let data in protectionData){
+
             switch(data){
                 case 'com.microsoft.playready':
+                    // Set DRM to active
                     $scope.drmPlayready.isActive = true;
+                    // Fill the drmPlayready object with data to be used by setDRM() later.
                     $scope.drmPlayready.licenseServerUrl = protectionData[data]['serverURL'];
-                    //$scope.drmPlayready.httpRequestHeaders = protectionData[data]['httpRequestHeaders'];
                     for(let header in protectionData[data]['httpRequestHeaders']){
                         if(header !== 'X-AxDRM-Message'){
                             $scope.playreadyRequestHeaders.push({
@@ -1059,8 +1083,15 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                         }
                     }
                     $scope.drmPlayready.xAxDrmMessage = protectionData[data]['httpRequestHeaders']['X-AxDRM-Message'];
-                    console.log($scope.drmPlayready)
+                    // Add any additional parameters
+                    for(let parameter in protectionData[data]){
+                        if(parameter !== 'serverURL' &&
+                            parameter !== 'httpRequestHeaders'){
+                                $scope.drmPlayready[parameter] = protectionData[data][parameter];
+                            }
+                    }
                     break;
+
                 case 'com.widevine.alpha':
                     $scope.drmWidevine.isActive = true;
                     $scope.drmWidevine.licenseServerUrl = protectionData[data]['serverURL'];
@@ -1074,19 +1105,56 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                         }
                     }
                     $scope.drmWidevine.xAxDrmMessage = protectionData[data]['httpRequestHeaders']['X-AxDRM-Message'];
-                    console.log($scope.drmWidevine)
+                    for(let parameter in protectionData[data]){
+                        if(parameter !== 'serverURL' &&
+                            parameter !== 'httpRequestHeaders'){
+                                $scope.drmWidevine[parameter] = protectionData[data][parameter];
+                            }
+                    }
                     break;
+
                 case 'org.w3.clearkey':
+                    $scope.drmClearkey.isActive = true;
+                    // Handle clearkey data if specified using a license server
+                    if(protectionData[data]['serverURL'] !== undefined){
+                        $scope.drmClearkey.licenseServerUrl = protectionData[data]['serverURL'];
+                        for(let header in protectionData[data]['httpRequestHeaders']){
+                            if(header !== 'X-AxDRM-Message'){
+                                $scope.clearkeyRequestHeaders.push({
+                                    id: $scope.clearkeyRequestHeaders.length + 1,
+                                    key: header,
+                                    value: protectionData[data][header]
+                                });
+                            }
+                        }
+                        $scope.drmClearkey.xAxDrmMessage = protectionData[data]['httpRequestHeaders']['X-AxDRM-Message'];
+                    }
+                    // Handle clearkey dataif specified using KID=KEY.
+                    else {
+                        for(let key in protectionData[data]['clearkeys']){
+                            $scope.drmClearkey.clearkeys[key] = protectionData[data]['clearkeys'][key];
+                        }
+                    }
+
+                    for(let parameter in protectionData[data]){
+                        if(parameter !== 'serverURL' &&
+                            parameter !== 'httpRequestHeaders' &&
+                            parameter !== 'clearkeys'){
+                                $scope.drmWidevine[parameter] = protectionData[data][parameter];
+                            }
+                    }
                     break;
             }
         }
     }
 
+    /** Test if provided string is a URL */
     $scope.isValidURL = function (str) {
         let res = str.match(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g);
         return (res !== null)
       };
 
+    /** Toggle between KID=KEY and Licenseserver Clearkey specification */
     $scope.toggleInputMode = function (){
         $scope.drmClearkey.inputMode = !$scope.drmClearkey.inputMode;
     }    
diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index ebaa63e76d..7431701037 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -327,11 +327,11 @@
             <form>
                 <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
                        title="">
-                    <input type="checkbox" ng-model="drmPlayreadyChecked" ng-change="drmPlayready.isActive = drmPlayreadyChecked">
+                    <input type="checkbox" ng-model="drmPlayready.isActive">
                     Playready
                 </label>
 
-                <div id="drmPlayreadyLicenseForm" ng-show="drmPlayreadyChecked === true">
+                <div id="drmPlayreadyLicenseForm" ng-show="drmPlayready.isActive">
                     <label class="options-label">License URL:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.licenseServerUrl">
                     <label class="options-label">X-AxDRM-Message:</label>
@@ -374,11 +374,11 @@
 
                 <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
                        title="">
-                    <input type="checkbox" ng-model="drmWidevineChecked" ng-change="drmWidevine.isActive = drmWidevineChecked">
+                    <input type="checkbox" ng-model="drmWidevine.isActive">
                     Widevine
                 </label>
 
-                <div id="drmWidevineLicenseForm" ng-show="drmWidevineChecked === true">
+                <div id="drmWidevineLicenseForm" ng-show="drmWidevine.isActive">
                     <label class="options-label">License URL:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.licenseServerUrl">
                     <label class="options-label">X-AxDRM-Message:</label>
@@ -421,11 +421,11 @@
 
                 <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
                        title="">
-                    <input type="checkbox" ng-model="drmClearkeyChecked" ng-change="drmClearkey.isActive = drmClearkeyChecked">
+                    <input type="checkbox" ng-model="drmClearkey.isActive">
                     Clearkey
                 </label>
 
-                <div id="drmClearkeyLicenseForm" ng-show="drmClearkeyChecked === true">
+                <div id="drmClearkeyLicenseForm" ng-show="drmClearkey.isActive">
                     <div id="drmClearkeyKidKeyMode" ng-show="drmClearkey.inputMode === false">
                         <label class="options-label">Kid:</label>
                         <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.kid">

From 024e1988a1d32024041d2b3bc0cbc179b1698cbd Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Fri, 4 Jun 2021 12:01:12 +0200
Subject: [PATCH 05/12] Removed X-AxDRM-Message being a default field, added
 Popup to specify multiple KID=KEY pairs, fixed error in handleRequestHeaders
 logic

---
 samples/dash-if-reference-player/app/main.js | 132 ++++++++++++-------
 samples/dash-if-reference-player/index.html  |  45 +++++--
 2 files changed, 121 insertions(+), 56 deletions(-)

diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index 016e61fd68..977df7242e 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -191,7 +191,6 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         drmKeySystem: 'com.microsoft.playready',
         licenseServerUrl: 'https://drm-playready-licensing.axtest.net/AcquireLicense',
         httpRequestHeaders: {},
-        xAxDrmMessage: '',
         priority: 1
     }
 
@@ -200,7 +199,6 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         drmKeySystem: 'com.widevine.alpha',
         licenseServerUrl: 'https://drm-widevine-licensing.axtest.net/AcquireLicense',
         httpRequestHeaders: {},
-        xAxDrmMessage: '',
         priority: 0
     }
 
@@ -209,7 +207,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         drmKeySystem: 'org.w3.clearkey',
         licenseServerUrl: '',
         httpRequestHeaders: {},
-        xAxDrmMessage: '',
+        kid: '',
+        key: '',
         clearkeys: {},
         inputMode: false,
         priority: 2
@@ -221,6 +220,9 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
     $scope.clearkeyRequestHeaders = [];
 
+    $scope.additionalClearkeyPairs = [];
+
+
     $scope.isDynamic = false;
 
     $scope.conformanceViolations = [];
@@ -680,16 +682,23 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         
         // $scope.handleRequestHeaders();
         // $scope.setDrm();
+        // $scope.handleClearkeys();
 
         var protData = {};
+        // Execute if the loaded video already has preset DRM data
         if ($scope.selectedItem.hasOwnProperty('protData')) {
             protData = $scope.selectedItem.protData;
+
+            // Handle preset protection data to be reflected in the UI and work with setDrm()
             $scope.handleProtectionData(protData);
             $scope.handleRequestHeaders();
+            $scope.handleClearkeys();
+            // Set DRM options
             $scope.setDrm();
             protData = $scope.protectionData;
             console.log($scope.protectionData);
         }
+        // Execute if setDrm() has been called with manually entered values
         else if ($scope.protectionData !== {}) {
             protData = $scope.protectionData;
         }
@@ -928,8 +937,10 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                                 key !== 'drmKeySystem' &&
                                 key !== 'licenseServerUrl' &&
                                 key !== 'httpRequestHeaders' &&
-                                key !== 'xAxDrmMessage' &&
-                                key !== 'priority'){
+                                key !== 'priority' &&
+                                key !== 'kid' &&
+                                key !== 'key' &&
+                                key !== 'inputMode'){
                                     protectionData[input.drmKeySystem][key] = input[key];
                                 }
                         }
@@ -968,7 +979,6 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                             key !== 'drmKeySystem' &&
                             key !== 'licenseServerUrl' &&
                             key !== 'httpRequestHeaders' &&
-                            key !== 'xAxDrmMessage' &&
                             key !== 'priority'){
                                 protectionData[input.drmKeySystem][key] = input[key];
                             }
@@ -992,7 +1002,7 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         $scope.player.setProtectionData(protectionData);
     }
 
-    $scope.addRequestHeader = function (keySystem) {
+    $scope.addPopupInput = function (keySystem) {
 
         switch(keySystem){
             case 'playready':
@@ -1016,10 +1026,16 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                     value: ''
                 })
                 break;
+            case 'additionalClearkeys':
+                $scope.additionalClearkeyPairs.push({
+                    id: $scope.additionalClearkeyPairs.length + 1,
+                    kid: '',
+                    key: ''
+                })
         }
     }
 
-    $scope.removeRequestHeader = function (keySystem, index){
+    $scope.removePopupInput = function (keySystem, index){
         switch(keySystem){
             case 'playready':
                 $scope.playreadyRequestHeaders.splice(index, 1);
@@ -1030,6 +1046,9 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
             case 'clearkey':
                 $scope.clearkeyRequestHeaders.splice(index, 1);
                 break;
+            case 'additionalClearkeys':
+                $scope.additionalClearkeyPairs.splice(index, 1);
+                break;
         }
         
     }
@@ -1040,16 +1059,6 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         $scope.drmWidevine.httpRequestHeaders = {};
         $scope.drmClearkey.httpRequestHeaders = {};
 
-        if($scope.drmPlayready.xAxDrmMessage !== ''){
-            $scope.drmPlayready.httpRequestHeaders['X-AxDRM-Message'] = $scope.drmPlayready.xAxDrmMessage;
-        }
-        if($scope.drmWidevine.xAxDrmMessage !== ''){
-            $scope.drmWidevine.httpRequestHeaders['X-AxDRM-Message'] = $scope.drmWidevine.xAxDrmMessage;
-        }
-        if($scope.drmClearkey.xAxDrmMessage !== ''){
-            $scope.drmClearkey.httpRequestHeaders['X-AxDRM-Message'] = $scope.drmClearkey.xAxDrmMessage;
-        }
-
         // fill headers with current inputs
         for(let header of $scope.playreadyRequestHeaders){
             $scope.drmPlayready.httpRequestHeaders[header.key] = header.value;
@@ -1060,7 +1069,25 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         for(let header of $scope.clearkeyRequestHeaders){
             $scope.drmClearkey.httpRequestHeaders[header.key] = header.value;
         }
-        console.log($scope.drmPlayready)
+    }
+
+    /** Handle multiple clearkeys */
+    $scope.handleClearkeys = function (){
+        // Initialize with empty
+        $scope.drmClearkey.clearkeys = {}
+
+        // Set default KID=KEY pair
+        if($scope.drmClearkey.kid !== '' && $scope.drmClearkey.key !== ''){
+            $scope.drmClearkey.clearkeys[$scope.drmClearkey.kid] = $scope.drmClearkey.key;
+        }
+        // fill drmClearkey objects "clearkeys" property
+        for(let clearkey of $scope.additionalClearkeyPairs){
+            $scope.drmClearkey.clearkeys[clearkey.kid] = clearkey.key;
+        }
+        // if clearkey property is empty, alert
+        if($scope.additionalClearkeyPairs === {}){
+            alert('You must specify at least one KID=KEY pair!');
+        }
     }
 
     /** Handle inherent protection data passed by selectedItem */
@@ -1074,15 +1101,12 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                     // Fill the drmPlayready object with data to be used by setDRM() later.
                     $scope.drmPlayready.licenseServerUrl = protectionData[data]['serverURL'];
                     for(let header in protectionData[data]['httpRequestHeaders']){
-                        if(header !== 'X-AxDRM-Message'){
                             $scope.playreadyRequestHeaders.push({
                                 id: $scope.playreadyRequestHeaders.length + 1,
                                 key: header,
-                                value: protectionData[data][header]
+                                value: protectionData[data]['httpRequestHeaders'][header]
                             });
-                        }
                     }
-                    $scope.drmPlayready.xAxDrmMessage = protectionData[data]['httpRequestHeaders']['X-AxDRM-Message'];
                     // Add any additional parameters
                     for(let parameter in protectionData[data]){
                         if(parameter !== 'serverURL' &&
@@ -1093,18 +1117,18 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                     break;
 
                 case 'com.widevine.alpha':
+                    // Set DRM to active
                     $scope.drmWidevine.isActive = true;
+                    // Fill the drmWidevine object with data to be used by setDRM() later
                     $scope.drmWidevine.licenseServerUrl = protectionData[data]['serverURL'];
                     for(let header in protectionData[data]['httpRequestHeaders']){
-                        if(header !== 'X-AxDRM-Message'){
-                            $scope.widevineRequestHeaders.push({
-                                id: $scope.widevineRequestHeaders.length + 1,
-                                key: header,
-                                value: protectionData[data][header]
-                            });
-                        }
+                        $scope.widevineRequestHeaders.push({
+                            id: $scope.widevineRequestHeaders.length + 1,
+                            key: header,
+                            value: protectionData[data]['httpRequestHeaders'][header]
+                        });
                     }
-                    $scope.drmWidevine.xAxDrmMessage = protectionData[data]['httpRequestHeaders']['X-AxDRM-Message'];
+                    // Add any additional parameters
                     for(let parameter in protectionData[data]){
                         if(parameter !== 'serverURL' &&
                             parameter !== 'httpRequestHeaders'){
@@ -1114,28 +1138,42 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                     break;
 
                 case 'org.w3.clearkey':
+                    // Set DRM to active
                     $scope.drmClearkey.isActive = true;
                     // Handle clearkey data if specified using a license server
                     if(protectionData[data]['serverURL'] !== undefined){
                         $scope.drmClearkey.licenseServerUrl = protectionData[data]['serverURL'];
                         for(let header in protectionData[data]['httpRequestHeaders']){
-                            if(header !== 'X-AxDRM-Message'){
-                                $scope.clearkeyRequestHeaders.push({
-                                    id: $scope.clearkeyRequestHeaders.length + 1,
-                                    key: header,
-                                    value: protectionData[data][header]
-                                });
-                            }
+                            $scope.clearkeyRequestHeaders.push({
+                                id: $scope.clearkeyRequestHeaders.length + 1,
+                                key: header,
+                                value: protectionData[data]['httpRequestHeaders'][header]
+                            });
                         }
-                        $scope.drmClearkey.xAxDrmMessage = protectionData[data]['httpRequestHeaders']['X-AxDRM-Message'];
                     }
-                    // Handle clearkey dataif specified using KID=KEY.
+                    // Handle clearkey data if specified using KID=KEY.
                     else {
-                        for(let key in protectionData[data]['clearkeys']){
-                            $scope.drmClearkey.clearkeys[key] = protectionData[data]['clearkeys'][key];
+                        let first = true;
+                        if(protectionData[data]['clearkeys'] !== {}){
+                            for(let kid in protectionData[data]['clearkeys']){
+                                // For the first KID=Key pair, set drmClearkey properties so that it shows in the main text boxes
+                                if(first === true){
+                                    $scope.drmClearkey.kid = kid;
+                                    $scope.drmClearkey.key = protectionData[data]['clearkeys'][kid];
+                                    delete protectionData[data]['clearkeys'][kid];
+                                    first = false;
+                                }
+                                else if(protectionData[data]['clearkeys'] !== {}) {
+                                    $scope.additionalClearkeyPairs.push({
+                                        id: $scope.additionalClearkeyPairs.length + 1,
+                                        kid: kid,
+                                        key: protectionData[data]['clearkeys'][kid]
+                                    });
+                                }
+                            }
                         }
                     }
-
+                    // Add any additional parameters
                     for(let parameter in protectionData[data]){
                         if(parameter !== 'serverURL' &&
                             parameter !== 'httpRequestHeaders' &&
@@ -1179,6 +1217,9 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
             case 'clearkey':
                 document.getElementById('clearkeyRequestHeaderDialogue').style.display = 'block';
                 break;
+            case 'additionalClearkeys':
+                document.getElementById('additionalClearkeysDialogue').style.display = 'block';
+                break;
         }
     }
 
@@ -1193,13 +1234,16 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
             case 'clearkey':
                 document.getElementById('clearkeyRequestHeaderDialogue').style.display = 'none';
                 break;
+            case 'additionalClearkeys':
+                document.getElementById('additionalClearkeysDialogue').style.display = 'none';
         }
     }
 
     window.onclick = function(event){
         if(event.target == document.getElementById('playreadyRequestHeaderDialogue') ||
            event.target == document.getElementById('widevineRequestHeaderDialogue')  ||
-           event.target == document.getElementById('clearkeyRequestHeaderDialogue')  ){
+           event.target == document.getElementById('clearkeyRequestHeaderDialogue')  ||
+           event.target == document.getElementById('additionalClearkeysDialogue')    ){
                event.target.style.display = 'none';
         }
     }
diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index 7431701037..bccd33f171 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -334,8 +334,8 @@
                 <div id="drmPlayreadyLicenseForm" ng-show="drmPlayready.isActive">
                     <label class="options-label">License URL:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.licenseServerUrl">
-                    <label class="options-label">X-AxDRM-Message:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.xAxDrmMessage"> 
+                    <!-- <label class="options-label">X-AxDRM-Message:</label>
+                    <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.xAxDrmMessage">  -->
 
                     <!-- Open Header Dialogue Window -->
                     <button id="playreadyRequestHeaderDialogueBtn" class="btn btn-primary" ng-click="openDialogue('playready')">
@@ -345,7 +345,7 @@
                     <div id="playreadyRequestHeaderDialogue" class="requestHeaderDialogue">
                         <div class="requestHeaderDialogueContent">
                             <button class="close" ng-click="closeDialogue('playready')">&times;</button>
-                            <button class="btn btn-primary" ng-click="addRequestHeader('playready')">Add additional Header</button>
+                            <button class="btn btn-primary" ng-click="addPopupInput('playready')">Add additional Header</button>
 
                             <section ng-repeat="header in playreadyRequestHeaders track by $index" ng-value="{{$index}}">
 
@@ -355,7 +355,7 @@
                                 <label class="options-label">Request Header Value: </label>
                                 <input type="text" class="form-control" placeholder="" 
                                         ng-model="header.value" name="playreadyValue_{{header.id}}">
-                                <button class="btn btn-danger" ng-click="removeRequestHeader('playready', $index)">Remove Header</button>
+                                <button class="btn btn-danger" ng-click="removePopupInput('playready', $index)">Remove Header</button>
 
                             </section>   
                             
@@ -381,8 +381,6 @@
                 <div id="drmWidevineLicenseForm" ng-show="drmWidevine.isActive">
                     <label class="options-label">License URL:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.licenseServerUrl">
-                    <label class="options-label">X-AxDRM-Message:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.xAxDrmMessage">
 
                     <!-- Open Header Dialogue Window -->
                     <button id="widevineRequestHeaderDialogueBtn" class="btn btn-primary" ng-click="openDialogue('widevine')">
@@ -392,7 +390,7 @@
                     <div id="widevineRequestHeaderDialogue" class="requestHeaderDialogue">
                         <div class="requestHeaderDialogueContent">
                             <button class="close" ng-click="closeDialogue('widevine')">&times;</button>
-                            <button class="btn btn-primary" ng-click="addRequestHeader('widevine')">Add additional Header</button>
+                            <button class="btn btn-primary" ng-click="addPopupInput('widevine')">Add additional Header</button>
 
                             <section ng-repeat="header in widevineRequestHeaders track by $index" ng-value="{{$index}}">
 
@@ -402,7 +400,7 @@
                                 <label class="options-label">Request Header Value: </label>
                                 <input type="text" class="form-control" placeholder="" 
                                         ng-model="header.value" name="widevineValue_{{header.id}}">
-                                <button class="btn btn-danger" ng-click="removeRequestHeader('widevine', $index)">Remove Header</button>
+                                <button class="btn btn-danger" ng-click="removePopupInput('widevine', $index)">Remove Header</button>
 
                             </section>   
                             
@@ -435,8 +433,31 @@
                     <div id="drmClearkeyLicenseserverMode" ng-show="drmClearkey.inputMode === true">
                         <label class="options-label">License URL:</label>
                         <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.licenseServerUrl">
-                        <label class="options-label">X-AxDRM-Message:</label>
-                        <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.xAxDrmMessage">
+                    </div>
+
+                    <!-- Open KID=KEY Dialogue Window -->
+                    <button id="additionalClearkeysDialogueBtn" class="btn btn-primary" ng-click="openDialogue('additionalClearkeys')">
+                        Add additional clearkeys</button>
+
+                    <!-- KID=KEY Dialogue Window Content -->
+                    <div id="additionalClearkeysDialogue" class="requestHeaderDialogue">
+                        <div class="requestHeaderDialogueContent">
+                            <button class="close" ng-click="closeDialogue('additionalClearkeys')">&times;</button>
+                            <button class="btn btn-primary" ng-click="addPopupInput('additionalClearkeys')">Add KID=KEY pair</button>
+
+                            <section ng-repeat="clearkey in additionalClearkeyPairs track by $index" ng-value="{{$index}}">
+                                
+
+                                <label class="options-label">clearkeys KID: </label>
+                                <input type="text" class="form-control" placeholder="" 
+                                        ng-model="clearkey.kid" name="clearkeyKID_{{header.id}}">
+                                <label class="options-label">clearkeys KEY: </label>
+                                <input type="text" class="form-control" placeholder="" 
+                                        ng-model="clearkey.key" name="clearkeyKEY_{{header.id}}">
+                                <button class="btn btn-danger" ng-click="removePopupInput('additionalClearkeys', $index)">Remove KID=KEY pair</button>
+                            </section>   
+                            
+                        </div>
                     </div>
 
                     <!-- Open Header Dialogue Window -->
@@ -447,7 +468,7 @@
                     <div id="clearkeyRequestHeaderDialogue" class="requestHeaderDialogue">
                         <div class="requestHeaderDialogueContent">
                             <button class="close" ng-click="closeDialogue('clearkey')">&times;</button>
-                            <button class="btn btn-primary" ng-click="addRequestHeader('clearkey')">Add additional Header</button>
+                            <button class="btn btn-primary" ng-click="addPopupInput('clearkey')">Add additional Header</button>
 
                             <section ng-repeat="header in clearkeyRequestHeaders track by $index" ng-value="{{$index}}">
                                 
@@ -458,7 +479,7 @@
                                 <label class="options-label">Request Header Value: </label>
                                 <input type="text" class="form-control" placeholder="" 
                                         ng-model="header.value" name="clearkeyValue_{{header.id}}">
-                                <button class="btn btn-danger" ng-click="removeRequestHeader('playready', $index)">Remove Header</button>
+                                <button class="btn btn-danger" ng-click="removePopupInput('clearkey', $index)">Remove Header</button>
                             </section>   
                             
                         </div>

From d63334fee15b4b1135eb0c6a075419015d4c8908 Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Mon, 7 Jun 2021 13:26:37 +0200
Subject: [PATCH 06/12] Fixed unintended/missing behaviour when calling
 doLoad() with manually set DRM

---
 samples/dash-if-reference-player/app/main.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index 977df7242e..0d7d40e979 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -679,10 +679,6 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
     $scope.doLoad = function () {
         $scope.initSession();
-        
-        // $scope.handleRequestHeaders();
-        // $scope.setDrm();
-        // $scope.handleClearkeys();
 
         var protData = {};
         // Execute if the loaded video already has preset DRM data
@@ -691,15 +687,14 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
             // Handle preset protection data to be reflected in the UI and work with setDrm()
             $scope.handleProtectionData(protData);
-            $scope.handleRequestHeaders();
-            $scope.handleClearkeys();
+
             // Set DRM options
             $scope.setDrm();
             protData = $scope.protectionData;
-            console.log($scope.protectionData);
         }
         // Execute if setDrm() has been called with manually entered values
         else if ($scope.protectionData !== {}) {
+            $scope.setDrm();
             protData = $scope.protectionData;
         }
         else if ($scope.drmLicenseURL !== '' && $scope.drmKeySystem !== '') {
@@ -907,6 +902,9 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         let drmInputs = [$scope.drmPlayready, $scope.drmWidevine, $scope.drmClearkey];
         let protectionData = {};
 
+        $scope.handleRequestHeaders();
+        $scope.handleClearkeys();
+
         for(let input of drmInputs){
             if(input.isActive){
 

From 15cb96529bca4b5a8df6738e6f61c5b0016df487 Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Mon, 7 Jun 2021 14:30:26 +0200
Subject: [PATCH 07/12] Rollback of unintentional changes to package.json and
 package-lock.json

---
 package-lock.json | 396 ++++++++++++++++++++++++----------------------
 package.json      |   3 +-
 2 files changed, 205 insertions(+), 194 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a5a8619a3f..4368fe932c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -396,28 +396,28 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.3",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
+          "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
-            "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "caniuse-lite": "^1.0.30001181",
+            "colorette": "^1.2.1",
+            "electron-to-chromium": "^1.3.649",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.70"
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001231",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001231.tgz",
-          "integrity": "sha512-WAFFv31GgU4DiwNAy77qMo3nNyycEhH3ikcCVHvkQpPe/fO8Tb2aRYzss8kgyLQBm8mJ7OryW4X6Y4vsBCIqag==",
+          "version": "1.0.30001204",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz",
+          "integrity": "sha512-JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ==",
           "dev": true
         },
         "electron-to-chromium": {
-          "version": "1.3.742",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz",
-          "integrity": "sha512-ihL14knI9FikJmH2XUIDdZFWJxvr14rPSdOhJ7PpS27xbz8qmaRwCwyg/bmFwjWKmWK9QyamiCZVCvXm5CH//Q==",
+          "version": "1.3.702",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.702.tgz",
+          "integrity": "sha512-qJVUKFWQnF6wP7MmTngDkmm8/KPzaiTXNFOAg5j7DSa6J7kPou7mTBqC8jpUOxauQWwHR3pn4dMRdV8IE1xdtA==",
           "dev": true
         },
         "escalade": {
@@ -3246,9 +3246,9 @@
           "dev": true
         },
         "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
           "dev": true
         },
         "ms": {
@@ -3271,9 +3271,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
           "dev": true
         },
         "to-fast-properties": {
@@ -3457,9 +3457,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
           "dev": true
         }
       }
@@ -3471,13 +3471,24 @@
       "dev": true
     },
     "@theintern/common": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@theintern/common/-/common-0.2.4.tgz",
-      "integrity": "sha512-zq1Z/yZp9w6EHcLR+kn2cQ0Iu0/6G9e92Q74GOWGs4ITk07n9D1FQC5MK90nrtbkCt+EUue6QoIl9RUWY3BTCg==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@theintern/common/-/common-0.2.3.tgz",
+      "integrity": "sha512-91kL3C6USiNfumAm5m07HjGdc40IJaNzEczhcdW5T8fjsHVNg8ttVSXCzy5C9BM57WLevVjR5eHUNjEl4foGMQ==",
       "dev": true,
       "requires": {
-        "axios": "~0.21.1",
+        "axios": "~0.19.0",
         "tslib": "~1.9.3"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.19.2",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+          "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+          "dev": true,
+          "requires": {
+            "follow-redirects": "1.5.10"
+          }
+        }
       }
     },
     "@theintern/digdug": {
@@ -3493,9 +3504,9 @@
       }
     },
     "@theintern/leadfoot": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@theintern/leadfoot/-/leadfoot-2.3.3.tgz",
-      "integrity": "sha512-zn7MeYk8G3PIXFVSk7PjyTxllnWCe8vE4dcyHPmlrdunYByI8PF6AaDzK70whoBSkE+LkcxrsUslquHRNsWRCA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@theintern/leadfoot/-/leadfoot-2.3.2.tgz",
+      "integrity": "sha512-NskDofysJMJad5uEYUc7Y3AlP3IdhY3t+H6XyiTDPur/p4pzVvKGGoCygE5FsN/K26i0XOmhNEIOwJtOMh47Hg==",
       "dev": true,
       "requires": {
         "@theintern/common": "~0.2.3",
@@ -3959,9 +3970,9 @@
       }
     },
     "acorn": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
       "dev": true
     },
     "acorn-jsx": {
@@ -4293,23 +4304,6 @@
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
       "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
-    "axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
-      "dev": true,
-      "requires": {
-        "follow-redirects": "^1.10.0"
-      },
-      "dependencies": {
-        "follow-redirects": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-          "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
-          "dev": true
-        }
-      }
-    },
     "babel": {
       "version": "5.8.38",
       "resolved": "https://registry.npmjs.org/babel/-/babel-5.8.38.tgz",
@@ -4422,15 +4416,6 @@
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
           "dev": true
-        },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.0.0"
-          }
         }
       }
     },
@@ -5375,7 +5360,8 @@
         },
         "kind-of": {
           "version": "6.0.2",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
           "dev": true
         }
       }
@@ -5875,12 +5861,20 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "catharsis": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
-      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+      "version": "0.8.11",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz",
+      "integrity": "sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.15"
+        "lodash": "^4.17.14"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "dev": true
+        }
       }
     },
     "center-align": {
@@ -6324,28 +6318,28 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.3",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
+          "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
-            "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "caniuse-lite": "^1.0.30001181",
+            "colorette": "^1.2.1",
+            "electron-to-chromium": "^1.3.649",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.70"
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001231",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001231.tgz",
-          "integrity": "sha512-WAFFv31GgU4DiwNAy77qMo3nNyycEhH3ikcCVHvkQpPe/fO8Tb2aRYzss8kgyLQBm8mJ7OryW4X6Y4vsBCIqag==",
+          "version": "1.0.30001205",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz",
+          "integrity": "sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og==",
           "dev": true
         },
         "electron-to-chromium": {
-          "version": "1.3.742",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz",
-          "integrity": "sha512-ihL14knI9FikJmH2XUIDdZFWJxvr14rPSdOhJ7PpS27xbz8qmaRwCwyg/bmFwjWKmWK9QyamiCZVCvXm5CH//Q==",
+          "version": "1.3.704",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.704.tgz",
+          "integrity": "sha512-6cz0jvawlUe4h5AbfQWxPzb+8LzVyswGAWiGc32EJEmfj39HTQyNPkLXirc7+L4x5I6RgRkzua8Ryu5QZqc8cA==",
           "dev": true
         },
         "escalade": {
@@ -6693,9 +6687,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
           "dev": true
         }
       }
@@ -6873,9 +6867,9 @@
       "dev": true
     },
     "dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "requires": {
         "ip": "^1.1.0",
@@ -6992,32 +6986,18 @@
       "dev": true
     },
     "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "dev": true
-        }
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
       }
     },
     "emoji-regex": {
@@ -7108,6 +7088,11 @@
         "prr": "~1.0.1"
       }
     },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
     "escalade": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
@@ -9241,9 +9226,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
           "dev": true
         },
         "mime-db": {
@@ -10043,25 +10028,25 @@
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "jsdoc": {
-      "version": "3.6.7",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz",
-      "integrity": "sha512-sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw==",
+      "version": "3.6.6",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz",
+      "integrity": "sha512-znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.9.4",
         "bluebird": "^3.7.2",
-        "catharsis": "^0.9.0",
+        "catharsis": "^0.8.11",
         "escape-string-regexp": "^2.0.0",
         "js2xmlparser": "^4.0.1",
         "klaw": "^3.0.0",
         "markdown-it": "^10.0.0",
         "markdown-it-anchor": "^5.2.7",
-        "marked": "^2.0.3",
+        "marked": "^0.8.2",
         "mkdirp": "^1.0.4",
         "requizzle": "^0.2.3",
         "strip-json-comments": "^3.1.0",
         "taffydb": "2.6.2",
-        "underscore": "~1.13.1"
+        "underscore": "~1.10.2"
       },
       "dependencies": {
         "bluebird": {
@@ -10081,6 +10066,18 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
           "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
           "dev": true
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
+        "underscore": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
+          "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==",
+          "dev": true
         }
       }
     },
@@ -10367,9 +10364,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
     },
     "lodash.clonedeep": {
       "version": "4.5.0",
@@ -10408,9 +10405,9 @@
       "dev": true
     },
     "lodash.mergewith": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
-      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
       "dev": true
     },
     "lodash.sortby": {
@@ -10532,9 +10529,9 @@
       "dev": true
     },
     "marked": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.6.tgz",
-      "integrity": "sha512-S2mYj0FzTQa0dLddssqwRVW4EOJOVJ355Xm2Vcbm+LU7GQRGWvwbO5K87OaPSOux2AwTSgtPPaXmc8sDPrhn2A==",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz",
+      "integrity": "sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==",
       "dev": true
     },
     "math-random": {
@@ -10657,18 +10654,18 @@
       "dev": true
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+      "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
       "dev": true,
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^1.0.0"
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
       "dev": true
     },
     "mississippi": {
@@ -10690,9 +10687,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -10711,12 +10708,20 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.5"
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
       }
     },
     "mocha": {
@@ -10784,21 +10789,6 @@
             "sigmund": "~1.0.0"
           }
         },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
         "ms": {
           "version": "0.7.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
@@ -10934,9 +10924,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
           "dev": true
         }
       }
@@ -11890,9 +11880,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
           "dev": true
         }
       }
@@ -12199,9 +12189,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
           "dev": true
         },
         "micromatch": {
@@ -12622,9 +12612,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
           "dev": true
         },
         "request-promise-core": {
@@ -12663,6 +12653,14 @@
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "dev": true
+        }
       }
     },
     "resolve": {
@@ -12942,9 +12940,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -13236,7 +13234,8 @@
         },
         "kind-of": {
           "version": "6.0.2",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
           "dev": true
         }
       }
@@ -13562,9 +13561,9 @@
       }
     },
     "ssri": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
       "dev": true,
       "requires": {
         "figgy-pudding": "^3.5.1"
@@ -13765,12 +13764,6 @@
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true
     },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
-    },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -14239,12 +14232,6 @@
         "through": "^2.3.8"
       }
     },
-    "underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
-      "dev": true
-    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -14274,15 +14261,38 @@
       "dev": true
     },
     "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
+        "set-value": "^0.4.3"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
+          }
+        }
       }
     },
     "unique-filename": {
@@ -16341,9 +16351,9 @@
       }
     },
     "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
       "dev": true
     },
     "whatwg-encoding": {
@@ -16577,9 +16587,9 @@
           }
         },
         "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "version": "5.0.2",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.2.tgz",
+          "integrity": "sha512-CkwaeZw6dQgqgPGeTWKMXCRmMcBgETFlTml1+ZOO+q7kGst8NREJ+eWwFNPVUQ4QGdAaklbqCZHH6Zuep1RjiA==",
           "dev": true
         },
         "yargs-parser": {
diff --git a/package.json b/package.json
index ec7265d4b6..44ed801b56 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "ink-docstrap": "^1.3.2",
     "intern": "4.8.7",
     "istanbul": "^0.4.5",
-    "jsdoc": "^3.6.7",
+    "jsdoc": "^3.6.2",
     "jsdom": "^13.2.0",
     "mocha": "^2.3.4",
     "replace-in-file": "^6.2.0",
@@ -50,6 +50,7 @@
   },
   "dependencies": {
     "codem-isoboxer": "0.3.6",
+    "es6-promise": "^4.2.8",
     "fast-deep-equal": "2.0.1",
     "html-entities": "^1.2.1",
     "imsc": "^1.0.2",

From 2c18ef7d2ff1c0cc6dad4024200045b74a6c226d Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Mon, 7 Jun 2021 15:18:50 +0200
Subject: [PATCH 08/12] Removed default server-url

---
 samples/dash-if-reference-player/app/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index 0d7d40e979..347eded486 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -189,7 +189,7 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     $scope.drmPlayready = {
         isActive: false,
         drmKeySystem: 'com.microsoft.playready',
-        licenseServerUrl: 'https://drm-playready-licensing.axtest.net/AcquireLicense',
+        licenseServerUrl: '',
         httpRequestHeaders: {},
         priority: 1
     }
@@ -197,7 +197,7 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     $scope.drmWidevine = {
         isActive: false,
         drmKeySystem: 'com.widevine.alpha',
-        licenseServerUrl: 'https://drm-widevine-licensing.axtest.net/AcquireLicense',
+        licenseServerUrl: '',
         httpRequestHeaders: {},
         priority: 0
     }

From 11359bcbfe37141828cc977e48eee72562d3ceb5 Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Tue, 8 Jun 2021 12:49:14 +0200
Subject: [PATCH 09/12] Removed commented code, added hr element between each
 key-value pair in dialogue windows

---
 .../dash-if-reference-player/app/css/main.css |  7 ++++++
 samples/dash-if-reference-player/index.html   | 23 ++++---------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/samples/dash-if-reference-player/app/css/main.css b/samples/dash-if-reference-player/app/css/main.css
index aad7ea8c0b..425a1f4fcf 100644
--- a/samples/dash-if-reference-player/app/css/main.css
+++ b/samples/dash-if-reference-player/app/css/main.css
@@ -620,6 +620,13 @@ DRM Header Dialogue
     width: 80%; /* Could be more or less, depending on screen size */
 }
 
+.modal-hr {
+    border: none;
+    height: 1px;
+    color: #333;
+    background-color: #333;
+}
+
 .close {
     color: rgb(255, 0, 0);
     float: right;
diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index f8c27cfed4..8092ad8abe 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -343,8 +343,6 @@
                 <div id="drmPlayreadyLicenseForm" ng-show="drmPlayready.isActive">
                     <label class="options-label">License URL:</label>
                     <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.licenseServerUrl">
-                    <!-- <label class="options-label">X-AxDRM-Message:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.xAxDrmMessage">  -->
 
                     <!-- Open Header Dialogue Window -->
                     <button id="playreadyRequestHeaderDialogueBtn" class="btn btn-primary" ng-click="openDialogue('playready')">
@@ -365,7 +363,7 @@
                                 <input type="text" class="form-control" placeholder="" 
                                         ng-model="header.value" name="playreadyValue_{{header.id}}">
                                 <button class="btn btn-danger" ng-click="removePopupInput('playready', $index)">Remove Header</button>
-
+                                <hr class="modal-hr">
                             </section>   
                             
                         </div>
@@ -410,7 +408,7 @@
                                 <input type="text" class="form-control" placeholder="" 
                                         ng-model="header.value" name="widevineValue_{{header.id}}">
                                 <button class="btn btn-danger" ng-click="removePopupInput('widevine', $index)">Remove Header</button>
-
+                                <hr class="modal-hr">
                             </section>   
                             
                         </div>
@@ -464,6 +462,7 @@
                                 <input type="text" class="form-control" placeholder="" 
                                         ng-model="clearkey.key" name="clearkeyKEY_{{header.id}}">
                                 <button class="btn btn-danger" ng-click="removePopupInput('additionalClearkeys', $index)">Remove KID=KEY pair</button>
+                                <hr class="modal-hr">
                             </section>   
                             
                         </div>
@@ -489,6 +488,7 @@
                                 <input type="text" class="form-control" placeholder="" 
                                         ng-model="header.value" name="clearkeyValue_{{header.id}}">
                                 <button class="btn btn-danger" ng-click="removePopupInput('clearkey', $index)">Remove Header</button>
+                                <hr class="modal-hr">
                             </section>   
                             
                         </div>
@@ -531,21 +531,6 @@
                     </label>
                 </div>
             </div>
-                <!-- <div class="dropdown" data-toggle="tooltip" data-placement="left"
-                     title="Please select a DRM Key System">
-                    <button class="btn btn-primary dropdown-toggle" type="button" id="menu1" data-toggle="dropdown">DRM
-                        KeySystem
-                        <span class="caret"></span>
-                    </button>
-                    <ul class="dropdown-menu" role="menu" aria-labelledby="menu1">
-                        <li ng-repeat="item in drmKeySystems"><a ng-click="setDrmKeySystem(item)">{{item}}</a></li>
-                    </ul>
-                </div>
-                <p><label class="options-label">{{drmKeySystem}}</label></p>
-                <div id="drmLicenseForm" ng-show="drmKeySystem">
-                    <label class="options-label">License URL:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmLicenseURL">
-                </div>-->
             </div> 
         </div>
         <div class="options-item">

From e1ba981f30e95288e472444342ff8b243f88ec73 Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Tue, 8 Jun 2021 13:01:42 +0200
Subject: [PATCH 10/12] Changed time the UI is adjusted from loading the video
 to selecting the URL.

---
 samples/dash-if-reference-player/app/main.js | 36 +++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index dd8f0edb99..e5b2d889dd 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -223,6 +223,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
     $scope.additionalClearkeyPairs = [];
 
+    $scope.protData = {};
+
 
     $scope.isDynamic = false;
 
@@ -695,6 +697,13 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
     $scope.setStream = function (item) {
         $scope.selectedItem = JSON.parse(JSON.stringify(item));
+        $scope.protData = {};
+        // Execute if the loaded video already has preset DRM data
+        if ($scope.selectedItem.hasOwnProperty('protData')) {
+            $scope.protData = $scope.selectedItem.protData;
+            // Handle preset protection data to be reflected in the UI and work with setDrm()
+            $scope.handleProtectionData($scope.protData);
+        }
     };
 
     $scope.toggleOptionsGutter = function (bool) {
@@ -714,41 +723,36 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     $scope.doLoad = function () {
         $scope.initSession();
 
-        var protData = {};
         // Execute if the loaded video already has preset DRM data
         if ($scope.selectedItem.hasOwnProperty('protData')) {
-            protData = $scope.selectedItem.protData;
-
-            // Handle preset protection data to be reflected in the UI and work with setDrm()
-            $scope.handleProtectionData(protData);
 
             // Set DRM options
             $scope.setDrm();
-            protData = $scope.protectionData;
+            $scope.protData = $scope.protectionData;
         }
         // Execute if setDrm() has been called with manually entered values
         else if ($scope.protectionData !== {}) {
             $scope.setDrm();
-            protData = $scope.protectionData;
+            $scope.protData = $scope.protectionData;
         }
         else if ($scope.drmLicenseURL !== '' && $scope.drmKeySystem !== '') {
-            protData[$scope.drmKeySystem] = {
+            $scope.protData[$scope.drmKeySystem] = {
                 serverURL: $scope.drmLicenseURL
             };
         } else {
-            protData = null;
+            $scope.protData = null;
         }
 
         // Check if persistent license session ID is stored for current stream
         var sessionId = $scope.persistentSessionId[$scope.selectedItem.url];
         if (sessionId) {
-            if (!protData) {
-                protData = {};
+            if (!$scope.protData) {
+                $scope.protData = {};
             }
-            if (!protData[$scope.selectedKeySystem]) {
-                protData[$scope.selectedKeySystem] = {};
+            if (!$scope.protData[$scope.selectedKeySystem]) {
+                $scope.protData[$scope.selectedKeySystem] = {};
             }
-            protData[$scope.selectedKeySystem].sessionId = sessionId;
+            $scope.protData[$scope.selectedKeySystem].sessionId = sessionId;
         }
 
         var config = {
@@ -826,9 +830,9 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         $scope.controlbar.reset();
         $scope.conformanceViolations = [];
         if ($scope.isCasting) {
-            loadCastMedia($scope.selectedItem.url, protData);
+            loadCastMedia($scope.selectedItem.url, $scope.protData);
         } else {
-            $scope.player.setProtectionData(protData);
+            $scope.player.setProtectionData($scope.protData);
             $scope.player.attachSource($scope.selectedItem.url);
         }
         if ($scope.initialSettings.audio) {

From 17bd00af8c4fe3a0028db8d48490fdcca7dc2a33 Mon Sep 17 00:00:00 2001
From: ShikiSeiren <yamitepes@gmail.com>
Date: Tue, 8 Jun 2021 13:30:42 +0200
Subject: [PATCH 11/12] Fixed old DRM data persisting on selecting a new
 stream.

---
 .../dash-if-reference-player/app/css/main.css  |  4 ++++
 samples/dash-if-reference-player/app/main.js   | 18 ++++++++++++++++++
 samples/dash-if-reference-player/index.html    |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/samples/dash-if-reference-player/app/css/main.css b/samples/dash-if-reference-player/app/css/main.css
index 425a1f4fcf..6ef14cf2c0 100644
--- a/samples/dash-if-reference-player/app/css/main.css
+++ b/samples/dash-if-reference-player/app/css/main.css
@@ -620,6 +620,10 @@ DRM Header Dialogue
     width: 80%; /* Could be more or less, depending on screen size */
 }
 
+.dialogue-btn{
+    margin-bottom: 2px;
+}
+
 .modal-hr {
     border: none;
     height: 1px;
diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index e5b2d889dd..35fe2380e2 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -698,6 +698,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     $scope.setStream = function (item) {
         $scope.selectedItem = JSON.parse(JSON.stringify(item));
         $scope.protData = {};
+        //Reset previous data
+        $scope.clearDRM();
         // Execute if the loaded video already has preset DRM data
         if ($scope.selectedItem.hasOwnProperty('protData')) {
             $scope.protData = $scope.selectedItem.protData;
@@ -706,6 +708,22 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         }
     };
 
+    $scope.clearDRM = function(){
+        //Reset previous data
+        let drmList = [$scope.drmPlayready, $scope.drmWidevine, $scope.drmClearkey];
+        for(let drm of drmList){
+            drm.isActive = false;
+            drm.licenseServerUrl = '';
+            drm.kid = '';
+            drm.key = '';
+        }
+        $scope.playreadyRequestHeaders = [];
+        $scope.widevineRequestHeaders = [];
+        $scope.clearkeyRequestHeaders = [];
+        $scope.clearkeys = [];
+        $scope.additionalClearkeyPairs = [];
+    }
+
     $scope.toggleOptionsGutter = function (bool) {
         $scope.optionsGutter = bool;
     };
diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index 8092ad8abe..76c89c0a04 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -443,7 +443,7 @@
                     </div>
 
                     <!-- Open KID=KEY Dialogue Window -->
-                    <button id="additionalClearkeysDialogueBtn" class="btn btn-primary" ng-click="openDialogue('additionalClearkeys')">
+                    <button id="additionalClearkeysDialogueBtn" class="btn btn-primary dialogue-btn" ng-click="openDialogue('additionalClearkeys')">
                         Add additional clearkeys</button>
 
                     <!-- KID=KEY Dialogue Window Content -->

From 319da84cee7d6180b2edacf9dfe01d4888cdbf5a Mon Sep 17 00:00:00 2001
From: dsilhavy <daniel.silhavy@fokus.fraunhofer.de>
Date: Wed, 9 Jun 2021 09:38:53 +0200
Subject: [PATCH 12/12] Minor Ui changes for DRM menu

---
 samples/dash-if-reference-player/index.html | 437 ++++++++++++--------
 1 file changed, 256 insertions(+), 181 deletions(-)

diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index 76c89c0a04..bb66489682 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -333,205 +333,280 @@
         <div class="options-item">
             <div class="options-item-title">DRM Options</div>
             <div class="options-item-body">
-            <form>
-                <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
-                       title="">
-                    <input type="checkbox" ng-model="drmPlayready.isActive">
-                    Playready
-                </label>
+                <form>
+                    <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
+                           title="">
+                        <input type="checkbox" ng-model="drmPlayready.isActive">
+                        Playready
+                    </label>
 
-                <div id="drmPlayreadyLicenseForm" ng-show="drmPlayready.isActive">
-                    <label class="options-label">License URL:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.licenseServerUrl">
-
-                    <!-- Open Header Dialogue Window -->
-                    <button id="playreadyRequestHeaderDialogueBtn" class="btn btn-primary" ng-click="openDialogue('playready')">
-                                Add Request-Headers</button>
-
-                    <!-- Header Dialogue Window Content -->
-                    <div id="playreadyRequestHeaderDialogue" class="requestHeaderDialogue">
-                        <div class="requestHeaderDialogueContent">
-                            <button class="close" ng-click="closeDialogue('playready')">&times;</button>
-                            <button class="btn btn-primary" ng-click="addPopupInput('playready')">Add additional Header</button>
-
-                            <section ng-repeat="header in playreadyRequestHeaders track by $index" ng-value="{{$index}}">
-
-                                <label class="options-label">Request Header Key: </label>
-                                <input type="text" class="form-control" placeholder="" 
-                                        ng-model="header.key" name="playreadyKey_{{header.id}}">
-                                <label class="options-label">Request Header Value: </label>
-                                <input type="text" class="form-control" placeholder="" 
-                                        ng-model="header.value" name="playreadyValue_{{header.id}}">
-                                <button class="btn btn-danger" ng-click="removePopupInput('playready', $index)">Remove Header</button>
-                                <hr class="modal-hr">
-                            </section>   
-                            
-                        </div>
-                    </div>
+                    <div id="drmPlayreadyLicenseForm" ng-show="drmPlayready.isActive">
+                        <label class="options-label">License URL:</label>
+                        <input type="text" class="form-control" placeholder="" ng-model="drmPlayready.licenseServerUrl">
 
-                    <div ng-show="prioritiesEnabled">
-                        <label class="options-label">Priority</label>
-                        <select name="playreadyPriority" ng-model="drmPlayready.priority" ng-init="drmPlayready.priority='1'">
-                            <option value=0>0</option>
-                            <option value=1>1</option>
-                            <option value=2>2</option>
-                        </select>
-                    </div>         
-                </div>
+                        <!-- Open Header Dialogue Window -->
+                        <button id="playreadyRequestHeaderDialogueBtn" class="btn btn-primary"
+                                ng-click="openDialogue('playready')">
+                            Add Request-Headers
+                        </button>
 
-                <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
-                       title="">
-                    <input type="checkbox" ng-model="drmWidevine.isActive">
-                    Widevine
-                </label>
+                        <!-- Header Dialogue Window Content -->
+                        <div id="playreadyRequestHeaderDialogue" class="requestHeaderDialogue">
+                            <div class="requestHeaderDialogueContent">
+                                <button class="close" ng-click="closeDialogue('playready')">&times;</button>
+                                <button class="btn btn-primary" ng-click="addPopupInput('playready')">Add additional
+                                    Header
+                                </button>
+
+                                <div ng-repeat="header in playreadyRequestHeaders track by $index"
+                                     ng-value="{{$index}}">
+                                    <div class="row">
+                                        <div class="col-md-12 col-lg-6 col-lg-offset-3">
+                                            <label class="options-label">Request Header Key: </label>
+                                            <input type="text" class="form-control" placeholder=""
+                                                   ng-model="header.key" name="playreadyKey_{{header.id}}">
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-12 col-lg-6 col-lg-offset-3">
+                                            <label class="options-label">Request Header Value: </label>
+                                            <input type="text" class="form-control" placeholder=""
+                                                   ng-model="header.value" name="playreadyValue_{{header.id}}">
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-4 col-lg-2 col-lg-offset-3">
+                                            <button class="btn btn-danger"
+                                                    ng-click="removePopupInput('playready', $index)">
+                                                Remove Header
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
 
-                <div id="drmWidevineLicenseForm" ng-show="drmWidevine.isActive">
-                    <label class="options-label">License URL:</label>
-                    <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.licenseServerUrl">
-
-                    <!-- Open Header Dialogue Window -->
-                    <button id="widevineRequestHeaderDialogueBtn" class="btn btn-primary" ng-click="openDialogue('widevine')">
-                        Add Request-Headers</button>
-
-                    <!-- Header Dialogue Window Content -->
-                    <div id="widevineRequestHeaderDialogue" class="requestHeaderDialogue">
-                        <div class="requestHeaderDialogueContent">
-                            <button class="close" ng-click="closeDialogue('widevine')">&times;</button>
-                            <button class="btn btn-primary" ng-click="addPopupInput('widevine')">Add additional Header</button>
-
-                            <section ng-repeat="header in widevineRequestHeaders track by $index" ng-value="{{$index}}">
-
-                                <label class="options-label">Request Header Key: </label>
-                                <input type="text" class="form-control" placeholder="" 
-                                        ng-model="header.key" name="widevineKey_{{header.id}}">
-                                <label class="options-label">Request Header Value: </label>
-                                <input type="text" class="form-control" placeholder="" 
-                                        ng-model="header.value" name="widevineValue_{{header.id}}">
-                                <button class="btn btn-danger" ng-click="removePopupInput('widevine', $index)">Remove Header</button>
-                                <hr class="modal-hr">
-                            </section>   
-                            
+                            </div>
+                        </div>
+
+                        <div ng-show="prioritiesEnabled">
+                            <label class="options-label">Priority</label>
+                            <select name="playreadyPriority" ng-model="drmPlayready.priority"
+                                    ng-init="drmPlayready.priority='1'">
+                                <option value=0>0</option>
+                                <option value=1>1</option>
+                                <option value=2>2</option>
+                            </select>
                         </div>
                     </div>
-                    
-                    <div ng-show="prioritiesEnabled">
-                        <label class="options-label">Priority</label>
-                        <select name="widevinePriority" ng-model="drmWidevine.priority" ng-init="drmWidevine.priority='0'">
-                            <option value=0>0</option>
-                            <option value=1>1</option>
-                            <option value=2>2</option>
-                        </select>
-                    </div>
-                </div>
 
-                <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
-                       title="">
-                    <input type="checkbox" ng-model="drmClearkey.isActive">
-                    Clearkey
-                </label>
+                    <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
+                           title="">
+                        <input type="checkbox" ng-model="drmWidevine.isActive">
+                        Widevine
+                    </label>
 
-                <div id="drmClearkeyLicenseForm" ng-show="drmClearkey.isActive">
-                    <div id="drmClearkeyKidKeyMode" ng-show="drmClearkey.inputMode === false">
-                        <label class="options-label">Kid:</label>
-                        <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.kid">
-                        <label class="options-label">Key:</label>
-                        <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.key">
-                    </div>
-                    <div id="drmClearkeyLicenseserverMode" ng-show="drmClearkey.inputMode === true">
+                    <div id="drmWidevineLicenseForm" ng-show="drmWidevine.isActive">
                         <label class="options-label">License URL:</label>
-                        <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.licenseServerUrl">
-                    </div>
+                        <input type="text" class="form-control" placeholder="" ng-model="drmWidevine.licenseServerUrl">
+
+                        <!-- Open Header Dialogue Window -->
+                        <button id="widevineRequestHeaderDialogueBtn" class="btn btn-primary"
+                                ng-click="openDialogue('widevine')">
+                            Add Request-Headers
+                        </button>
+
+                        <!-- Header Dialogue Window Content -->
+                        <div id="widevineRequestHeaderDialogue" class="requestHeaderDialogue">
+                            <div class="requestHeaderDialogueContent">
+                                <button class="close" ng-click="closeDialogue('widevine')">&times;</button>
+                                <button class="btn btn-primary" ng-click="addPopupInput('widevine')">Add additional
+                                    Header
+                                </button>
+
+                                <div ng-repeat="header in widevineRequestHeaders track by $index"
+                                     ng-value="{{$index}}">
+                                    <div class="row">
+                                        <div class="col-md-12 col-lg-6 col-lg-offset-3">
+                                            <label class="options-label">Request Header Key: </label>
+                                            <input type="text" class="form-control" placeholder=""
+                                                   ng-model="header.key" name="widevineKey_{{header.id}}">
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-12 col-lg-6 col-lg-offset-3">
+                                            <label class="options-label">Request Header Value: </label>
+                                            <input type="text" class="form-control" placeholder=""
+                                                   ng-model="header.value" name="widevineValue_{{header.id}}">
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-4 col-lg-2 col-lg-offset-3">
+                                            <button class="btn btn-danger"
+                                                    ng-click="removePopupInput('widevine', $index)">
+                                                Remove Header
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
 
-                    <!-- Open KID=KEY Dialogue Window -->
-                    <button id="additionalClearkeysDialogueBtn" class="btn btn-primary dialogue-btn" ng-click="openDialogue('additionalClearkeys')">
-                        Add additional clearkeys</button>
-
-                    <!-- KID=KEY Dialogue Window Content -->
-                    <div id="additionalClearkeysDialogue" class="requestHeaderDialogue">
-                        <div class="requestHeaderDialogueContent">
-                            <button class="close" ng-click="closeDialogue('additionalClearkeys')">&times;</button>
-                            <button class="btn btn-primary" ng-click="addPopupInput('additionalClearkeys')">Add KID=KEY pair</button>
-
-                            <section ng-repeat="clearkey in additionalClearkeyPairs track by $index" ng-value="{{$index}}">
-                                
-
-                                <label class="options-label">clearkeys KID: </label>
-                                <input type="text" class="form-control" placeholder="" 
-                                        ng-model="clearkey.kid" name="clearkeyKID_{{header.id}}">
-                                <label class="options-label">clearkeys KEY: </label>
-                                <input type="text" class="form-control" placeholder="" 
-                                        ng-model="clearkey.key" name="clearkeyKEY_{{header.id}}">
-                                <button class="btn btn-danger" ng-click="removePopupInput('additionalClearkeys', $index)">Remove KID=KEY pair</button>
-                                <hr class="modal-hr">
-                            </section>   
-                            
+                            </div>
                         </div>
-                    </div>
 
-                    <!-- Open Header Dialogue Window -->
-                    <button id="clearkeyRequestHeaderDialogueBtn" class="btn btn-primary" ng-click="openDialogue('clearkey')">
-                        Add Request-Headers</button>
-
-                    <!-- Header Dialogue Window Content -->
-                    <div id="clearkeyRequestHeaderDialogue" class="requestHeaderDialogue">
-                        <div class="requestHeaderDialogueContent">
-                            <button class="close" ng-click="closeDialogue('clearkey')">&times;</button>
-                            <button class="btn btn-primary" ng-click="addPopupInput('clearkey')">Add additional Header</button>
-
-                            <section ng-repeat="header in clearkeyRequestHeaders track by $index" ng-value="{{$index}}">
-                                
-
-                                <label class="options-label">Request Header Key: </label>
-                                <input type="text" class="form-control" placeholder="" 
-                                        ng-model="header.key" name="clearkeyKey_{{header.id}}">
-                                <label class="options-label">Request Header Value: </label>
-                                <input type="text" class="form-control" placeholder="" 
-                                        ng-model="header.value" name="clearkeyValue_{{header.id}}">
-                                <button class="btn btn-danger" ng-click="removePopupInput('clearkey', $index)">Remove Header</button>
-                                <hr class="modal-hr">
-                            </section>   
-                            
+                        <div ng-show="prioritiesEnabled">
+                            <label class="options-label">Priority</label>
+                            <select name="widevinePriority" ng-model="drmWidevine.priority"
+                                    ng-init="drmWidevine.priority='0'">
+                                <option value=0>0</option>
+                                <option value=1>1</option>
+                                <option value=2>2</option>
+                            </select>
                         </div>
                     </div>
 
-                    <div ng-show="prioritiesEnabled">
-                        <label class="options-label">Priority</label>
-                        <select name="clearkeyPriority" ng-model="drmClearkey.priority" ng-init="drmClearkey.priority='2'">
-                            <option value=0>0</option>
-                            <option value=1>1</option>
-                            <option value=2>2</option>
-                        </select>
-                    </div>
-                </div>
-            </form>
-            <div class="sub-options-item">
-                <div class="sub-options-item-title">Priorities</div>
-                <div class="sub-options-item-body">
                     <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
-                       title="Enable DRM-Priorisation">
-                    <input type="checkbox" ng-model="prioritiesEnabled">
-                    DRM Priorisation
-                </label>
-                </div>
-            </div>
-            <div class="sub-options-item">
-                <div class="sub-options-item-title">Clearkey Options</div>
-                <div class="sub-options-item-body">
-                    <label data-toggle="tooltip" data-placement="right"
-                            title="Use KID=Key to specify Clearkey DRM.">
-                        <input type="radio" id="kidKey" autocomplete="off" name="inputMode" checked="checked"
-                                ng-click="toggleInputMode()">
-                        KID=KEY
-                    </label>
-                    <label data-toggle="tooltip" data-placement="right"
-                            title="Use Licenseserver-URL to specify Clearkey DRM">
-                        <input type="radio" id="licenseServer" autocomplete="off" name="inputMode"
-                                ng-click="toggleInputMode()">
-                        License Server
+                           title="">
+                        <input type="checkbox" ng-model="drmClearkey.isActive">
+                        Clearkey
                     </label>
+
+                    <div id="drmClearkeyLicenseForm" ng-show="drmClearkey.isActive">
+                        <div id="drmClearkeyKidKeyMode" ng-show="drmClearkey.inputMode === false">
+                            <label class="options-label">Kid:</label>
+                            <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.kid">
+                            <label class="options-label">Key:</label>
+                            <input type="text" class="form-control" placeholder="" ng-model="drmClearkey.key">
+                        </div>
+                        <div id="drmClearkeyLicenseserverMode" ng-show="drmClearkey.inputMode === true">
+                            <label class="options-label">License URL:</label>
+                            <input type="text" class="form-control" placeholder=""
+                                   ng-model="drmClearkey.licenseServerUrl">
+                        </div>
+
+                        <!-- Open KID=KEY Dialogue Window -->
+                        <button id="additionalClearkeysDialogueBtn" class="btn btn-primary dialogue-btn"
+                                ng-click="openDialogue('additionalClearkeys')">
+                            Add additional clearkeys
+                        </button>
+
+                        <!-- KID=KEY Dialogue Window Content -->
+                        <div id="additionalClearkeysDialogue" class="requestHeaderDialogue">
+                            <div class="requestHeaderDialogueContent">
+                                <button class="close" ng-click="closeDialogue('additionalClearkeys')">&times;</button>
+                                <button class="btn btn-primary" ng-click="addPopupInput('additionalClearkeys')">Add
+                                    KID=KEY pair
+                                </button>
+
+                                <div ng-repeat="clearkey in additionalClearkeyPairs track by $index"
+                                     ng-value="{{$index}}">
+
+                                    <div class="row">
+                                        <div class="col-md-12 col-lg-6 col-lg-offset-3">
+                                            <label class="options-label">KID: </label>
+                                            <input type="text" class="form-control" placeholder=""
+                                                   ng-model="clearkey.kid" name="clearkeyKID_{{header.id}}">
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-12 col-lg-6 col-lg-offset-3">
+                                            <label class="options-label">KEY: </label>
+                                            <input type="text" class="form-control" placeholder=""
+                                                   ng-model="clearkey.key" name="clearkeyKEY_{{header.id}}">
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-4 col-lg-2 col-lg-offset-3">
+                                            <button class="btn btn-danger"
+                                                    ng-click="removePopupInput('additionalClearkeys', $index)">Remove
+                                                KID=KEY
+                                                pair
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Open Header Dialogue Window -->
+                        <button id="clearkeyRequestHeaderDialogueBtn" class="btn btn-primary"
+                                ng-click="openDialogue('clearkey')">
+                            Add Request-Headers
+                        </button>
+
+                        <!-- Header Dialogue Window Content -->
+                        <div id="clearkeyRequestHeaderDialogue" class="requestHeaderDialogue">
+                            <div class="requestHeaderDialogueContent">
+                                <button class="close" ng-click="closeDialogue('clearkey')">&times;</button>
+                                <button class="btn btn-primary" ng-click="addPopupInput('clearkey')">Add additional
+                                    Header
+                                </button>
+
+                                <div ng-repeat="header in clearkeyRequestHeaders track by $index"
+                                     ng-value="{{$index}}">
+
+                                    <div class="row">
+                                        <div class="col-md-12 col-lg-6 col-lg-offset-3">
+                                            <label class="options-label">Request Header Key: </label>
+                                            <input type="text" class="form-control" placeholder=""
+                                                   ng-model="header.key" name="clearkeyKey_{{header.id}}">
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-12 col-lg-6 col-lg-offset-3">
+                                            <label class="options-label">Request Header Value: </label>
+                                            <input type="text" class="form-control" placeholder=""
+                                                   ng-model="header.value" name="clearkeyValue_{{header.id}}">
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-4 col-lg-2 col-lg-offset-3">
+                                            <button class="btn btn-danger"
+                                                    ng-click="removePopupInput('clearkey', $index)">
+                                                Remove Header
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div ng-show="prioritiesEnabled">
+                            <label class="options-label">Priority</label>
+                            <select name="clearkeyPriority" ng-model="drmClearkey.priority"
+                                    ng-init="drmClearkey.priority='2'">
+                                <option value=0>0</option>
+                                <option value=1>1</option>
+                                <option value=2>2</option>
+                            </select>
+                        </div>
+                    </div>
+                </form>
+                <div class="sub-options-item">
+                    <div class="sub-options-item-title">Priorities</div>
+                    <div class="sub-options-item-body">
+                        <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
+                               title="Enable DRM-Priorisation">
+                            <input type="checkbox" ng-model="prioritiesEnabled">
+                            DRM Priorisation
+                        </label>
+                    </div>
+                </div>
+                <div class="sub-options-item">
+                    <div class="sub-options-item-title">Clearkey Options</div>
+                    <div class="sub-options-item-body">
+                        <label data-toggle="tooltip" data-placement="right"
+                               title="Use KID=Key to specify Clearkey DRM.">
+                            <input type="radio" id="kidKey" autocomplete="off" name="inputMode" checked="checked"
+                                   ng-click="toggleInputMode()">
+                            KID=KEY
+                        </label>
+                        <label data-toggle="tooltip" data-placement="right"
+                               title="Use Licenseserver-URL to specify Clearkey DRM">
+                            <input type="radio" id="licenseServer" autocomplete="off" name="inputMode"
+                                   ng-click="toggleInputMode()">
+                            License Server
+                        </label>
+                    </div>
                 </div>
             </div>
-            </div> 
         </div>
         <div class="options-item">
             <div class="options-item-title">Live delay</div>
@@ -545,7 +620,7 @@
                     <input type="checkbox" id="applyServiceDescription" ng-model="applyServiceDescription"
                            ng-change="toggleApplyServiceDescription()" ng-checked="applyServiceDescription">
                     Apply ServiceDescription
-                </label>                
+                </label>
                 <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
                        title="Overwrite the default live delay and honor the SuggestedPresentationDelay attribute in by the manifest">
                     <input type="checkbox" id="useSuggestedPresentationDelay" ng-model="useSuggestedPresentationDelay"