shaka-player 3.3.4 → 4.0.1

package/lib/dash/content_protection.js

@@ -68,7 +68,7 @@ shaka.dash.ContentProtection = class {
 
       if (parsedNonCenc.length) {
         drmInfos = ContentProtection.convertElements_(
-            defaultInit, parsedNonCenc, keySystemsByURI);
+            defaultInit, parsedNonCenc, keySystemsByURI, keyIds);
 
         // If there are no drmInfos after parsing, then add a dummy entry.
         // This may be removed in parseKeyIds.
@@ -180,6 +180,27 @@ shaka.dash.ContentProtection = class {
     return '';
   }
 
+  /**
+   * Gets a ClearKey license URL from a content protection element
+   * containing a custom `clearkey::Laurl` element
+   *
+   * @param {shaka.dash.ContentProtection.Element} element
+   * @return {string}
+   */
+  static getClearKeyLicenseUrl(element) {
+    const clearKeyLaurlNode = shaka.util.XmlUtils.findChildNS(
+        element.node, shaka.dash.ContentProtection.ClearKeyNamespaceUri_,
+        'Laurl',
+    );
+    if (clearKeyLaurlNode &&
+      clearKeyLaurlNode.getAttribute('Lic_type') === 'EME-1.0') {
+      if (clearKeyLaurlNode.textContent) {
+        return clearKeyLaurlNode.textContent;
+      }
+    }
+    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
@@ -335,7 +356,41 @@ shaka.dash.ContentProtection = class {
       0x9a, 0x04, 0xf0, 0x79, 0x98, 0x40, 0x42, 0x86,
       0xab, 0x92, 0xe6, 0x5b, 0xe0, 0x88, 0x5f, 0x95,
     ]);
-    const pssh = shaka.util.Pssh.createPssh(data, systemId);
+    const keyIds = new Set();
+    const psshVersion = 0;
+    const pssh =
+        shaka.util.Pssh.createPssh(data, systemId, keyIds, psshVersion);
+    return [
+      {
+        initData: pssh,
+        initDataType: 'cenc',
+        keyId: element.keyId,
+      },
+    ];
+  }
+
+  /**
+   * 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>}
+   * @private
+   */
+  static getInitDataClearKey_(element, keyIds) {
+    if (keyIds.size == 0) {
+      return null;
+    }
+
+    const systemId = new Uint8Array([
+      0x10, 0x77, 0xef, 0xec, 0xc0, 0xb2, 0x4d, 0x02,
+      0xac, 0xe3, 0x3c, 0x1e, 0x52, 0xe2, 0xfb, 0x4b,
+    ]);
+    const data = new Uint8Array([]);
+    const psshVersion = 1;
+    const pssh =
+         shaka.util.Pssh.createPssh(data, systemId, keyIds, psshVersion);
+
     return [
       {
         initData: pssh,
@@ -351,10 +406,11 @@ shaka.dash.ContentProtection = class {
    * @param {Array.<shaka.extern.InitDataOverride>} defaultInit
    * @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, elements, keySystemsByURI) {
+  static convertElements_(defaultInit, elements, keySystemsByURI, keyIds) {
     const ContentProtection = shaka.dash.ContentProtection;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
     const licenseUrlParsers = ContentProtection.licenseUrlParsers_;
@@ -370,7 +426,14 @@ shaka.dash.ContentProtection = class {
             'Init data must be null or non-empty.');
 
         const proInitData = ContentProtection.getInitDataFromPro_(element);
-        const initData = element.init || defaultInit || proInitData;
+        let clearKeyInitData = null;
+        if (element.schemeUri ===
+              shaka.dash.ContentProtection.ClearKeySchemeUri_) {
+          clearKeyInitData =
+            ContentProtection.getInitDataClearKey_(element, keyIds);
+        }
+        const initData = element.init || defaultInit || proInitData ||
+          clearKeyInitData;
         const info = ManifestParserUtils.createDrmInfo(keySystem, initData);
         const licenseParser = licenseUrlParsers.get(keySystem);
         if (licenseParser) {
@@ -562,7 +625,9 @@ shaka.dash.ContentProtection.licenseUrlParsers_ = new Map()
     .set('com.microsoft.playready.software',
         shaka.dash.ContentProtection.getPlayReadyLicenseUrl)
     .set('com.microsoft.playready.hardware',
-        shaka.dash.ContentProtection.getPlayReadyLicenseUrl);
+        shaka.dash.ContentProtection.getPlayReadyLicenseUrl)
+    .set('org.w3.clearkey',
+        shaka.dash.ContentProtection.getClearKeyLicenseUrl);
 
 /**
  * @const {string}
@@ -577,3 +642,18 @@ shaka.dash.ContentProtection.MP4Protection_ =
  * @private
  */
 shaka.dash.ContentProtection.CencNamespaceUri_ = 'urn:mpeg:cenc:2013';
+
+/**
+ * @const {string}
+ * @private
+ */
+shaka.dash.ContentProtection.ClearKeyNamespaceUri_ =
+  'http://dashif.org/guidelines/clearKey';
+
+
+/**
+ * @const {string}
+ * @private
+ */
+shaka.dash.ContentProtection.ClearKeySchemeUri_ =
+    'urn:uuid:e2719d58-a985-b3c9-781a-b030af78d30e';

package/lib/dash/dash_parser.js

@@ -498,6 +498,7 @@ shaka.dash.DashParser = class {
         imageStreams: this.periodCombiner_.getImageStreams(),
         offlineSessionIds: [],
         minBufferTime: minBufferTime || 0,
+        sequenceMode: false,
       };
 
       // We only need to do clock sync when we're using presentation start
@@ -764,8 +765,8 @@ shaka.dash.DashParser = class {
             // currently support that.  Just choose one.
             // TODO: https://github.com/shaka-project/shaka-player/issues/1528
             stream.trickModeVideo = trickModeSet.streams.find((trickStream) =>
-              shaka.util.MimeUtils.getCodecBase(stream.codecs) ==
-              shaka.util.MimeUtils.getCodecBase(trickStream.codecs));
+              shaka.util.MimeUtils.getNormalizedCodec(stream.codecs) ==
+              shaka.util.MimeUtils.getNormalizedCodec(trickStream.codecs));
           }
         }
       }
@@ -1228,7 +1229,6 @@ shaka.dash.DashParser = class {
     });
     let spatialAudio = false;
     if (hasJoc) {
-      context.representation.mimeType = 'audio/eac3-joc';
       spatialAudio = true;
     }