shaka-player 2.5.1 → 2.5.5

package/lib/cast/cast_proxy.js

@@ -69,14 +69,28 @@ shaka.cast.CastProxy = function(video, player, receiverAppId) {
   /** @private {shaka.util.EventManager} */
   this.eventManager_ = null;
 
-  /** @private {shaka.cast.CastSender} */
-  this.sender_ = new shaka.cast.CastSender(
-      receiverAppId,
-      this.onCastStatusChanged_.bind(this),
-      this.onFirstCastStateUpdate_.bind(this),
-      this.onRemoteEvent_.bind(this),
-      this.onResumeLocal_.bind(this),
-      this.getInitState_.bind(this));
+  /** @private {string} */
+  this.receiverAppId_ = receiverAppId;
+
+  if (this.receiverAppId_) {
+    // TODO: This is temporary fix to get casting working.
+    // It masks the fact that we're at the moment unable to
+    // change the receiver id sucessfully.
+    // It relies on the assumption that changing one actual
+    // id to another is a very edgy use case (usually apps have
+    // only one receiver app).
+    // It unblocks casting in the world where UI can be configured,
+    // but it's hacky and must be changed to a permanent solution
+    // allowing to change Receiver App ID for reals.
+    /** @private {shaka.cast.CastSender} */
+    this.sender_ = new shaka.cast.CastSender(
+        receiverAppId,
+        () => this.onCastStatusChanged_(),
+        () => this.onFirstCastStateUpdate_(),
+        (targetName, event) => this.onRemoteEvent_(targetName, event),
+        () => this.onResumeLocal_(),
+        () => this.getInitState_());
+  }
 
   this.init_();
 };
@@ -191,6 +205,13 @@ shaka.cast.CastProxy.prototype.receiverName = function() {
  * @export
  */
 shaka.cast.CastProxy.prototype.cast = function() {
+  if (!this.sender_) {
+    throw new shaka.util.Error(
+        shaka.util.Error.Severity.RECOVERABLE,
+        shaka.util.Error.Category.CAST,
+        shaka.util.Error.Code.CAST_RECEIVER_APP_ID_MISSING);
+  }
+
   let initState = this.getInitState_();
 
   // TODO: transfer manually-selected tracks?
@@ -215,7 +236,9 @@ shaka.cast.CastProxy.prototype.cast = function() {
  * @export
  */
 shaka.cast.CastProxy.prototype.setAppData = function(appData) {
-  this.sender_.setAppData(appData);
+  if (this.sender_) {
+    this.sender_.setAppData(appData);
+  }
 };
 
 
@@ -224,7 +247,44 @@ shaka.cast.CastProxy.prototype.setAppData = function(appData) {
  * @export
  */
 shaka.cast.CastProxy.prototype.suggestDisconnect = function() {
-  this.sender_.showDisconnectDialog();
+  if (this.sender_) {
+    this.sender_.showDisconnectDialog();
+  }
+};
+
+
+/**
+ * @param {string} newAppId
+ * @export
+ */
+shaka.cast.CastProxy.prototype.changeReceiverId = async function(newAppId) {
+  if (newAppId == this.receiverAppId_) {
+    // Nothing to change
+    return;
+  }
+
+  this.receiverAppId_ = newAppId;
+
+  // TODO: This code doesn't work correctly at the moment. Changing
+  // one working receiver id to another needs to be figured out.
+  // Destroy the old sender
+  if (this.sender_) {
+    this.sender_.forceDisconnect();
+    await this.sender_.destroy();
+    this.sender_ = null;
+  }
+
+
+  // Create the new one
+  this.sender_ = new shaka.cast.CastSender(
+      newAppId,
+      () => this.onCastStatusChanged_(),
+      () => this.onFirstCastStateUpdate_(),
+      (targetName, event) => this.onRemoteEvent_(targetName, event),
+      () => this.onResumeLocal_(),
+      () => this.getInitState_());
+
+  this.sender_.init();
 };
 
 
@@ -233,7 +293,9 @@ shaka.cast.CastProxy.prototype.suggestDisconnect = function() {
  * @export
  */
 shaka.cast.CastProxy.prototype.forceDisconnect = function() {
-  this.sender_.forceDisconnect();
+  if (this.sender_) {
+    this.sender_.forceDisconnect();
+  }
 };
 
 
@@ -242,7 +304,9 @@ shaka.cast.CastProxy.prototype.forceDisconnect = function() {
  * @private
  */
 shaka.cast.CastProxy.prototype.init_ = function() {
-  this.sender_.init();
+  if (this.sender_) {
+    this.sender_.init();
+  }
 
   this.eventManager_ = new shaka.util.EventManager();
 
@@ -360,6 +424,9 @@ shaka.cast.CastProxy.prototype.onFirstCastStateUpdate_ = function() {
  * @private
  */
 shaka.cast.CastProxy.prototype.onResumeLocal_ = function() {
+  goog.asserts.assert(this.sender_,
+      'Cast sender should not be null!');
+
   // Transfer back the player state.
   shaka.cast.CastUtils.PlayerInitState.forEach(function(pair) {
     let getter = pair[0];
@@ -447,7 +514,8 @@ shaka.cast.CastProxy.prototype.videoProxyGet_ = function(name) {
 
   // If we are casting, but the first update has not come in yet, use local
   // values, but not local methods.
-  if (this.sender_.isCasting() && !this.sender_.hasRemoteProperties()) {
+  if (this.sender_ && this.sender_.isCasting() &&
+      !this.sender_.hasRemoteProperties()) {
     let value = this.localVideo_[name];
     if (typeof value != 'function') {
       return value;
@@ -455,7 +523,7 @@ shaka.cast.CastProxy.prototype.videoProxyGet_ = function(name) {
   }
 
   // Use local values and methods if we are not casting.
-  if (!this.sender_.isCasting()) {
+  if (!this.sender_ || !this.sender_.isCasting()) {
     let value = this.localVideo_[name];
     if (typeof value == 'function') {
       value = value.bind(this.localVideo_);
@@ -473,7 +541,7 @@ shaka.cast.CastProxy.prototype.videoProxyGet_ = function(name) {
  * @private
  */
 shaka.cast.CastProxy.prototype.videoProxySet_ = function(name, value) {
-  if (!this.sender_.isCasting()) {
+  if (!this.sender_ || !this.sender_.isCasting()) {
     this.localVideo_[name] = value;
     return;
   }
@@ -487,7 +555,7 @@ shaka.cast.CastProxy.prototype.videoProxySet_ = function(name, value) {
  * @private
  */
 shaka.cast.CastProxy.prototype.videoProxyLocalEvent_ = function(event) {
-  if (this.sender_.isCasting()) {
+  if (this.sender_ && this.sender_.isCasting()) {
     // Ignore any unexpected local events while casting.  Events can still be
     // fired by the local video and Player when we unload() after the Cast
     // connection is complete.
@@ -523,20 +591,22 @@ shaka.cast.CastProxy.prototype.playerProxyGet_ = function(name) {
   if (name == 'getSharedConfiguration') {
     shaka.log.warning(
         'Can\'t share configuration across a network. Returning copy.');
-    return this.sender_.get('player', 'getConfiguration');
+    return this.sender_ ?
+           this.sender_.get('player', 'getConfiguration') :
+           this.localPlayer_.getConfiguration();
   }
 
   if (name == 'getNetworkingEngine') {
     // Always returns a local instance, in case you need to make a request.
     // Issues a warning, in case you think you are making a remote request
     // or affecting remote filters.
-    if (this.sender_.isCasting()) {
+    if (this.sender_ && this.sender_.isCasting()) {
       shaka.log.warning('NOTE: getNetworkingEngine() is always local!');
     }
     return this.localPlayer_.getNetworkingEngine.bind(this.localPlayer_);
   }
 
-  if (this.sender_.isCasting()) {
+  if (this.sender_ && this.sender_.isCasting()) {
     // These methods are unavailable or otherwise stubbed during casting.
     if (name == 'getManifest' || name == 'drmInfo') {
       return function() {
@@ -564,7 +634,8 @@ shaka.cast.CastProxy.prototype.playerProxyGet_ = function(name) {
 
   // If we are casting, but the first update has not come in yet, use local
   // getters, but not local methods.
-  if (this.sender_.isCasting() && !this.sender_.hasRemoteProperties()) {
+  if (this.sender_ && this.sender_.isCasting() &&
+      !this.sender_.hasRemoteProperties()) {
     if (shaka.cast.CastUtils.PlayerGetterMethods[name]) {
       let value = /** @type {Object} */(this.localPlayer_)[name];
       goog.asserts.assert(typeof value == 'function', 'only methods on Player');
@@ -573,7 +644,7 @@ shaka.cast.CastProxy.prototype.playerProxyGet_ = function(name) {
   }
 
   // Use local getters and methods if we are not casting.
-  if (!this.sender_.isCasting()) {
+  if (!this.sender_ || !this.sender_.isCasting()) {
     let value = /** @type {Object} */(this.localPlayer_)[name];
     goog.asserts.assert(typeof value == 'function', 'only methods on Player');
     return value.bind(this.localPlayer_);
@@ -588,7 +659,7 @@ shaka.cast.CastProxy.prototype.playerProxyGet_ = function(name) {
  * @private
  */
 shaka.cast.CastProxy.prototype.playerProxyLocalEvent_ = function(event) {
-  if (this.sender_.isCasting()) {
+  if (this.sender_ && this.sender_.isCasting()) {
     // Ignore any unexpected local events while casting.
     return;
   }
@@ -603,7 +674,7 @@ shaka.cast.CastProxy.prototype.playerProxyLocalEvent_ = function(event) {
  * @private
  */
 shaka.cast.CastProxy.prototype.onRemoteEvent_ = function(targetName, event) {
-  goog.asserts.assert(this.sender_.isCasting(),
+  goog.asserts.assert(this.sender_ && this.sender_.isCasting(),
                       'Should only receive remote events while casting');
   if (!this.sender_.isCasting()) {
     // Ignore any unexpected remote events.

package/lib/cast/cast_receiver.js

@@ -39,7 +39,10 @@ goog.require('shaka.util.Timer');
  *   local Player instance.
  * @param {!shaka.Player} player A local Player instance.
  * @param {function(Object)=} appDataCallback A callback to handle
- *   application-specific data passed from the sender.
+ *   application-specific data passed from the sender.  This can come either
+ *   from a Shaka-based sender through CastProxy.setAppData, or from a
+ *   sender using the customData field of the LOAD message of the standard
+ *   Cast message namespace.  It can also be null if no such data is sent.
   * @param {function(string):string=} contentIdCallback A callback to
  *   retrieve manifest URI from the provided content id.
  * @implements {shaka.util.IDestroyable}
@@ -685,6 +688,10 @@ shaka.cast.CastReceiver.prototype.onGenericMessage_ = function(event) {
       let currentTime = message['currentTime'];
       let assetUri = this.contentIdCallback_(contentId);
       let autoplay = message['autoplay'] || true;
+      let customData = mediaInfo['customData'];
+
+      this.appDataCallback_(customData);
+
       if (autoplay) {
         this.video_.autoplay = true;
       }

package/lib/dash/content_protection.js

@@ -21,6 +21,7 @@ goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.Pssh');
 goog.require('shaka.util.Uint8ArrayUtils');
 goog.require('shaka.util.XmlUtils');
 
@@ -442,6 +443,36 @@ shaka.dash.ContentProtection.getPlayReadyLicenseUrl = function(element) {
 };
 
 
+/**
+ * Gets a PlayReady initData from a content protection element
+ * containing a PlayReady Pro Object
+ *
+ * @param {shaka.dash.ContentProtection.Element} element
+ * @return {?Array.<shaka.extern.InitDataOverride>}
+ * @private
+ */
+shaka.dash.ContentProtection.getInitDataFromPro_ = function(element) {
+  const proNode = shaka.util.XmlUtils.findChildNS(
+      element.node, 'urn:microsoft:playready', 'pro');
+  if (!proNode) {
+    return null;
+  }
+  const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
+  const data = Uint8ArrayUtils.fromBase64(proNode.textContent);
+  const systemId = new Uint8Array([
+    0x9a, 0x04, 0xf0, 0x79, 0x98, 0x40, 0x42, 0x86,
+    0xab, 0x92, 0xe6, 0x5b, 0xe0, 0x88, 0x5f, 0x95,
+  ]);
+  const pssh = shaka.util.Pssh.createPssh(data, systemId);
+  return [
+    {
+      initData: pssh,
+      initDataType: 'cenc',
+      keyId: element.keyId,
+    },
+  ];
+};
+
 /**
  * Creates DrmInfo objects from the given element.
  *
@@ -468,7 +499,8 @@ shaka.dash.ContentProtection.convertElements_ = function(
           !element.init || element.init.length,
           'Init data must be null or non-empty.');
 
-      const initData = element.init || defaultInit;
+        const proInitData = ContentProtection.getInitDataFromPro_(element);
+        const initData = element.init || defaultInit || proInitData;
       const info = ManifestParserUtils.createDrmInfo(keySystem, initData);
       const licenseParser = licenseUrlParsers.get(keySystem);
       if (licenseParser) {

package/lib/dash/dash_parser.js

@@ -509,7 +509,7 @@ shaka.dash.DashParser.prototype.processManifest_ =
       manifestBaseUris, uris);
 
   let ignoreMinBufferTime = this.config_.dash.ignoreMinBufferTime;
-  let minBufferTime;
+  let minBufferTime = 0;
   if (!ignoreMinBufferTime) {
     minBufferTime =
       XmlUtils.parseAttr(mpd, 'minBufferTime', XmlUtils.parseDuration);
@@ -1016,7 +1016,7 @@ shaka.dash.DashParser.prototype.parseAdaptationSet_ = function(context, elem) {
         case 'subtitle':
           kind = value;
           break;
-      }
+        }
     }
   }
 
@@ -1038,12 +1038,12 @@ shaka.dash.DashParser.prototype.parseAdaptationSet_ = function(context, elem) {
   let closedCaptions = new Map();
   for (const prop of accessibilities) {
     let schemeId = prop.getAttribute('schemeIdUri');
+    let value = prop.getAttribute('value');
     if (schemeId == 'urn:scte:dash:cc:cea-608:2015' ||
         schemeId == 'urn:scte:dash:cc:cea-708:2015') {
       let channelId = 1;
-      let closedCaptionsValue = prop.getAttribute('value');
-      if (closedCaptionsValue != null) {
-        closedCaptionsValue.split(';').forEach((captionStr) => {
+      if (value != null) {
+        value.split(';').forEach((captionStr) => {
           let channel;
           let language;
           // Some closed caption descriptions have channel number and language,
@@ -1075,6 +1075,14 @@ shaka.dash.DashParser.prototype.parseAdaptationSet_ = function(context, elem) {
         // 'CC1' as channel id and 'und' as language info.
         closedCaptions.set('CC1', 'und');
       }
+    } else if (schemeId == 'urn:mpeg:dash:role:2011') {
+      // See DASH IOP 3.9.2 Table 4.
+      if (value != null) {
+        roleValues.push(value);
+        if (value == 'captions') {
+          kind = ManifestParserUtils.TextStreamKind.CLOSED_CAPTION;
+        }
+      }
     }
   }
 

package/lib/hls/hls_parser.js

@@ -539,8 +539,15 @@ shaka.hls.HlsParser.prototype.createPeriod_ = async function(playlist) {
     return type == 'SUBTITLES';
   }.bind(this));
 
-  let textStreamPromises = textStreamTags.map(function(tag) {
-    return this.createTextStream_(tag, playlist);
+  let textStreamPromises = textStreamTags.map(async function(tag) {
+    try {
+      return await this.createTextStream_(tag, playlist);
+    } catch (e) {
+      if (this.config_.hls.ignoreTextStreamFailures) {
+        return null;
+      }
+      throw e;
+    }
   }.bind(this));
 
   const closedCaptionsTags = mediaTags.filter((tag) => {
@@ -567,7 +574,7 @@ shaka.hls.HlsParser.prototype.createPeriod_ = async function(playlist) {
   return {
     startTime: 0,
     variants: variants,
-    textStreams: textStreams,
+    textStreams: textStreams.filter((t) => t != null),
   };
 };
 
@@ -660,7 +667,9 @@ shaka.hls.HlsParser.prototype.createVariantsForTag_ =
         // attached to the stream.
         const textStreamInfo =
             this.mediaTagsToStreamInfosMap_.get(textTags[0].id);
-        textStreamInfo.stream.codecs = textCodecs;
+        if (textStreamInfo) {
+          textStreamInfo.stream.codecs = textCodecs;
+        }
       }
     }
 
@@ -1672,6 +1681,13 @@ shaka.hls.HlsParser.prototype.getStartTime_ = async function(
     return this.getStartTimeFromTextSegment_(mimeType, codecs, response.data);
   }
 
+    if (mimeType == 'video/webm') {
+      shaka.log.warning(
+          'Hls+WebM combination is not supported at the moment. Skipping.');
+      return null;
+    }
+
+
   // TODO(vaage): Add support for additional formats.
   //
   //   Formats:

package/lib/media/drm_engine.js

@@ -22,6 +22,7 @@ goog.require('shaka.log');
 goog.require('shaka.net.NetworkingEngine');
 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');
@@ -1115,6 +1116,29 @@ shaka.media.DrmEngine.prototype.createTemporarySession_ =
   };
   this.activeSessions_.set(session, metadata);
 
+    try {
+      if (this.config_.initDataTransform) {
+        initData = this.config_.initDataTransform(initData);
+      } else if (this.keySystem().startsWith('com.apple.fps')) {
+        const cert = this.currentDrmInfo_.serverCertificate;
+        const contentId =
+            shaka.util.FairPlayUtils.defaultGetContentId(initData);
+        initData = shaka.util.FairPlayUtils.initDataTransform(
+            initData, contentId, cert);
+      }
+    } catch (error) {
+      let shakaError = error;
+      if (!(error instanceof shaka.util.Error)) {
+        shakaError = new shaka.util.Error(
+            shaka.util.Error.Severity.CRITICAL,
+            shaka.util.Error.Category.DRM,
+            shaka.util.Error.Code.INIT_DATA_TRANSFORM_ERROR,
+            error);
+      }
+      this.onError_(shakaError);
+      return;
+    }
+
   session.generateRequest(initDataType, initData.buffer).catch((error) => {
     if (this.isDestroying_) { return; }
 
@@ -1186,13 +1210,15 @@ shaka.media.DrmEngine.prototype.sendLicenseRequest_ = function(event) {
   request.body = event.message;
   request.method = 'POST';
   request.licenseRequestType = event.messageType;
+  request.sessionId = session.sessionId;
   // NOTE: allowCrossSiteCredentials can be set in a request filter.
 
   if (this.currentDrmInfo_.keySystem == 'com.microsoft.playready' ||
       this.currentDrmInfo_.keySystem == 'com.chromecast.playready') {
     this.unpackPlayReadyRequest_(request);
   }
-  if (this.currentDrmInfo_.keySystem.startsWith('com.apple.fps')) {
+  if (this.currentDrmInfo_.keySystem.startsWith('com.apple.fps') &&
+      this.config_.fairPlayTransform) {
     this.formatFairPlayRequest_(request);
   }
 
@@ -1200,7 +1226,8 @@ shaka.media.DrmEngine.prototype.sendLicenseRequest_ = function(event) {
       .then(function(response) {
         if (this.isDestroying_) { return Promise.reject(); }
 
-        if (this.currentDrmInfo_.keySystem.startsWith('com.apple.fps')) {
+        if (this.currentDrmInfo_.keySystem.startsWith('com.apple.fps') &&
+            this.config_.fairPlayTransform) {
           this.parseFairPlayResponse_(response);
         }
 

package/lib/media/media_source_engine.js

@@ -241,7 +241,6 @@ shaka.media.MediaSourceEngine.prototype.destroy = function() {
 
     // The rest will be rejected silently if possible.
     for (let i = 1; i < q.length; ++i) {
-      q[i].p.catch(Functional.noop);
       q[i].p.reject();
     }
   }
@@ -705,9 +704,13 @@ shaka.media.MediaSourceEngine.prototype.setStreamProperties = function(
  */
 shaka.media.MediaSourceEngine.prototype.endOfStream = function(reason) {
   return this.enqueueBlockingOperation_(function() {
-    // Chrome won't let us pass undefined, but it will let us omit the
-    // argument.  Firefox does not have this problem.
-    // TODO: File a bug about this.
+    // If endOfStream() has already been called on the media source,
+    // don't call it again.
+    if (this.ended()) {
+      return;
+    }
+    // Tizen and IE11 won't let us pass undefined, but it will let us omit the
+    // argument.
     if (reason) {
       this.mediaSource_.endOfStream(reason);
     } else {
@@ -1016,7 +1019,7 @@ shaka.media.MediaSourceEngine.prototype.enqueueBlockingOperation_ =
     }
 
     return ret;
-  }.bind(this), function() {
+  }.bind(this), function(error) {
     // One of the waiters failed, which means we've been destroyed.
     goog.asserts.assert(this.destroyed_, 'Should be destroyed by now');
     // We haven't popped from the queue.  Canceled waiters have been removed by
@@ -1036,7 +1039,7 @@ shaka.media.MediaSourceEngine.prototype.enqueueBlockingOperation_ =
         }
       }
     }
-    return Promise.reject();
+    throw error;
   }.bind(this));
 };
 

package/lib/media/play_rate_controller.js

@@ -113,11 +113,22 @@ shaka.media.PlayRateController = class {
     const rate = this.calculateCurrentRate_();
 
     if (rate >= 0) {
-      this.applyRate_(rate);
-      return;
+      try {
+        this.applyRate_(rate);
+        return;
+      } catch (e) {
+        // Fall through to the next clause.
+        //
+        // Fast forward is accomplished through setting video.playbackRate.
+        // If the play rate value is not supported by the browser (too big),
+        // the browsers will throw.
+        // Use this as a cue to fall back to fast forward through repeated
+        // seeking, which is what we do for rewind as well.
+      }
     }
 
-    // When moving backwards, set the playback rate to 0 so that we can manually
+    // When moving backwards or forwards in large steps,
+    // set the playback rate to 0 so that we can manually
     // seek backwards with out fighting the playhead.
     this.timer_.tickEvery(this.pollRate_);
     this.applyRate_(0);

package/lib/media/playhead.js

@@ -86,9 +86,14 @@ shaka.media.SrcEqualsPlayhead = class {
     // We listen for the loaded-metadata-event so that we know when we can
     // interact with |currentTime|.
     const onLoaded = () => {
-      this.started_ = true;
-
-      if (this.startTime_ != null) {
+      if (this.startTime_ == null) {
+        this.started_ = true;
+      } else {
+        // Startup is complete only when the video element acknowledges the
+        // seek.
+        this.eventManager_.listenOnce(this.mediaElement_, 'seeking', () => {
+          this.started_ = true;
+        });
         this.mediaElement_.currentTime = this.startTime_;
       }
     };