shaka-player 3.1.4 → 3.3.0

package/lib/ads/server_side_ad_manager.js

@@ -64,6 +64,9 @@ shaka.ads.ServerSideAdManager = class {
     /** @private {string} */
     this.backupUrl_ = '';
 
+    /** @private {!Array.<!shaka.extern.AdCuePoint>} */
+    this.currentCuePoints_ = [];
+
     /** @private {shaka.util.EventManager} */
     this.eventManager_ = new shaka.util.EventManager();
 
@@ -212,6 +215,7 @@ shaka.ads.ServerSideAdManager = class {
     // this.streamManager_.reset();
     this.backupUrl_ = '';
     this.snapForwardTime_ = null;
+    this.currentCuePoints_ = [];
   }
 
   /** @override */
@@ -249,6 +253,13 @@ shaka.ads.ServerSideAdManager = class {
     }
   }
 
+  /**
+   * @return {!Array.<!shaka.extern.AdCuePoint>}
+   */
+  getCuePoints() {
+    return this.currentCuePoints_;
+  }
+
   /**
    * If a seek jumped over the ad break, return to the start of the
    * ad break, then complete the seek after the ad played through.
@@ -376,13 +387,19 @@ shaka.ads.ServerSideAdManager = class {
   onCuePointsChanged_(e) {
     const streamData = e.getStreamData();
 
-    /** @type {!Array.<!shaka.ads.CuePoint>} */
+    /** @type {!Array.<!shaka.extern.AdCuePoint>} */
     const cuePoints = [];
     for (const point of streamData.cuepoints) {
-      const shakaCuePoint = new shaka.ads.CuePoint(point.start, point.end);
+      /** @type {shaka.extern.AdCuePoint} */
+      const shakaCuePoint = {
+        start: point.start,
+        end: point.end,
+      };
       cuePoints.push(shakaCuePoint);
     }
 
+    this.currentCuePoints_ = cuePoints;
+
     this.onEvent_(new shaka.util.FakeEvent(
         shaka.ads.AdManager.CUEPOINTS_CHANGED,
         (new Map()).set('cuepoints', cuePoints)));

package/lib/cast/cast_proxy.js

@@ -648,6 +648,14 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
       return () => this.localPlayer_.getNetworkingEngine();
     }
 
+    if (name == 'getDrmEngine') {
+      // Always returns a local instance.
+      if (this.sender_.isCasting()) {
+        shaka.log.warning('NOTE: getDrmEngine() is always local!');
+      }
+      return () => this.localPlayer_.getDrmEngine();
+    }
+
     if (name == 'getAdManager') {
       // Always returns a local instance.
       if (this.sender_.isCasting()) {

package/lib/cast/cast_utils.js

@@ -305,10 +305,11 @@ shaka.cast.CastUtils.PlayerGetterMethods = {
   'getAssetUri': 2,
   'getAudioLanguages': 4,
   'getAudioLanguagesAndRoles': 4,
+  'getBufferFullness': 1,
   'getBufferedInfo': 2,
   // NOTE: The 'getSharedConfiguration' property is not proxied as it would
   //       not be possible to share a reference.
-  'getConfiguration': 2,
+  'getConfiguration': 4,
   'getExpiration': 2,
   'getKeyStatuses': 2,
   // NOTE: The 'getManifest' property is not proxied, as it is very large.
@@ -371,10 +372,13 @@ shaka.cast.CastUtils.PlayerInitAfterLoadState = [
  * @const {!Array.<string>}
  */
 shaka.cast.CastUtils.PlayerVoidMethods = [
+  'addChaptersTrack',
   'addTextTrack',
   'addTextTrackAsync',
   'cancelTrickPlay',
   'configure',
+  'getChapters',
+  'getChaptersTracks',
   'resetConfiguration',
   'retryStreaming',
   'selectAudioLanguage',
@@ -384,6 +388,8 @@ shaka.cast.CastUtils.PlayerVoidMethods = [
   'selectVariantsByLabel',
   'setTextTrackVisibility',
   'trickPlay',
+  'updateStartTime',
+  'goToLive',
 ];
 
 

package/lib/cea/cea608_data_channel.js

@@ -9,7 +9,7 @@ goog.provide('shaka.cea.Cea608DataChannel');
 goog.require('shaka.cea.Cea608Memory');
 goog.require('shaka.cea.CeaUtils');
 goog.require('shaka.log');
-goog.requireType('shaka.cea.ICaptionDecoder.ClosedCaption');
+goog.requireType('shaka.cea.ICaptionDecoder');
 
 
 /**
@@ -17,8 +17,8 @@ goog.requireType('shaka.cea.ICaptionDecoder.ClosedCaption');
  */
 shaka.cea.Cea608DataChannel = class {
   /**
-   * @param {!number} fieldNum Field number.
-   * @param {!number} channelNum Channel number.
+   * @param {number} fieldNum Field number.
+   * @param {number} channelNum Channel number.
    */
   constructor(fieldNum, channelNum) {
     /**
@@ -58,7 +58,7 @@ shaka.cea.Cea608DataChannel = class {
 
     /**
      * End time of the previous caption, serves as start time of next caption.
-     * @private {!number}
+     * @private {number}
      */
     this.prevEndTime_ = 0;
 
@@ -83,9 +83,9 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Gets the row index from a Preamble Address Code byte pair.
-   * @param {!number} b1 Byte 1.
-   * @param {!number} b2 Byte 2.
-   * @return {!number} Row index.
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
+   * @return {number} Row index.
    * @private
    */
   pacToRow_(b1, b2) {
@@ -106,8 +106,8 @@ shaka.cea.Cea608DataChannel = class {
    * PAC - Preamble Address Code.
    * b1 is of the form |P|0|0|1|C|0|ROW|
    * b2 is of the form |P|1|N|ATTRIBUTE|U|
-   * @param {!number} b1 Byte 1.
-   * @param {!number} b2 Byte 2.
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
    * @private
    */
   controlPac_(b1, b2) {
@@ -165,7 +165,7 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Mid-Row control code handler.
-   * @param {!number} b2 Byte #2.
+   * @param {number} b2 Byte #2.
    * @private
    */
   controlMidrow_(b2) {
@@ -198,8 +198,8 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Background attribute control code handler.
-   * @param {!number} b1 Byte #1
-   * @param {!number} b2 Byte #2.
+   * @param {number} b1 Byte #1
+   * @param {number} b2 Byte #2.
    * @private
    */
   controlBackgroundAttribute_(b1, b2) {
@@ -279,7 +279,7 @@ shaka.cea.Cea608DataChannel = class {
    * CR only affects scroll windows (Rollup and Text modes).
    * Any currently buffered line needs to be emitted, along
    * with a window scroll action.
-   * @param {!number} pts in seconds.
+   * @param {number} pts in seconds.
    * @return {?shaka.cea.ICaptionDecoder.ClosedCaption}
    * @private
    */
@@ -311,8 +311,8 @@ shaka.cea.Cea608DataChannel = class {
    * Handles RU2, RU3, RU4 - Roll-Up, N rows.
    * If in TEXT, POPON or PAINTON, any displayed captions are erased.
    *    This means must force emit entire display buffer.
-   * @param {!number} scrollSize New scroll window size.
-   * @param {!number} pts
+   * @param {number} scrollSize New scroll window size.
+   * @param {number} pts
    * @return {?shaka.cea.ICaptionDecoder.ClosedCaption}
    * @private
    */
@@ -356,7 +356,7 @@ shaka.cea.Cea608DataChannel = class {
    * Handles EDM - Erase Displayed Mem
    * Mode check:
    * EDM affects all captioning modes (but not Text mode);
-   * @param {!number} pts
+   * @param {number} pts
    * @return {?shaka.cea.ICaptionDecoder.ClosedCaption}
    * @private
    */
@@ -375,7 +375,7 @@ shaka.cea.Cea608DataChannel = class {
   /**
    * Handles RDC - Resume Direct Captions. Initiates Paint-On captioning mode.
    * RDC does not affect current display, so nothing needs to be forced out yet.
-   * @param {!number} pts in seconds
+   * @param {number} pts in seconds
    * @private
    */
   controlRdc_(pts) {
@@ -403,7 +403,7 @@ shaka.cea.Cea608DataChannel = class {
    * Handles EOC - End Of Caption (flip mem)
    * This forces Pop-On mode, and swaps the displayed and nondisplayed memories.
    * @private
-   * @param {!number} pts
+   * @param {number} pts
    * @return {?shaka.cea.ICaptionDecoder.ClosedCaption}
    */
   controlEoc_(pts) {
@@ -472,8 +472,8 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Handles a Basic North American byte pair.
-   * @param {!number} b1 Byte 1.
-   * @param {!number} b2 Byte 2.
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
    */
   handleBasicNorthAmericanChar(b1, b2) {
     this.curbuf_.addChar(
@@ -484,8 +484,8 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Handles an Extended Western European byte pair.
-   * @param {!number} b1 Byte 1.
-   * @param {!number} b2 Byte 2.
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
    * @private
    */
   handleExtendedWesternEuropeanChar_(b1, b2) {
@@ -539,9 +539,9 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Checks if this is a Miscellaneous control code.
-   * @param {!number} b1 Byte 1.
-   * @param {!number} b2 Byte 2.
-   * @return {!boolean}
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
+   * @return {boolean}
    * @private
    */
   isMiscellaneous_(b1, b2) {
@@ -553,9 +553,9 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Checks if this is a PAC control code.
-   * @param {!number} b1 Byte 1.
-   * @param {!number} b2 Byte 2.
-   * @return {!boolean}
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
+   * @return {boolean}
    * @private
    */
   isPAC_(b1, b2) {
@@ -567,9 +567,9 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Checks if this is a Midrow style change control code.
-   * @param {!number} b1 Byte 1.
-   * @param {!number} b2 Byte 2.
-   * @return {!boolean}
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
+   * @return {boolean}
    * @private
    */
   isMidrowStyleChange_(b1, b2) {
@@ -581,9 +581,9 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Checks if this is a background attribute control code.
-   * @param {!number} b1 Byte 1.
-   * @param {!number} b2 Byte 2.
-   * @return {!boolean}
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
+   * @return {boolean}
    * @private
    */
   isBackgroundAttribute_(b1, b2) {
@@ -596,9 +596,9 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Checks if the character is in the Special North American char. set.
-   * @param {!number} b1 Byte 1.
-   * @param {!number} b2 Byte 2.
-   * @return {!boolean}
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
+   * @return {boolean}
    * @private
    */
   isSpecialNorthAmericanChar_(b1, b2) {
@@ -610,9 +610,9 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Checks if the character is in the Extended Western European char. set.
-   * @param {!number} b1 Byte 1.
-   * @param {!number} b2 Byte 2.
-   * @return {!boolean}
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
+   * @return {boolean}
    * @private
    */
   isExtendedWesternEuropeanChar_(b1, b2) {
@@ -624,8 +624,8 @@ shaka.cea.Cea608DataChannel = class {
 
   /**
    * Checks if the data contains a control code.
-   * @param {!number} b1 Byte 1.
-   * @return {!boolean}
+   * @param {number} b1 Byte 1.
+   * @return {boolean}
    */
   static isControlCode(b1) {
     // For control codes, the first byte takes the following form:
@@ -636,7 +636,7 @@ shaka.cea.Cea608DataChannel = class {
 
 /**
  * Command codes.
- * @enum {!number}
+ * @enum {number}
  * @private
  */
 shaka.cea.Cea608DataChannel.MiscCmd_ = {
@@ -691,7 +691,7 @@ shaka.cea.Cea608DataChannel.MiscCmd_ = {
 
 /**
  * Caption type.
- * @private @const @enum {!number}
+ * @private @const @enum {number}
  */
 shaka.cea.Cea608DataChannel.CaptionType = {
   NONE: 0,
@@ -702,7 +702,7 @@ shaka.cea.Cea608DataChannel.CaptionType = {
 };
 
 /**
- * @const {!Array<!string>}
+ * @const {!Array<string>}
  */
 shaka.cea.Cea608DataChannel.BG_COLORS = [
   'black',
@@ -716,7 +716,7 @@ shaka.cea.Cea608DataChannel.BG_COLORS = [
 ];
 
 /**
- * @const {!Array<!string>}
+ * @const {!Array<string>}
  */
 shaka.cea.Cea608DataChannel.TEXT_COLORS = [
   'white',
@@ -743,20 +743,20 @@ shaka.cea.Cea608DataChannel.Style;
 /**
  * CEA closed captions packet.
  * @typedef {{
-  *   pts: !number,
-  *   type: !number,
-  *   ccData1: !number,
-  *   ccData2: !number,
-  *   order: !number
+  *   pts: number,
+  *   type: number,
+  *   ccData1: number,
+  *   ccData2: number,
+  *   order: number
   * }}
   *
-  * @property {!number} pts
+  * @property {number} pts
   *   Presentation timestamp (in second) at which this packet was received.
-  * @property {!number} type
+  * @property {number} type
   *   Type of the packet. Either 0 or 1, representing the CEA-608 field.
-  * @property {!number} ccData1 CEA-608 byte 1.
-  * @property {!number} ccData2 CEA-608 byte 2.
-  * @property {(!number)} order
+  * @property {number} ccData1 CEA-608 byte 1.
+  * @property {number} ccData2 CEA-608 byte 2.
+  * @property {number} order
   *   A number indicating the order this packet was received in a sequence
   *   of packets. Used to break ties in a stable sorting algorithm
   */

package/lib/cea/cea608_memory.js

@@ -8,7 +8,7 @@ goog.provide('shaka.cea.Cea608Memory');
 
 goog.require('shaka.cea.CeaUtils');
 goog.require('shaka.text.Cue');
-goog.requireType('shaka.cea.ICaptionDecoder.ClosedCaption');
+goog.requireType('shaka.cea.ICaptionDecoder');
 
 
 /**
@@ -16,8 +16,8 @@ goog.requireType('shaka.cea.ICaptionDecoder.ClosedCaption');
  */
 shaka.cea.Cea608Memory = class {
   /**
-   * @param {!number} fieldNum Field number.
-   * @param {!number} channelNum Channel number.
+   * @param {number} fieldNum Field number.
+   * @param {number} channelNum Channel number.
    */
   constructor(fieldNum, channelNum) {
     /**
@@ -28,45 +28,45 @@ shaka.cea.Cea608Memory = class {
 
     /**
      * Current row.
-     * @private {!number}
+     * @private {number}
      */
     this.row_ = 1;
 
     /**
      * Number of rows in the scroll window. Used for rollup mode.
-     * @private {!number}
+     * @private {number}
      */
     this.scrollRows_ = 0;
 
     /**
      * Field number.
-     * @private {!number}
+     * @private {number}
      */
     this.fieldNum_ = fieldNum;
 
     /**
      * Channel number.
-     * @private {!number}
+     * @private {number}
      */
     this.channelNum_ = channelNum;
 
     /**
-     * @private {!boolean}
+     * @private {boolean}
      */
     this.underline_ = false;
 
     /**
-     * @private {!boolean}
+     * @private {boolean}
      */
     this.italics_ = false;
 
     /**
-     * @private {!string}
+     * @private {string}
      */
     this.textColor_ = shaka.cea.CeaUtils.DEFAULT_TXT_COLOR;
 
     /**
-     * @private {!string}
+     * @private {string}
      */
     this.backgroundColor_ = shaka.cea.CeaUtils.DEFAULT_BG_COLOR;
 
@@ -75,8 +75,8 @@ shaka.cea.Cea608Memory = class {
 
   /**
    * Emits a closed caption based on the state of the buffer.
-   * @param {!number} startTime Start time of the cue.
-   * @param {!number} endTime End time of the cue.
+   * @param {number} startTime Start time of the cue.
+   * @param {number} endTime End time of the cue.
    * @return {?shaka.cea.ICaptionDecoder.ClosedCaption}
    */
   forceEmit(startTime, endTime) {
@@ -96,28 +96,28 @@ shaka.cea.Cea608Memory = class {
   }
 
   /**
-   * @return {!number}
+   * @return {number}
    */
   getRow() {
     return this.row_;
   }
 
   /**
-   * @param {!number} row
+   * @param {number} row
    */
   setRow(row) {
     this.row_ = row;
   }
 
   /**
-   * @return {!number}
+   * @return {number}
    */
   getScrollSize() {
     return this.scrollRows_;
   }
 
   /**
-   * @param {!number} scrollRows
+   * @param {number} scrollRows
    */
   setScrollSize(scrollRows) {
     this.scrollRows_ = scrollRows;
@@ -126,7 +126,7 @@ shaka.cea.Cea608Memory = class {
   /**
    * Adds a character to the buffer.
    * @param {!shaka.cea.Cea608Memory.CharSet} set Character set.
-   * @param {!number} b CC byte to add.
+   * @param {number} b CC byte to add.
    */
   addChar(set, b) {
     // Valid chars are in the range [0x20, 0x7f]
@@ -179,9 +179,9 @@ shaka.cea.Cea608Memory = class {
 
   /**
    * Moves rows of characters.
-   * @param {!number} dst Destination row index.
-   * @param {!number} src Source row index.
-   * @param {!number} count Count of rows to move.
+   * @param {number} dst Destination row index.
+   * @param {number} src Source row index.
+   * @param {number} count Count of rows to move.
    */
   moveRows(dst, src, count) {
     if (dst >= src) {
@@ -197,8 +197,8 @@ shaka.cea.Cea608Memory = class {
 
   /**
    * Resets rows of characters.
-   * @param {!number} idx Starting index.
-   * @param {!number} count Count of rows to reset.
+   * @param {number} idx Starting index.
+   * @param {number} count Count of rows to reset.
    */
   resetRows(idx, count) {
     for (let i = 0; i <= count; i++) {
@@ -223,28 +223,28 @@ shaka.cea.Cea608Memory = class {
   }
 
   /**
-   * @param {!boolean} underline
+   * @param {boolean} underline
    */
   setUnderline(underline) {
     this.underline_ = underline;
   }
 
   /**
-   * @param {!boolean} italics
+   * @param {boolean} italics
    */
   setItalics(italics) {
     this.italics_ = italics;
   }
 
   /**
-   * @param {!string} color
+   * @param {string} color
    */
   setTextColor(color) {
     this.textColor_ = color;
   }
 
   /**
-   * @param {!string} color
+   * @param {string} color
    */
   setBackgroundColor(color) {
     this.backgroundColor_ = color;
@@ -253,13 +253,13 @@ shaka.cea.Cea608Memory = class {
 
 /**
  * Maximum number of rows in the buffer.
- * @const {!number}
+ * @const {number}
  */
 shaka.cea.Cea608Memory.CC_ROWS = 15;
 
 /**
  * Characters sets.
- * @const @enum {!number}
+ * @const @enum {number}
  */
 shaka.cea.Cea608Memory.CharSet = {
   BASIC_NORTH_AMERICAN: 0,
@@ -270,7 +270,7 @@ shaka.cea.Cea608Memory.CharSet = {
 
 /**
  * Basic North American char set deviates from ASCII with these exceptions.
- * @private @const {!Map<!number, !string>}
+ * @private @const {!Map<number, string>}
  */
 shaka.cea.Cea608Memory.CharSet.BasicNorthAmericanChars = new Map([
   [0x27, '’'], [0x2a, 'á'], [0x5c, 'é'], [0x5c, 'é'], [0x5e, 'í'], [0x5f, 'ó'],
@@ -280,7 +280,7 @@ shaka.cea.Cea608Memory.CharSet.BasicNorthAmericanChars = new Map([
 /**
  * Special North American char set.
  * Note: Transparent Space is currently implemented as a regular space.
- * @private @const {!Map<!number, !string>}
+ * @private @const {!Map<number, string>}
  */
 shaka.cea.Cea608Memory.CharSet.SpecialNorthAmericanChars = new Map([
   [0x30, '®'], [0x31, '°'], [0x32, '½'], [0x33, '¿'], [0x34, '™'], [0x35, '¢'],
@@ -290,7 +290,7 @@ shaka.cea.Cea608Memory.CharSet.SpecialNorthAmericanChars = new Map([
 
 /**
  * Extended Spanish/Misc/French char set.
- * @private @const {!Map<!number, !string>}
+ * @private @const {!Map<number, string>}
  */
 shaka.cea.Cea608Memory.CharSet.ExtendedSpanishFrench = new Map([
   [0x20, 'Á'], [0x21, 'É'], [0x22, 'Ó'], [0x23, 'Ú'], [0x24, 'Ü'], [0x25, 'ü'],
@@ -303,7 +303,7 @@ shaka.cea.Cea608Memory.CharSet.ExtendedSpanishFrench = new Map([
 
 /**
  * Extended Portuguese/German/Danish char set.
- * @private @const {!Map<!number, !string>}
+ * @private @const {!Map<number, string>}
  */
 shaka.cea.Cea608Memory.CharSet.ExtendedPortugueseGerman = new Map([
   [0x20, 'Ã'], [0x21, 'ã'], [0x22, 'Í'], [0x23, 'Ì'], [0x24, 'ì'], [0x25, 'Ò'],