shaka-player 3.3.4 → 4.0.1

package/lib/hls/manifest_text_parser.js

@@ -179,9 +179,8 @@ shaka.hls.ManifestTextParser = class {
           segmentTags.push(currentMapTag);
         }
         // The URI appears after all of the tags describing the segment.
-        const segment =
-            new shaka.hls.Segment(absoluteSegmentUri, segmentTags,
-                partialSegmentTags);
+        const segment = new shaka.hls.Segment(absoluteSegmentUri, segmentTags,
+            partialSegmentTags);
         segments.push(segment);
         segmentTags = [];
         partialSegmentTags = [];

package/lib/media/drm_engine.js

@@ -14,7 +14,6 @@ goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.Destroyer');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
-goog.require('shaka.util.FairPlayUtils');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.Iterables');
@@ -128,6 +127,9 @@ shaka.media.DrmEngine = class {
 
     /** @private {boolean} */
     this.srcEquals_ = false;
+
+    /** @private {Promise} */
+    this.mediaKeysAttached_ = null;
   }
 
   /** @override */
@@ -184,6 +186,7 @@ shaka.media.DrmEngine = class {
     this.onError_ = () => {};
     this.playerInterface_ = null;
     this.srcEquals_ = false;
+    this.mediaKeysAttached_ = null;
   }
 
   /**
@@ -387,7 +390,59 @@ shaka.media.DrmEngine = class {
   }
 
   /**
-   * Attach MediaKeys to the video element and start processing events.
+   * Attach MediaKeys to the video element
+   * @return {Promise}
+   * @private
+   */
+  async attachMediaKeys_() {
+    if (this.video_.mediaKeys) {
+      return;
+    }
+
+    // An attach process has already started, let's wait it out
+    if (this.mediaKeysAttached_) {
+      await this.mediaKeysAttached_;
+
+      return;
+    }
+
+    try {
+      this.mediaKeysAttached_ = this.video_.setMediaKeys(this.mediaKeys_);
+
+      await this.mediaKeysAttached_;
+    } catch (exception) {
+      goog.asserts.assert(exception instanceof Error, 'Wrong error type!');
+
+      this.onError_(new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.DRM,
+          shaka.util.Error.Code.FAILED_TO_ATTACH_TO_VIDEO,
+          exception.message));
+    }
+
+    this.destroyer_.ensureNotDestroyed();
+  }
+
+  /**
+   * Processes encrypted event and start licence challenging
+   * @return {!Promise}
+   * @private
+   */
+  async onEncryptedEvent_(event) {
+    /**
+     * MediaKeys should be added when receiving an encrypted event. Setting
+     * mediaKeys before could result into encrypted event not being fired on
+     * some browsers
+     */
+    await this.attachMediaKeys_();
+
+    this.newInitData(
+        event.initDataType,
+        shaka.util.BufferUtils.toUint8(event.initData));
+  }
+
+  /**
+   * Start processing events.
    * @param {HTMLMediaElement} video
    * @return {!Promise}
    */
@@ -420,27 +475,30 @@ shaka.media.DrmEngine = class {
           () => this.closeOpenSessions_());
     }
 
-    let setMediaKeys = this.video_.setMediaKeys(this.mediaKeys_);
-    setMediaKeys = setMediaKeys.catch((exception) => {
-      goog.asserts.assert(exception instanceof Error, 'Wrong error type!');
-      return Promise.reject(new shaka.util.Error(
-          shaka.util.Error.Severity.CRITICAL,
-          shaka.util.Error.Category.DRM,
-          shaka.util.Error.Code.FAILED_TO_ATTACH_TO_VIDEO,
-          exception.message));
-    });
+    const manifestInitData = this.currentDrmInfo_.initData.find(
+        (initDataOverride) => initDataOverride.initData.length > 0);
 
-    await setMediaKeys;
-    this.destroyer_.ensureNotDestroyed();
+    /**
+     * We can attach media keys before the playback actually begins when:
+     *  - Using legacy implementations requires MediaKeys to be set before
+     *    having webkitneedkey / msneedkey event, which will be translated as
+     *    an encrypted event by the polyfills
+     *  - Some initData already has been generated (through the manifest)
+     *  - In case of an offline session
+     */
+    if (manifestInitData ||
+        shaka.util.Platform.isMediaKeysPolyfilled() ||
+        this.offlineSessionIds_.length) {
+      await this.attachMediaKeys_();
+    }
 
     this.createOrLoad();
-    if (!this.currentDrmInfo_.initData.length &&
-        !this.offlineSessionIds_.length) {
-      // Explicit init data for any one stream or an offline session is
-      // sufficient to suppress 'encrypted' events for all streams.
-      const cb = (e) => this.newInitData(
-          e.initDataType, shaka.util.BufferUtils.toUint8(e.initData));
-      this.eventManager_.listen(this.video_, 'encrypted', cb);
+
+    // Explicit init data for any one stream or an offline session is
+    // sufficient to suppress 'encrypted' events for all streams.
+    if (!manifestInitData && !this.offlineSessionIds_.length) {
+      this.eventManager_.listen(
+          this.video_, 'encrypted', (e) => this.onEncryptedEvent_(e));
     }
   }
 
@@ -589,6 +647,10 @@ shaka.media.DrmEngine = class {
    * @param {!Uint8Array} initData
    */
   newInitData(initDataType, initData) {
+    if (!initData.length) {
+      return;
+    }
+
     // Suppress duplicate init data.
     // Note that some init data are extremely large and can't portably be used
     // as keys in a dictionary.
@@ -1106,6 +1168,7 @@ shaka.media.DrmEngine = class {
 
     const metadata = {
       initData: null,
+      initDataType: null,
       loaded: false,
       oldExpiration: Infinity,
       updatePromise: null,
@@ -1182,6 +1245,7 @@ shaka.media.DrmEngine = class {
 
     const metadata = {
       initData: initData,
+      initDataType: initDataType,
       loaded: false,
       oldExpiration: Infinity,
       updatePromise: null,
@@ -1239,23 +1303,6 @@ shaka.media.DrmEngine = class {
     });
   }
 
-  /**
-   * @param {!Uint8Array} initData
-   * @param {string} initDataType
-   * @param {?shaka.extern.DrmInfo} drmInfo
-   * @return {!Uint8Array}
-   */
-  static defaultInitDataTransform(initData, initDataType, drmInfo) {
-    if (initDataType == 'skd') {
-      const cert = drmInfo.serverCertificate;
-      const contentId =
-          shaka.util.FairPlayUtils.defaultGetContentId(initData);
-      initData = shaka.util.FairPlayUtils.initDataTransform(
-          initData, contentId, cert);
-    }
-    return initData;
-  }
-
   /**
    * @param {!MediaKeyMessageEvent} event
    * @private
@@ -1316,6 +1363,11 @@ shaka.media.DrmEngine = class {
     request.method = 'POST';
     request.licenseRequestType = event.messageType;
     request.sessionId = session.sessionId;
+    request.drmInfo = this.currentDrmInfo_;
+    if (metadata) {
+      request.initData = metadata.initData;
+      request.initDataType = metadata.initDataType;
+    }
     // NOTE: allowCrossSiteCredentials can be set in a request filter.
 
     if (shaka.media.DrmEngine.isPlayReadyKeySystem(
@@ -1642,6 +1694,16 @@ shaka.media.DrmEngine = class {
 
     const testSystem = async (keySystem) => {
       try {
+        // Our Polyfill will reject anything apart com.apple.fps key systems.
+        // It seems the Safari modern EME API will allow to request a
+        // MediaKeySystemAccess for the ClearKey CDM, create and update a key
+        // session but playback will never start
+        // Safari bug: https://bugs.webkit.org/show_bug.cgi?id=231006
+        if (keySystem === 'org.w3.clearkey' &&
+            shaka.util.Platform.isSafari()) {
+          throw new Error('Unsupported keySystem');
+        }
+
         const access = await navigator.requestMediaKeySystemAccess(
             keySystem, configs);
 
@@ -2262,6 +2324,7 @@ shaka.media.DrmEngine = class {
  * @typedef {{
  *   loaded: boolean,
  *   initData: Uint8Array,
+ *   initDataType: ?string,
  *   oldExpiration: number,
  *   type: string,
  *   updatePromise: shaka.util.PublicPromise
@@ -2273,6 +2336,8 @@ shaka.media.DrmEngine = class {
  *   does not mean the session is 'usable'.
  * @property {Uint8Array} initData
  *   The init data used to create the session.
+ * @property {?string} initDataType
+ *   The init data type used to create the session.
  * @property {!MediaKeySession} session
  *   The session object.
  * @property {number} oldExpiration

package/lib/media/gap_jumping_controller.js

@@ -11,7 +11,6 @@ goog.require('shaka.media.PresentationTimeline');
 goog.require('shaka.media.StallDetector');
 goog.require('shaka.media.TimeRangesUtils');
 goog.require('shaka.util.EventManager');
-goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IReleasable');
 goog.require('shaka.util.Timer');
 
@@ -33,10 +32,8 @@ shaka.media.GapJumpingController = class {
    *   playable region. The gap jumping controller takes ownership over the
    *   stall detector.
    *   If no stall detection logic is desired, |null| may be provided.
-   * @param {function(!Event)} onEvent Called when an event is raised to be sent
-   *   to the application.
    */
-  constructor(video, timeline, config, stallDetector, onEvent) {
+  constructor(video, timeline, config, stallDetector) {
     /** @private {HTMLMediaElement} */
     this.video_ = video;
 
@@ -46,9 +43,6 @@ shaka.media.GapJumpingController = class {
     /** @private {?shaka.extern.StreamingConfiguration} */
     this.config_ = config;
 
-    /** @private {?function(!Event)} */
-    this.onEvent_ = onEvent;
-
     /** @private {shaka.util.EventManager} */
     this.eventManager_ = new shaka.util.EventManager();
 
@@ -58,9 +52,6 @@ shaka.media.GapJumpingController = class {
     /** @private {number} */
     this.prevReadyState_ = video.readyState;
 
-    /** @private {boolean} */
-    this.didFireLargeGap_ = false;
-
     /**
      * The stall detector tries to keep the playhead moving forward. It is
      * managed by the gap-jumping controller to avoid conflicts. On some
@@ -107,7 +98,6 @@ shaka.media.GapJumpingController = class {
       this.stallDetector_ = null;
     }
 
-    this.onEvent_ = null;
     this.timeline_ = null;
     this.video_ = null;
   }
@@ -128,7 +118,6 @@ shaka.media.GapJumpingController = class {
   onSeeking() {
     this.seekingEventReceived_ = true;
     this.hadSegmentAppended_ = false;
-    this.didFireLargeGap_ = false;
   }
 
 
@@ -165,7 +154,6 @@ shaka.media.GapJumpingController = class {
     // When the ready state changes, we have moved on, so we should fire the
     // large gap event if we see one.
     if (this.video_.readyState != this.prevReadyState_) {
-      this.didFireLargeGap_ = false;
       this.prevReadyState_ = this.video_.readyState;
     }
 
@@ -175,7 +163,6 @@ shaka.media.GapJumpingController = class {
     }
 
 
-    const smallGapLimit = this.config_.smallGapLimit;
     const currentTime = this.video_.currentTime;
     const buffered = this.video_.buffered;
     const gapDetectionThreshold = this.config_.gapDetectionThreshold;
@@ -203,8 +190,6 @@ shaka.media.GapJumpingController = class {
     }
 
     const jumpSize = jumpTo - currentTime;
-    const isGapSmall = jumpSize <= smallGapLimit;
-    let jumpLargeGap = false;
 
     // If we jump to exactly the gap start, we may detect a small gap due to
     // rounding errors or browser bugs.  We can ignore these extremely small
@@ -213,37 +198,17 @@ shaka.media.GapJumpingController = class {
       return;
     }
 
-    if (!isGapSmall && !this.didFireLargeGap_) {
-      this.didFireLargeGap_ = true;
-
-      // Event firing is synchronous.
-      const data = new Map()
-          .set('currentTime', currentTime)
-          .set('gapSize', jumpSize);
-      const event = new shaka.util.FakeEvent('largegap', data);
-      event.cancelable = true;
-      this.onEvent_(event);
-
-      if (this.config_.jumpLargeGaps && !event.defaultPrevented) {
-        jumpLargeGap = true;
-      } else {
-        shaka.log.info('Ignoring large gap at', currentTime, 'size', jumpSize);
-      }
+    if (gapIndex == 0) {
+      shaka.log.info(
+          'Jumping forward', jumpSize,
+          'seconds because of gap before start time of', jumpTo);
+    } else {
+      shaka.log.info(
+          'Jumping forward', jumpSize, 'seconds because of gap starting at',
+          buffered.end(gapIndex - 1), 'and ending at', jumpTo);
     }
 
-    if (isGapSmall || jumpLargeGap) {
-      if (gapIndex == 0) {
-        shaka.log.info(
-            'Jumping forward', jumpSize,
-            'seconds because of gap before start time of', jumpTo);
-      } else {
-        shaka.log.info(
-            'Jumping forward', jumpSize, 'seconds because of gap starting at',
-            buffered.end(gapIndex - 1), 'and ending at', jumpTo);
-      }
-
-      this.video_.currentTime = jumpTo;
-    }
+    this.video_.currentTime = jumpTo;
   }
 };