fix: Prevent exception when PlayReady CDM returns UTF-8 unwrapped mes…

…sage
Dash-Industry-Forum · Apr 19, 2022 · 40dd976 · 40dd976
1 parent 2aad3e7
commit 40dd976
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/streaming/protection/drm/KeySystemPlayReady.js b/src/streaming/protection/drm/KeySystemPlayReady.js
@@ -61,6 +61,13 @@ function KeySystemPlayReady(config) {
             xmlDoc;
         const headers = {};
         const parser = new DOMParser();
+
+        // If message format configured/defaulted to utf-16 AND number of bytes is odd, assume 'unwrapped' raw CDM message.
+        if (messageFormat === 'utf-16' && message && message.byteLength % 2 === 1) {
+            headers['Content-Type'] = 'text/xml; charset=utf-8';
+            return headers;
+        }
+
         const dataview = (messageFormat === 'utf-16') ? new Uint16Array(message) : new Uint8Array(message);
 
         msg = String.fromCharCode.apply(null, dataview);
@@ -89,6 +96,12 @@ function KeySystemPlayReady(config) {
     function getLicenseRequestFromMessage(message) {
         let licenseRequest = null;
         const parser = new DOMParser();
+
+        // If message format configured/defaulted to utf-16 AND number of bytes is odd, assume 'unwrapped' raw CDM message.
+        if (messageFormat === 'utf-16' && message && message.byteLength % 2 === 1) {
+            return message;
+        }
+
         const dataview = (messageFormat === 'utf-16') ? new Uint16Array(message) : new Uint8Array(message);
 
         checkConfig();