shaka-player 4.1.3 → 4.2.0

package/lib/media/drm_engine.js

@@ -1668,8 +1668,6 @@ shaka.media.DrmEngine = class {
       'com.widevine.alpha',
       'com.microsoft.playready',
       'com.microsoft.playready.recommendation',
-      'com.apple.fps.3_0',
-      'com.apple.fps.2_0',
       'com.apple.fps.1_0',
       'com.apple.fps',
       'com.adobe.primetime',

package/lib/media/segment_index.js

@@ -529,6 +529,14 @@ shaka.media.SegmentIterator = class {
     this.currentPartialPosition_ = partialSegmentIndex;
   }
 
+  /**
+   * @return {number}
+   * @export
+   */
+  currentPosition() {
+    return this.currentPosition_;
+  }
+
   /**
    * @return {shaka.media.SegmentReference}
    * @export

package/lib/media/segment_reference.js

@@ -166,12 +166,15 @@ shaka.media.SegmentReference = class {
    * @param {shaka.media.SegmentReference.Status=} status
    *  The segment status is used to indicate that a segment does not exist or is
    *  not available.
+   * @param {?shaka.extern.HlsAes128Key=} hlsAes128Key
+   *  The segment's AES-128-CBC full segment encryption key and iv.
    */
   constructor(
       startTime, endTime, uris, startByte, endByte, initSegmentReference,
       timestampOffset, appendWindowStart, appendWindowEnd,
       partialReferences = [], tilesLayout = '', tileDuration = null,
-      syncTime = null, status = shaka.media.SegmentReference.Status.AVAILABLE) {
+      syncTime = null, status = shaka.media.SegmentReference.Status.AVAILABLE,
+      hlsAes128Key = null) {
     // A preload hinted Partial Segment has the same startTime and endTime.
     goog.asserts.assert(startTime <= endTime,
         'startTime must be less than or equal to endTime');
@@ -233,6 +236,9 @@ shaka.media.SegmentReference = class {
 
     /** @type {shaka.media.SegmentReference.Status} */
     this.status = status;
+
+    /** @type {?shaka.extern.HlsAes128Key} */
+    this.hlsAes128Key = hlsAes128Key;
   }
 
   /**

package/lib/media/streaming_engine.js

@@ -1233,7 +1233,10 @@ shaka.media.StreamingEngine = class {
               stream.mimeType == 'audio/mp4';
       const isReadableStreamSupported = window.ReadableStream;
       // Enable MP4 low latency streaming with ReadableStream chunked data.
-      if (this.config_.lowLatencyMode && isReadableStreamSupported && isMP4) {
+      // Disabled when AES-128 is present, as we cannot decrypt part of a
+      // segment.
+      if (this.config_.lowLatencyMode && isReadableStreamSupported && isMP4 &&
+          !reference.hlsAes128Key) {
         let remaining = new Uint8Array(0);
         const streamDataCallback = async (data) => {
           this.destroyer_.ensureNotDestroyed();
@@ -1273,11 +1276,16 @@ shaka.media.StreamingEngine = class {
             'ReadableStream is not supported by the browser.');
         }
         const fetchSegment = this.fetch_(mediaState, reference);
-        const result = await fetchSegment;
+        let result = await fetchSegment;
         this.destroyer_.ensureNotDestroyed();
         if (this.fatalError_) {
           return;
         }
+        if (reference.hlsAes128Key) {
+          goog.asserts.assert(iter, 'mediaState.segmentIterator should exist');
+          result = await this.aes128Decrypt_(result, reference, iter);
+        }
+        this.destroyer_.ensureNotDestroyed();
 
         // If the text stream gets switched between fetch_() and append_(), the
         // new text parser is initialized, but the new init segment is not
@@ -1368,6 +1376,34 @@ shaka.media.StreamingEngine = class {
     }
   }
 
+  /**
+   * @param {!BufferSource} rawResult
+   * @param {!shaka.media.SegmentReference} reference
+   * @param {!shaka.media.SegmentIterator} iter
+   * @return {!Promise.<!BufferSource>} finalResult
+   * @private
+   */
+  async aes128Decrypt_(rawResult, reference, iter) {
+    const key = reference.hlsAes128Key;
+    if (!key.cryptoKey) {
+      goog.asserts.assert(key.fetchKey, 'If AES-128 cryptoKey was not ' +
+          'preloaded, fetchKey function should be provided');
+      await key.fetchKey();
+      goog.asserts.assert(key.cryptoKey, 'AES-128 cryptoKey should now be set');
+    }
+    let iv = key.iv;
+    if (!iv) {
+      iv = shaka.util.BufferUtils.toUint8(new ArrayBuffer(16));
+      let sequence = key.firstMediaSequenceNumber + iter.currentPosition();
+      for (let i = iv.byteLength - 1; i >= 0; i--) {
+        iv[i] = sequence & 0xff;
+        sequence >>= 8;
+      }
+    }
+    return window.crypto.subtle.decrypt(
+        {name: 'AES-CBC', iv}, key.cryptoKey, rawResult);
+  }
+
 
   /**
    * Clear per-stream error states and retry any failed streams.

package/lib/net/networking_engine.js

@@ -749,6 +749,7 @@ shaka.net.NetworkingEngine.RequestType = {
   'APP': 3,
   'TIMING': 4,
   'SERVER_CERTIFICATE': 5,
+  'KEY': 6,
 };
 
 

package/lib/player.js

@@ -1948,6 +1948,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     if (!this.abrManager_ || this.abrManagerFactory_ != abrFactory) {
       this.abrManagerFactory_ = abrFactory;
       this.abrManager_ = abrFactory();
+      if (typeof this.abrManager_.setMediaElement != 'function') {
+        shaka.Deprecate.deprecateFeature(5,
+            'AbrManager',
+            'Please use an AbrManager with setMediaElement function.');
+        this.abrManager_.setMediaElement = () => {};
+      }
       this.abrManager_.configure(this.config_.abr);
     }
 
@@ -1970,6 +1976,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.abrManager_.init((variant, clearBuffer, safeMargin) => {
       return this.switch_(variant, clearBuffer, safeMargin);
     });
+    this.abrManager_.setMediaElement(mediaElement);
 
     this.playhead_ = this.createPlayhead(has.startTime);
     this.playheadObservers_ = this.createPlayheadObserversForMSE_();
@@ -6551,7 +6558,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.1.3-uncompiled';
+shaka.Player.version = 'v4.2.0-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.