shaka-player 4.9.2 → 4.9.4

package/externs/polyfill.js

@@ -11,5 +11,5 @@
  */
 
 
-/** @type {boolean} */
+/** @type {string} */
 window.shakaMediaKeysPolyfill;

package/lib/abr/simple_abr_manager.js

@@ -268,7 +268,8 @@ shaka.abr.SimpleAbrManager = class {
 
       if (currentBandwidth >= minBandwidth &&
           currentBandwidth <= maxBandwidth &&
-          chosen.bandwidth != item.bandwidth) {
+          (chosen.bandwidth != item.bandwidth ||
+          this.isSameBandwidthAndHigherResolution_(chosen, item))) {
         chosen = item;
       }
     }
@@ -537,6 +538,23 @@ shaka.abr.SimpleAbrManager = class {
       return v1.width - v2.width;
     });
   }
+
+  /**
+   * @param {shaka.extern.Variant} chosenVariant
+   * @param {shaka.extern.Variant} newVariant
+   * @return {boolean}
+   * @private
+   */
+  isSameBandwidthAndHigherResolution_(chosenVariant, newVariant) {
+    if (chosenVariant.bandwidth != newVariant.bandwidth) {
+      return false;
+    }
+    if (!chosenVariant.video || !newVariant.video) {
+      return false;
+    }
+    return chosenVariant.video.width < newVariant.video.width ||
+        chosenVariant.video.height < newVariant.video.height;
+  }
 };
 
 

package/lib/hls/hls_parser.js

@@ -489,7 +489,7 @@ shaka.hls.HlsParser = class {
           mediaSequenceNumber);
       stream.segmentIndex.evict(playlistStartTime);
     }
-    const oldSegment = segments[0];
+    const oldSegment = stream.segmentIndex.earliestReference();
     goog.asserts.assert(oldSegment, 'Should have segments!');
 
     streamInfo.minTimestamp = oldSegment.startTime;
@@ -4282,7 +4282,7 @@ shaka.hls.HlsParser = class {
     }
 
     const uri = drmTag.getRequiredAttrValue('URI');
-    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri);
+    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri.split('?')[0]);
 
     // The data encoded in the URI is a PSSH box to be used as init data.
     const pssh = shaka.util.BufferUtils.toUint8(parsedData.data);
@@ -4325,7 +4325,7 @@ shaka.hls.HlsParser = class {
     }
 
     const uri = drmTag.getRequiredAttrValue('URI');
-    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri);
+    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri.split('?')[0]);
 
     // The data encoded in the URI is a PlayReady Pro Object, so we need
     // convert it to pssh.

package/lib/media/content_workarounds.js

@@ -36,7 +36,8 @@ shaka.media.ContentWorkarounds = class {
    */
   static fakeEncryption(initSegmentBuffer, uri) {
     const ContentWorkarounds = shaka.media.ContentWorkarounds;
-    let initSegment = shaka.util.BufferUtils.toUint8(initSegmentBuffer);
+    const initSegment = shaka.util.BufferUtils.toUint8(initSegmentBuffer);
+    let modifiedInitSegment = initSegment;
     let isEncrypted = false;
     /** @type {shaka.extern.ParsedBox} */
     let stsdBox;
@@ -166,11 +167,24 @@ shaka.media.ContentWorkarounds = class {
       const insertedBoxType =
           shaka.util.Mp4Parser.typeToString(workItem.newType);
       shaka.log.debug(`Inserting "${insertedBoxType}" box into init segment.`);
-      initSegment = ContentWorkarounds.insertEncryptionMetadata_(
-          initSegment, stsdBox, workItem.box, ancestorBoxes, workItem.newType);
+      modifiedInitSegment = ContentWorkarounds.insertEncryptionMetadata_(
+          modifiedInitSegment, stsdBox, workItem.box, ancestorBoxes,
+          workItem.newType);
     }
 
-    return initSegment;
+    // Edge Windows needs the unmodified init segment to be appended after the
+    // patched one, otherwise video element throws following error:
+    // CHUNK_DEMUXER_ERROR_APPEND_FAILED: Sample encryption info is not
+    // available.
+    if (shaka.util.Platform.isEdge() && shaka.util.Platform.isWindows()) {
+      const doubleInitSegment = new Uint8Array(initSegment.byteLength +
+        modifiedInitSegment.byteLength);
+      doubleInitSegment.set(modifiedInitSegment);
+      doubleInitSegment.set(initSegment, modifiedInitSegment.byteLength);
+      return doubleInitSegment;
+    }
+
+    return modifiedInitSegment;
   }
 
   /**
@@ -197,11 +211,12 @@ shaka.media.ContentWorkarounds = class {
     const newInitSegment =
         new Uint8Array(initSegment.byteLength + metadataBoxArray.byteLength);
 
-    // For Xbox One, we cut and insert at the start of the source box.  For
-    // other platforms, we cut and insert at the end of the source box.  It's
+    // For Xbox One & Edge, we cut and insert at the start of the source box.
+    // For other platforms, we cut and insert at the end of the source box. It's
     // not clear why this is necessary on Xbox One, but it seems to be evidence
     // of another bug in the firmware implementation of MediaSource & EME.
-    const cutPoint = shaka.util.Platform.isXboxOne() ?
+    const cutPoint =
+      (shaka.util.Platform.isXboxOne() || shaka.util.Platform.isEdge()) ?
         sourceBox.start :
         sourceBox.start + sourceBox.size;
 

package/lib/media/drm_engine.js

@@ -12,6 +12,7 @@ goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.transmuxer.TransmuxerEngine');
 goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.Destroyer');
+goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
@@ -178,12 +179,18 @@ shaka.media.DrmEngine = class {
 
     // |video_| will be |null| if we never attached to a video element.
     if (this.video_) {
-      goog.asserts.assert(!this.video_.src, 'video src must be removed first!');
+      // Webkit EME implementation requires the src to be defined to clear
+      // the MediaKeys.
+      if (!shaka.util.Platform.isMediaKeysPolyfilled('webkit')) {
+        goog.asserts.assert(!this.video_.src,
+            'video src must be removed first!');
+      }
 
       try {
         await this.video_.setMediaKeys(null);
       } catch (error) {
         // Ignore any failures while removing media keys from the video element.
+        shaka.log.debug(`DrmEngine.destroyNow_ exception`, error);
       }
 
       this.video_ = null;
@@ -762,28 +769,6 @@ shaka.media.DrmEngine = class {
     return drmInfo ? drmInfo.keySystem : '';
   }
 
-  /**
-   * @param {?string} keySystem
-   * @return {boolean} */
-  static isPlayReadyKeySystem(keySystem) {
-    if (keySystem) {
-      return !!keySystem.match(/^com\.(microsoft|chromecast)\.playready/);
-    }
-
-    return false;
-  }
-
-  /**
-   * @param {?string} keySystem
-   * @return {boolean} */
-  static isFairPlayKeySystem(keySystem) {
-    if (keySystem) {
-      return !!keySystem.match(/^com\.apple\.fps/);
-    }
-
-    return false;
-  }
-
   /**
    * Check if DrmEngine (as initialized) will likely be able to support the
    * given content type.
@@ -1502,7 +1487,7 @@ shaka.media.DrmEngine = class {
     }
     // NOTE: allowCrossSiteCredentials can be set in a request filter.
 
-    if (shaka.media.DrmEngine.isPlayReadyKeySystem(
+    if (shaka.util.DrmUtils.isPlayReadyKeySystem(
         this.currentDrmInfo_.keySystem)) {
       this.unpackPlayReadyRequest_(request);
     }
@@ -1686,7 +1671,7 @@ shaka.media.DrmEngine = class {
       // NOTE that we skip this if byteLength != 16.  This is used for Edge
       // which uses single-byte dummy key IDs.
       // However, unlike Edge and Chromecast, Tizen doesn't have this problem.
-      if (shaka.media.DrmEngine.isPlayReadyKeySystem(
+      if (shaka.util.DrmUtils.isPlayReadyKeySystem(
           this.currentDrmInfo_.keySystem) &&
           keyId.byteLength == 16 &&
           (shaka.util.Platform.isEdge() || shaka.util.Platform.isPS4())) {

package/lib/media/media_source_engine.js

@@ -53,15 +53,17 @@ shaka.media.MediaSourceEngine = class {
    *    The text displayer that will be used with the text engine.
    *    MediaSourceEngine takes ownership of the displayer. When
    *    MediaSourceEngine is destroyed, it will destroy the displayer.
-   * @param {!function(!Array.<shaka.extern.ID3Metadata>, number, ?number)=}
-   *    onMetadata
+   * @param {!shaka.media.MediaSourceEngine.PlayerInterface} playerInterface
+   *   Interface for common player methods.
    * @param {?shaka.lcevc.Dec} [lcevcDec] Optional -  LCEVC Decoder Object
-   *
    */
-  constructor(video, textDisplayer, onMetadata, lcevcDec) {
+  constructor(video, textDisplayer, playerInterface, lcevcDec) {
     /** @private {HTMLMediaElement} */
     this.video_ = video;
 
+    /** @private {?shaka.media.MediaSourceEngine.PlayerInterface} */
+    this.playerInterface_ = playerInterface;
+
     /** @private {?shaka.extern.MediaSourceConfiguration} */
     this.config_ = null;
 
@@ -87,12 +89,6 @@ shaka.media.MediaSourceEngine = class {
     /** @private {boolean} */
     this.segmentRelativeVttTiming_ = false;
 
-    const onMetadataNoOp = (metadata, timestampOffset, segmentEnd) => {};
-
-    /** @private {!function(!Array.<shaka.extern.ID3Metadata>,
-                    number, ?number)} */
-    this.onMetadata_ = onMetadata || onMetadataNoOp;
-
     /** @private {?shaka.lcevc.Dec} */
     this.lcevcDec_ = lcevcDec || null;
 
@@ -316,7 +312,7 @@ shaka.media.MediaSourceEngine = class {
       'audio/mp4; codecs="mp4a.40.2"',
       'audio/mp4; codecs="ac-3"',
       'audio/mp4; codecs="ec-3"',
-      'audio/mp4; codecs="ac-4"',
+      'audio/mp4; codecs="ac-4.02.01.01"',
       'audio/mp4; codecs="opus"',
       'audio/mp4; codecs="flac"',
       'audio/mp4; codecs="dtsc"', // DTS Digital Surround
@@ -438,6 +434,7 @@ shaka.media.MediaSourceEngine = class {
     this.lcevcDec_ = null;
 
     this.tsParser_ = null;
+    this.playerInterface_ = null;
   }
 
   /**
@@ -813,7 +810,8 @@ shaka.media.MediaSourceEngine = class {
           dts: reference.startTime,
           pts: reference.startTime,
         };
-        this.onMetadata_([metadata], /* offset= */ 0, reference.endTime);
+        this.playerInterface_.onMetadata(
+            [metadata], /* offset= */ 0, reference.endTime);
       }
     } else if (mimeType.includes('/mp4') &&
         reference && reference.timestampOffset == 0 &&
@@ -855,7 +853,7 @@ shaka.media.MediaSourceEngine = class {
       }
       const metadata = tsParser.getMetadata();
       if (metadata.length) {
-        this.onMetadata_(metadata, timestampOffset,
+        this.playerInterface_.onMetadata(metadata, timestampOffset,
             reference ? reference.endTime : null);
       }
     }
@@ -1719,8 +1717,11 @@ shaka.media.MediaSourceEngine = class {
    * @private
    */
   workAroundBrokenPlatforms_(segment, startTime, contentType, uri) {
+    const Platform = shaka.util.Platform;
+
     const isInitSegment = startTime == null;
     const encryptionExpected = this.expectedEncryption_[contentType];
+    const keySystem = this.playerInterface_.getKeySystem();
 
     // If:
     //   1. the configuration tells to insert fake encryption,
@@ -1735,7 +1736,7 @@ shaka.media.MediaSourceEngine = class {
     if (this.config_.insertFakeEncryptionInInit &&
         isInitSegment &&
         encryptionExpected &&
-        shaka.util.Platform.requiresEncryptionInfoInAllInitSegments() &&
+        Platform.requiresEncryptionInfoInAllInitSegments(keySystem) &&
         shaka.util.MimeUtils.getContainerType(
             this.sourceBufferTypes_[contentType]) == 'mp4') {
       shaka.log.debug('Forcing fake encryption information in init segment.');
@@ -2151,3 +2152,19 @@ shaka.media.MediaSourceEngine.SourceBufferMode_ = {
   SEQUENCE: 'sequence',
   SEGMENTS: 'segments',
 };
+
+
+/**
+ * @typedef {{
+ *   getKeySystem: function():?string,
+ *   onMetadata: function(!Array<shaka.extern.ID3Metadata>, number, ?number)
+ * }}
+ *
+ * @summary Player interface
+ * @property {function():?string} getKeySystem
+ *   Gets currently used key system or null if not used.
+ * @property {function(
+ *     !Array<shaka.extern.ID3Metadata>, number, ?number)} onMetadata
+ *   Callback to use when metadata arrives.
+ */
+shaka.media.MediaSourceEngine.PlayerInterface;

package/lib/media/presentation_timeline.js

@@ -98,7 +98,7 @@ shaka.media.PresentationTimeline = class {
     this.startTimeLocked_ = false;
 
     /** @private {?number} */
-    this.initialProgramDateTime_ = null;
+    this.initialProgramDateTime_ = presentationStartTime;
   }
 
 

package/lib/player.js

@@ -901,21 +901,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    */
   setupLcevc_(config) {
     if (config.lcevc.enabled) {
-      const tracks = this.getVariantTracks();
-      if (tracks && tracks[0] && tracks[0].videoMimeType == 'video/mp2t') {
-        const edge = shaka.util.Platform.isEdge() ||
-          shaka.util.Platform.isLegacyEdge();
-        if (edge) {
-          if (!config.mediaSource.forceTransmux) {
-            // If forceTransmux is disabled for Microsoft Edge, LCEVC data
-            // is stripped out in case of a MPEG-2 TS container.
-            // Hence the warning for Microsoft Edge when playing content with
-            // MPEG-2 TS container.
-            shaka.log.alwaysWarn('LCEVC Warning: For MPEG-2 TS decoding '+
-            'the config.mediaSource.forceTransmux must be enabled.');
-          }
-        }
-      }
       this.closeLcevcDec_();
       this.createLcevcDec_(config.lcevc);
     } else {
@@ -1371,6 +1356,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.playhead_ = null;
       }
 
+      // EME v0.1b requires the media element to clear the MediaKeys
+      if (shaka.util.Platform.isMediaKeysPolyfilled('webkit') &&
+          this.drmEngine_) {
+        await this.drmEngine_.destroy();
+        this.drmEngine_ = null;
+      }
+
       // Media source engine holds onto the media element, and in order to
       // detach the media keys (with drm engine), we need to break the
       // connection between media source engine and the media element.
@@ -2268,8 +2260,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const mediaSourceEngine = this.createMediaSourceEngine(
         this.video_,
         textDisplayer,
-        (metadata, offset, endTime) => {
-          this.processTimedMetadataMediaSrc_(metadata, offset, endTime);
+        {
+          getKeySystem: () => this.keySystem(),
+          onMetadata: (metadata, offset, endTime) => {
+            this.processTimedMetadataMediaSrc_(metadata, offset, endTime);
+          },
         },
         this.lcevcDec_);
     mediaSourceEngine.configure(this.config_.mediaSource);
@@ -3403,17 +3398,17 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *
    * @param {!HTMLMediaElement} mediaElement
    * @param {!shaka.extern.TextDisplayer} textDisplayer
-   * @param {!function(!Array.<shaka.extern.ID3Metadata>, number, ?number)}
-   *  onMetadata
+   * @param {!shaka.media.MediaSourceEngine.PlayerInterface} playerInterface
    * @param {shaka.lcevc.Dec} lcevcDec
    *
    * @return {!shaka.media.MediaSourceEngine}
    */
-  createMediaSourceEngine(mediaElement, textDisplayer, onMetadata, lcevcDec) {
+  createMediaSourceEngine(mediaElement, textDisplayer, playerInterface,
+      lcevcDec) {
     return new shaka.media.MediaSourceEngine(
         mediaElement,
         textDisplayer,
-        onMetadata,
+        playerInterface,
         lcevcDec);
   }
 
@@ -7454,7 +7449,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.9.2' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.4' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/patchedmediakeys_apple.js

@@ -76,7 +76,7 @@ shaka.polyfill.PatchedMediaKeysApple = class {
     navigator.requestMediaKeySystemAccess =
         PatchedMediaKeysApple.requestMediaKeySystemAccess;
 
-    window.shakaMediaKeysPolyfill = true;
+    window.shakaMediaKeysPolyfill = PatchedMediaKeysApple.apiName_;
   }
 
   /**
@@ -115,7 +115,7 @@ shaka.polyfill.PatchedMediaKeysApple = class {
     PatchedMediaKeysApple.originalNavigatorRequestMediaKeySystemAccess = null;
     PatchedMediaKeysApple.originalHTMLMediaElementPrototypeMediaKeys = null;
 
-    window.shakaMediaKeysPolyfill = false;
+    window.shakaMediaKeysPolyfill = '';
   }
 
   /**
@@ -791,3 +791,10 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeyStatusMap = class {
     goog.asserts.assert(false, 'Not used!  Provided only for the compiler.');
   }
 };
+
+/**
+ * API name.
+ *
+ * @private {string}
+ */
+shaka.polyfill.PatchedMediaKeysApple.apiName_ = 'apple';

package/lib/polyfill/patchedmediakeys_nop.js

@@ -50,7 +50,7 @@ shaka.polyfill.PatchedMediaKeysNop = class {
     window.MediaKeys = PatchedMediaKeysNop.MediaKeys;
     window.MediaKeySystemAccess = PatchedMediaKeysNop.MediaKeySystemAccess;
 
-    window.shakaMediaKeysPolyfill = true;
+    window.shakaMediaKeysPolyfill = PatchedMediaKeysNop.apiName_;
   }
 
   /**
@@ -136,6 +136,13 @@ shaka.polyfill.PatchedMediaKeysNop.MediaKeySystemAccess = class {
   createMediaKeys() {}
 };
 
+/**
+ * API name.
+ *
+ * @private {string}
+ */
+shaka.polyfill.PatchedMediaKeysNop.apiName_ = 'nop';
+
 
 // A low priority ensures this is the last and acts as a fallback.
 shaka.polyfill.register(shaka.polyfill.PatchedMediaKeysNop.install, -10);

package/lib/polyfill/patchedmediakeys_webkit.js

@@ -73,7 +73,7 @@ shaka.polyfill.PatchedMediaKeysWebkit = class {
     window.MediaKeys = PatchedMediaKeysWebkit.MediaKeys;
     window.MediaKeySystemAccess = PatchedMediaKeysWebkit.MediaKeySystemAccess;
 
-    window.shakaMediaKeysPolyfill = true;
+    window.shakaMediaKeysPolyfill = PatchedMediaKeysWebkit.apiName_;
   }
 
   /**
@@ -860,7 +860,9 @@ class extends shaka.util.FakeEventTarget {
           PatchedMediaKeysWebkit.prefixApi_('cancelKeyRequest');
       try {
         this.media_[cancelKeyRequestName](this.keySystem_, this.sessionId);
-      } catch (exception) {}
+      } catch (exception) {
+        shaka.log.debug(`${cancelKeyRequestName} exception`, exception);
+      }
     }
 
     // Resolve the 'closed' promise and return it.
@@ -977,4 +979,12 @@ shaka.polyfill.PatchedMediaKeysWebkit.MediaKeyStatusMap = class {
 shaka.polyfill.PatchedMediaKeysWebkit.prefix_ = '';
 
 
+/**
+ * API name.
+ *
+ * @private {string}
+ */
+shaka.polyfill.PatchedMediaKeysWebkit.apiName_ = 'webkit';
+
+
 shaka.polyfill.register(shaka.polyfill.PatchedMediaKeysWebkit.install);

package/lib/util/drm_utils.js

@@ -0,0 +1,34 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.util.DrmUtils');
+
+
+shaka.util.DrmUtils = class {
+  /**
+   * @param {?string} keySystem
+   * @return {boolean}
+   */
+  static isPlayReadyKeySystem(keySystem) {
+    if (keySystem) {
+      return !!keySystem.match(/^com\.(microsoft|chromecast)\.playready/);
+    }
+
+    return false;
+  }
+
+  /**
+   * @param {?string} keySystem
+   * @return {boolean}
+   */
+  static isFairPlayKeySystem(keySystem) {
+    if (keySystem) {
+      return !!keySystem.match(/^com\.apple\.fps/);
+    }
+
+    return false;
+  }
+};

package/lib/util/platform.js

@@ -7,6 +7,7 @@
 goog.provide('shaka.util.Platform');
 
 goog.require('shaka.log');
+goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.Timer');
 
 
@@ -590,12 +591,15 @@ shaka.util.Platform = class {
    * around a lack of such info by inserting fake encryption information into
    * initialization segments.
    *
+   * @param {?string} keySystem
    * @return {boolean}
    * @see https://github.com/shaka-project/shaka-player/issues/2759
    */
-  static requiresEncryptionInfoInAllInitSegments() {
+  static requiresEncryptionInfoInAllInitSegments(keySystem) {
     const Platform = shaka.util.Platform;
-    return Platform.isTizen() || Platform.isXboxOne() || Platform.isOrange();
+    const isPlayReady = shaka.util.DrmUtils.isPlayReadyKeySystem(keySystem);
+    return Platform.isTizen() || Platform.isXboxOne() || Platform.isOrange() ||
+      (Platform.isEdge() && Platform.isWindows() && isPlayReady);
   }
 
   /**
@@ -644,16 +648,17 @@ shaka.util.Platform = class {
   /**
    * Returns true if MediaKeys is polyfilled
    *
+   * @param {string=} polyfillType
    * @return {boolean}
    */
-  static isMediaKeysPolyfilled() {
-    if (window.shakaMediaKeysPolyfill) {
-      return true;
+  static isMediaKeysPolyfilled(polyfillType) {
+    if (polyfillType) {
+      return polyfillType === window.shakaMediaKeysPolyfill;
     }
-
-    return false;
+    return !!window.shakaMediaKeysPolyfill;
   }
 
+
   /**
    * Detect the maximum resolution that the platform's hardware can handle.
    *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.9.2",
+  "version": "4.9.4",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [