shaka-player 4.12.8 → 4.13.0

package/lib/cea/mp4_cea_parser.js

@@ -403,7 +403,7 @@ shaka.cea.Mp4CeaParser.BitstreamFormat = {
   H266: 3,
 };
 
-/** @private {Object.<string, shaka.cea.Mp4CeaParser.BitstreamFormat>} */
+/** @private {Object<string, shaka.cea.Mp4CeaParser.BitstreamFormat>} */
 shaka.cea.Mp4CeaParser.CodecBitstreamMap_ = {
   // AVC
   'avc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,

package/lib/cea/sei_processor.js

@@ -14,7 +14,7 @@ shaka.cea.SeiProcessor = class {
   /**
    * Processes supplemental enhancement information data.
    * @param {!Uint8Array} naluData NALU from which SEI data is to be processed.
-   * @return {!Array.<!Uint8Array>}
+   * @return {!Array<!Uint8Array>}
    */
   process(naluData) {
     const seiPayloads = [];

package/lib/dash/content_protection.js

@@ -8,7 +8,7 @@ goog.provide('shaka.dash.ContentProtection');
 
 goog.require('goog.asserts');
 goog.require('shaka.log');
-goog.require('shaka.util.BufferUtils');
+goog.require('shaka.drm.PlayReady');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.Platform');
@@ -26,18 +26,18 @@ shaka.dash.ContentProtection = class {
   /**
    * Parses info from the ContentProtection elements at the AdaptationSet level.
    *
-   * @param {!Array.<!shaka.extern.xml.Node>} elems
+   * @param {!Array<!shaka.extern.xml.Node>} elements
    * @param {boolean} ignoreDrmInfo
-   * @param {!Object.<string, string>} keySystemsByURI
+   * @param {!Object<string, string>} keySystemsByURI
    * @return {shaka.dash.ContentProtection.Context}
    */
-  static parseFromAdaptationSet(elems, ignoreDrmInfo, keySystemsByURI) {
+  static parseFromAdaptationSet(elements, ignoreDrmInfo, keySystemsByURI) {
     const ContentProtection = shaka.dash.ContentProtection;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
-    const parsed = ContentProtection.parseElements_(elems);
-    /** @type {Array.<shaka.extern.InitDataOverride>} */
+    const parsed = ContentProtection.parseElements_(elements);
+    /** @type {Array<shaka.extern.InitDataOverride>} */
     let defaultInit = null;
-    /** @type {!Array.<shaka.extern.DrmInfo>} */
+    /** @type {!Array<shaka.extern.DrmInfo>} */
     let drmInfos = [];
     let parsedNonCenc = [];
     /** @type {?shaka.dash.ContentProtection.Aes128Info} */
@@ -149,17 +149,17 @@ shaka.dash.ContentProtection = class {
    * Parses the given ContentProtection elements found at the Representation
    * level.  This may update the |context|.
    *
-   * @param {!Array.<!shaka.extern.xml.Node>} elems
+   * @param {!Array<!shaka.extern.xml.Node>} elements
    * @param {shaka.dash.ContentProtection.Context} context
    * @param {boolean} ignoreDrmInfo
-   * @param {!Object.<string, string>} keySystemsByURI
+   * @param {!Object<string, string>} keySystemsByURI
    * @return {?string} The parsed key ID
    */
   static parseFromRepresentation(
-      elems, context, ignoreDrmInfo, keySystemsByURI) {
+      elements, context, ignoreDrmInfo, keySystemsByURI) {
     const ContentProtection = shaka.dash.ContentProtection;
     const repContext = ContentProtection.parseFromAdaptationSet(
-        elems, ignoreDrmInfo, keySystemsByURI);
+        elements, ignoreDrmInfo, keySystemsByURI);
 
     if (context.firstRepresentation) {
       const asUnknown = context.drmInfos.length == 1 &&
@@ -242,11 +242,11 @@ shaka.dash.ContentProtection = class {
         return textContents;
       }
     }
-    const mslaurlNode = shaka.util.TXml.findChildNS(
+    const msLaUrlNode = shaka.util.TXml.findChildNS(
         element.node, 'urn:microsoft', 'laurl');
-    if (mslaurlNode) {
+    if (msLaUrlNode) {
       return StringUtils.htmlUnescape(
-          mslaurlNode.attributes['licenseUrl']) || '';
+          msLaUrlNode.attributes['licenseUrl']) || '';
     }
     return '';
   }
@@ -285,107 +285,6 @@ shaka.dash.ContentProtection = class {
     return '';
   }
 
-  /**
-   * Parses an Array buffer starting at byteOffset for PlayReady Object Records.
-   * Each PRO Record is preceded by its PlayReady Record type and length in
-   * bytes.
-   *
-   * PlayReady Object Record format: https://goo.gl/FTcu46
-   *
-   * @param {!DataView} view
-   * @param {number} byteOffset
-   * @return {!Array.<shaka.dash.ContentProtection.PlayReadyRecord>}
-   * @private
-   */
-  static parseMsProRecords_(view, byteOffset) {
-    const records = [];
-
-    while (byteOffset < view.byteLength - 1) {
-      const type = view.getUint16(byteOffset, true);
-      byteOffset += 2;
-
-      const byteLength = view.getUint16(byteOffset, true);
-      byteOffset += 2;
-
-      if ((byteLength & 1) != 0 || byteLength + byteOffset > view.byteLength) {
-        shaka.log.warning('Malformed MS PRO object');
-        return [];
-      }
-
-      const recordValue = shaka.util.BufferUtils.toUint8(
-          view, byteOffset, byteLength);
-      records.push({
-        type: type,
-        value: recordValue,
-      });
-
-      byteOffset += byteLength;
-    }
-
-    return records;
-  }
-
-  /**
-   * Parses a buffer for PlayReady Objects.  The data
-   * should contain a 32-bit integer indicating the length of
-   * the PRO in bytes.  Following that, a 16-bit integer for
-   * the number of PlayReady Object Records in the PRO.  Lastly,
-   * a byte array of the PRO Records themselves.
-   *
-   * PlayReady Object format: https://goo.gl/W8yAN4
-   *
-   * @param {BufferSource} data
-   * @return {!Array.<shaka.dash.ContentProtection.PlayReadyRecord>}
-   * @private
-   */
-  static parseMsPro_(data) {
-    let byteOffset = 0;
-    const view = shaka.util.BufferUtils.toDataView(data);
-
-    // First 4 bytes is the PRO length (DWORD)
-    const byteLength = view.getUint32(byteOffset, /* littleEndian= */ true);
-    byteOffset += 4;
-
-    if (byteLength != data.byteLength) {
-      // Malformed PRO
-      shaka.log.warning('PlayReady Object with invalid length encountered.');
-      return [];
-    }
-
-    // Skip PRO Record count (WORD)
-    byteOffset += 2;
-
-    // Rest of the data contains the PRO Records
-    const ContentProtection = shaka.dash.ContentProtection;
-    return ContentProtection.parseMsProRecords_(view, byteOffset);
-  }
-
-  /**
-   * PlayReady Header format: https://goo.gl/dBzxNA
-   *
-   * @param {!shaka.extern.xml.Node} xml
-   * @return {string}
-   * @private
-   */
-  static getLaurl_(xml) {
-    const TXml = shaka.util.TXml;
-    // LA_URL element is optional and no more than one is
-    // allowed inside the DATA element. Only absolute URLs are allowed.
-    // If the LA_URL element exists, it must not be empty.
-    for (const elem of TXml.getElementsByTagName(xml, 'DATA')) {
-      if (elem.children) {
-        for (const child of elem.children) {
-          if (child.tagName == 'LA_URL') {
-            return /** @type{string} */(shaka.util.TXml.getTextContents(child));
-          }
-        }
-      }
-    }
-
-    // Not found
-    return '';
-  }
-
   /**
    * Gets a PlayReady license URL from a content protection element
    * containing a PlayReady Header Object
@@ -394,46 +293,43 @@ shaka.dash.ContentProtection = class {
    * @return {string}
    */
   static getPlayReadyLicenseUrl(element) {
-    const dashIfLaurlNode = shaka.util.TXml.findChildNS(
+    const TXml = shaka.util.TXml;
+    const dashIfLaurlNode = TXml.findChildNS(
         element.node, shaka.dash.ContentProtection.DashIfNamespaceUri_,
         'Laurl',
     );
     if (dashIfLaurlNode) {
-      const textContents = shaka.util.TXml.getTextContents(dashIfLaurlNode);
+      const textContents = TXml.getTextContents(dashIfLaurlNode);
       if (textContents) {
         return textContents;
       }
     }
 
-    const proNode = shaka.util.TXml.findChildNS(
+    const proNode = TXml.findChildNS(
         element.node, 'urn:microsoft:playready', 'pro');
-
-    if (!proNode || !shaka.util.TXml.getTextContents(proNode)) {
-      return '';
-    }
-
-    const ContentProtection = shaka.dash.ContentProtection;
-    const PLAYREADY_RECORD_TYPES = ContentProtection.PLAYREADY_RECORD_TYPES;
-
-    const textContent =
-    /** @type {string} */ (shaka.util.TXml.getTextContents(proNode));
-    const bytes = shaka.util.Uint8ArrayUtils.fromBase64(textContent);
-    const records = ContentProtection.parseMsPro_(bytes);
-    const record = records.filter((record) => {
-      return record.type === PLAYREADY_RECORD_TYPES.RIGHTS_MANAGEMENT;
-    })[0];
-
-    if (!record) {
-      return '';
+    if (proNode) {
+      const textContents = TXml.getTextContents(proNode);
+      if (textContents) {
+        return shaka.drm.PlayReady.getLicenseUrl(proNode);
+      }
     }
 
-    const xml = shaka.util.StringUtils.fromUTF16(record.value, true);
-    const rootElement = shaka.util.TXml.parseXmlString(xml, 'WRMHEADER');
-    if (!rootElement) {
-      return '';
+    const psshNode = TXml.findChildNS(
+        element.node, shaka.dash.ContentProtection.CencNamespaceUri_, 'pssh');
+    if (psshNode) {
+      const textContents = TXml.getTextContents(psshNode);
+      if (textContents) {
+        const proData = shaka.util.Pssh.getPsshData(
+            shaka.util.Uint8ArrayUtils.fromBase64(textContents));
+        const proString = shaka.util.Uint8ArrayUtils.toStandardBase64(proData);
+        const reBuildProNode =
+            TXml.parseXmlString('<pro>' + proString + '</pro>');
+        goog.asserts.assert(reBuildProNode, 'Must have pro node');
+        return shaka.drm.PlayReady.getLicenseUrl(reBuildProNode);
+      }
     }
 
-    return ContentProtection.getLaurl_(rootElement);
+    return '';
   }
 
   /**
@@ -441,7 +337,7 @@ shaka.dash.ContentProtection = class {
    * containing a PlayReady Pro Object
    *
    * @param {shaka.dash.ContentProtection.Element} element
-   * @return {?Array.<shaka.extern.InitDataOverride>}
+   * @return {?Array<shaka.extern.InitDataOverride>}
    * @private
    */
   static getInitDataFromPro_(element) {
@@ -453,7 +349,7 @@ shaka.dash.ContentProtection = class {
 
     const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
     const textContent =
-    /** @type{string} */ (shaka.util.TXml.getTextContents(proNode));
+    /** @type {string} */ (shaka.util.TXml.getTextContents(proNode));
     const data = Uint8ArrayUtils.fromBase64(textContent);
     const systemId = new Uint8Array([
       0x9a, 0x04, 0xf0, 0x79, 0x98, 0x40, 0x42, 0x86,
@@ -476,8 +372,8 @@ shaka.dash.ContentProtection = class {
    * Creates ClearKey initData from Default_KID value retrieved from previously
    * parsed ContentProtection tag.
    * @param {shaka.dash.ContentProtection.Element} element
-   * @param {!Set.<string>} keyIds
-   * @return {?Array.<shaka.extern.InitDataOverride>}
+   * @param {!Set<string>} keyIds
+   * @return {?Array<shaka.extern.InitDataOverride>}
    * @private
    */
   static getInitDataClearKey_(element, keyIds) {
@@ -506,12 +402,12 @@ shaka.dash.ContentProtection = class {
   /**
    * Creates DrmInfo objects from the given element.
    *
-   * @param {Array.<shaka.extern.InitDataOverride>} defaultInit
+   * @param {Array<shaka.extern.InitDataOverride>} defaultInit
    * @param {string} encryptionScheme
-   * @param {!Array.<shaka.dash.ContentProtection.Element>} elements
-   * @param {!Object.<string, string>} keySystemsByURI
-   * @param {!Set.<string>} keyIds
-   * @return {!Array.<shaka.extern.DrmInfo>}
+   * @param {!Array<shaka.dash.ContentProtection.Element>} elements
+   * @param {!Object<string, string>} keySystemsByURI
+   * @param {!Set<string>} keyIds
+   * @return {!Array<shaka.extern.DrmInfo>}
    * @private
    */
   static convertElements_(defaultInit, encryptionScheme, elements,
@@ -520,7 +416,7 @@ shaka.dash.ContentProtection = class {
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
     const licenseUrlParsers = ContentProtection.licenseUrlParsers_;
 
-    /** @type {!Array.<shaka.extern.DrmInfo>} */
+    /** @type {!Array<shaka.extern.DrmInfo>} */
     const out = [];
 
     for (const element of elements) {
@@ -557,16 +453,16 @@ shaka.dash.ContentProtection = class {
    * Parses the given ContentProtection elements.  If there is an error, it
    * removes those elements.
    *
-   * @param {!Array.<!shaka.extern.xml.Node>} elems
-   * @return {!Array.<shaka.dash.ContentProtection.Element>}
+   * @param {!Array<!shaka.extern.xml.Node>} elements
+   * @return {!Array<shaka.dash.ContentProtection.Element>}
    * @private
    */
-  static parseElements_(elems) {
-    /** @type {!Array.<shaka.dash.ContentProtection.Element>} */
+  static parseElements_(elements) {
+    /** @type {!Array<shaka.dash.ContentProtection.Element>} */
     const out = [];
 
-    for (const elem of elems) {
-      const parsed = shaka.dash.ContentProtection.parseElement_(elem);
+    for (const element of elements) {
+      const parsed = shaka.dash.ContentProtection.parseElement_(element);
       if (parsed) {
         out.push(parsed);
       }
@@ -590,7 +486,7 @@ shaka.dash.ContentProtection = class {
     let schemeUri = elem.attributes['schemeIdUri'];
     /** @type {?string} */
     let keyId = TXml.getAttributeNS(elem, NS, 'default_KID');
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const psshs = TXml.findChildrenNS(elem, NS, 'pssh')
         .map(TXml.getContents);
 
@@ -613,7 +509,7 @@ shaka.dash.ContentProtection = class {
       }
     }
 
-    /** @type {!Array.<shaka.extern.InitDataOverride>} */
+    /** @type {!Array<shaka.extern.InitDataOverride>} */
     let init = [];
     try {
       // Try parsing PSSH data.
@@ -715,37 +611,11 @@ shaka.dash.ContentProtection = class {
   }
 };
 
-/**
- * @typedef {{
- *   type: number,
- *   value: !Uint8Array
- * }}
- *
- * @description
- * The parsed result of a PlayReady object record.
- *
- * @property {number} type
- *   Type of data stored in the record.
- * @property {!Uint8Array} value
- *   Record content.
- */
-shaka.dash.ContentProtection.PlayReadyRecord;
-
-/**
- * Enum for PlayReady record types.
- * @enum {number}
- */
-shaka.dash.ContentProtection.PLAYREADY_RECORD_TYPES = {
-  RIGHTS_MANAGEMENT: 0x001,
-  RESERVED: 0x002,
-  EMBEDDED_LICENSE: 0x003,
-};
-
 /**
  * @typedef {{
  *   defaultKeyId: ?string,
- *   defaultInit: Array.<shaka.extern.InitDataOverride>,
- *   drmInfos: !Array.<shaka.extern.DrmInfo>,
+ *   defaultInit: Array<shaka.extern.InitDataOverride>,
+ *   drmInfos: !Array<shaka.extern.DrmInfo>,
  *   aes128Info: ?shaka.dash.ContentProtection.Aes128Info,
  *   firstRepresentation: boolean
  * }}
@@ -757,10 +627,10 @@ shaka.dash.ContentProtection.PLAYREADY_RECORD_TYPES = {
  * @property {?string} defaultKeyId
  *   The default key ID to use.  This is used by parseKeyIds as a default.  This
  *   can be null to indicate that there is no default.
- * @property {Array.<shaka.extern.InitDataOverride>} defaultInit
+ * @property {Array<shaka.extern.InitDataOverride>} defaultInit
  *   The default init data override.  This can be null to indicate that there
  *   is no default.
- * @property {!Array.<shaka.extern.DrmInfo>} drmInfos
+ * @property {!Array<shaka.extern.DrmInfo>} drmInfos
  *   The DrmInfo objects.
  * @property {?shaka.dash.ContentProtection.Aes128Info} aes128Info
  *   The AES-128 key info.
@@ -794,7 +664,7 @@ shaka.dash.ContentProtection.Aes128Info;
  *   node: !shaka.extern.xml.Node,
  *   schemeUri: string,
  *   keyId: ?string,
- *   init: Array.<shaka.extern.InitDataOverride>,
+ *   init: Array<shaka.extern.InitDataOverride>,
  *   encryptionScheme: ?string
  * }}
  *
@@ -807,7 +677,7 @@ shaka.dash.ContentProtection.Aes128Info;
  *   The scheme URI.
  * @property {?string} keyId
  *   The default key ID, if present.
- * @property {Array.<shaka.extern.InitDataOverride>} init
+ * @property {Array<shaka.extern.InitDataOverride>} init
  *   The init data, if present.  If there is no init data, it will be null.  If
  *   this is non-null, there is at least one element.
  * @property {?string} encryptionScheme
@@ -818,7 +688,7 @@ shaka.dash.ContentProtection.Element;
 /**
  * A map of key system name to license server url parser.
  *
- * @const {!Map.<string, function(shaka.dash.ContentProtection.Element)>}
+ * @const {!Map<string, function(shaka.dash.ContentProtection.Element)>}
  * @private
  */
 shaka.dash.ContentProtection.licenseUrlParsers_ = new Map()