shaka-player 4.12.8 → 4.13.0

package/lib/cast/cast_utils.js

@@ -188,7 +188,7 @@ shaka.cast.CastUtils = class {
    * @private
    */
   static makeUint8Array_(obj) {
-    return new Uint8Array(/** @type {!Array.<number>} */ (obj['entries']));
+    return new Uint8Array(/** @type {!Array<number>} */ (obj['entries']));
   }
 
 
@@ -240,7 +240,7 @@ shaka.cast.CastUtils = class {
 
 /**
  * HTMLMediaElement events that are proxied while casting.
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  */
 shaka.cast.CastUtils.VideoEvents = [
   'ended',
@@ -258,7 +258,7 @@ shaka.cast.CastUtils.VideoEvents = [
 
 /**
  * HTMLMediaElement attributes that are proxied while casting.
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  */
 shaka.cast.CastUtils.VideoAttributes = [
   'buffered',
@@ -278,7 +278,7 @@ shaka.cast.CastUtils.VideoAttributes = [
 
 /**
  * HTMLMediaElement attributes that are transferred when casting begins.
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  */
 shaka.cast.CastUtils.VideoInitStateAttributes = [
   'loop',
@@ -288,7 +288,7 @@ shaka.cast.CastUtils.VideoInitStateAttributes = [
 
 /**
  * HTMLMediaElement methods with no return value that are proxied while casting.
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  */
 shaka.cast.CastUtils.VideoVoidMethods = [
   'pause',
@@ -300,7 +300,7 @@ shaka.cast.CastUtils.VideoVoidMethods = [
  * Player getter methods that are proxied while casting.
  * The key is the method, the value is the frequency of updates.
  * Frequency 1 translates to every update; frequency 2 to every 2 updates, etc.
- * @const {!Object.<string, number>}
+ * @const {!Object<string, number>}
  */
 shaka.cast.CastUtils.PlayerGetterMethods = {
   // NOTE: The 'drmInfo' property is not proxied, as it is very large.
@@ -337,12 +337,13 @@ shaka.cast.CastUtils.PlayerGetterMethods = {
  * Player getter methods with data large enough to be sent in their own update
  * messages, to reduce the size of each message.  The format of this is
  * identical to PlayerGetterMethods.
- * @const {!Object.<string, number>}
+ * @const {!Object<string, number>}
  */
 shaka.cast.CastUtils.LargePlayerGetterMethods = {
   // NOTE: The 'getSharedConfiguration' property is not proxied as it would
   //       not be possible to share a reference.
   'getConfiguration': 4,
+  'getConfigurationForLowLatency': 4,
   'getStats': 5,
   'getTextTracks': 2,
   'getVariantTracks': 2,
@@ -354,7 +355,7 @@ shaka.cast.CastUtils.LargePlayerGetterMethods = {
  * a livestream.
  * The key is the method, the value is the frequency of updates.
  * Frequency 1 translates to every update; frequency 2 to every 2 updates, etc.
- * @const {!Object.<string, number>}
+ * @const {!Object<string, number>}
  */
 shaka.cast.CastUtils.PlayerGetterMethodsThatRequireLive = {
   'getPlayheadTimeAsDate': 1,
@@ -366,17 +367,22 @@ shaka.cast.CastUtils.PlayerGetterMethodsThatRequireLive = {
 /**
  * Player getter and setter methods that are used to transfer state when casting
  * begins.
- * @const {!Array.<!Array.<string>>}
+ * @const {!Array<!Array<string>>}
  */
 shaka.cast.CastUtils.PlayerInitState = [
-  ['getConfiguration', 'configure'],
+  [
+    'getConfiguration',
+    'configure',
+    'getConfigurationForLowLatency',
+    'configurationForLowLatency',
+  ],
 ];
 
 
 /**
  * Player getter and setter methods that are used to transfer state after
  * load() is resolved.
- * @const {!Array.<!Array.<string>>}
+ * @const {!Array<!Array<string>>}
  */
 shaka.cast.CastUtils.PlayerInitAfterLoadState = [
   ['isTextTrackVisible', 'setTextTrackVisibility'],
@@ -385,7 +391,7 @@ shaka.cast.CastUtils.PlayerInitAfterLoadState = [
 
 /**
  * Player methods with no return value that are proxied while casting.
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  */
 shaka.cast.CastUtils.PlayerVoidMethods = [
   'addChaptersTrack',
@@ -393,6 +399,7 @@ shaka.cast.CastUtils.PlayerVoidMethods = [
   'addThumbnailsTrack',
   'cancelTrickPlay',
   'configure',
+  'configurationForLowLatency',
   'getChapters',
   'getChaptersTracks',
   'resetConfiguration',
@@ -411,7 +418,7 @@ shaka.cast.CastUtils.PlayerVoidMethods = [
 
 /**
  * Player methods returning a Promise that are proxied while casting.
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  */
 shaka.cast.CastUtils.PlayerPromiseMethods = [
   'attach',

package/lib/cea/cea608_data_channel.js

@@ -53,7 +53,7 @@ shaka.cea.Cea608DataChannel = class {
      * Points to current buffer.
      * @private {!shaka.cea.Cea608Memory}
      */
-    this.curbuf_ = this.nonDisplayedMemory_;
+    this.curBuf_ = this.nonDisplayedMemory_;
 
     /**
      * End time of the previous caption, serves as start time of next caption.
@@ -65,7 +65,7 @@ shaka.cea.Cea608DataChannel = class {
      * Last control pair, 16 bits representing byte 1 and byte 2
      * @private {?number}
      */
-    this.lastcp_ = null;
+    this.lastCp_ = null;
   }
 
   /**
@@ -73,8 +73,8 @@ shaka.cea.Cea608DataChannel = class {
    */
   reset() {
     this.type_ = shaka.cea.Cea608DataChannel.CaptionType.NONE;
-    this.curbuf_ = this.nonDisplayedMemory_;
-    this.lastcp_ = null;
+    this.curBuf_ = this.nonDisplayedMemory_;
+    this.lastCp_ = null;
     this.displayedMemory_.reset();
     this.nonDisplayedMemory_.reset();
     this.text_.reset();
@@ -99,7 +99,7 @@ shaka.cea.Cea608DataChannel = class {
    * @private
    */
   pacToRow_(b1, b2) {
-    const ccrowtab = [
+    const ccRowTab = [
       11, 11,  // 0x00 or 0x01
       1, 2,    // 0x02 -> 0x03
       3, 4,    // 0x04 -> 0x05
@@ -109,7 +109,7 @@ shaka.cea.Cea608DataChannel = class {
       7, 8,    // 0x0C -> 0x0D
       9, 10,   // 0x0E -> 0x0F
     ];
-    return ccrowtab[((b1 & 0x07) << 1) | ((b2 >> 5) & 0x01)];
+    return ccRowTab[((b1 & 0x07) << 1) | ((b2 >> 5) & 0x01)];
   }
 
   /**
@@ -154,7 +154,7 @@ shaka.cea.Cea608DataChannel = class {
     }
 
     // Execute the PAC.
-    const buf = this.curbuf_;
+    const buf = this.curBuf_;
 
     // Move entire scroll window to a new base in rollup mode.
     if (this.type_ === shaka.cea.Cea608DataChannel.CaptionType.ROLLUP &&
@@ -188,12 +188,12 @@ shaka.cea.Cea608DataChannel = class {
    */
   controlMidrow_(b2) {
     // Clear all pre-existing midrow style attributes.
-    this.curbuf_.setUnderline(false);
-    this.curbuf_.setItalics(false);
-    this.curbuf_.setTextColor(shaka.cea.CeaUtils.DEFAULT_TXT_COLOR);
+    this.curBuf_.setUnderline(false);
+    this.curBuf_.setItalics(false);
+    this.curBuf_.setTextColor(shaka.cea.CeaUtils.DEFAULT_TXT_COLOR);
 
     // Mid-row attrs use a space.
-    this.curbuf_.addChar(
+    this.curBuf_.addChar(
         shaka.cea.Cea608Memory.CharSet.BASIC_NORTH_AMERICAN, ' '.charCodeAt(0));
 
     let textColor = shaka.cea.CeaUtils.DEFAULT_TXT_COLOR;
@@ -209,9 +209,9 @@ shaka.cea.Cea608DataChannel = class {
       italics = true;
     }
 
-    this.curbuf_.setUnderline(underline);
-    this.curbuf_.setItalics(italics);
-    this.curbuf_.setTextColor(textColor);
+    this.curBuf_.setUnderline(underline);
+    this.curBuf_.setItalics(italics);
+    this.curBuf_.setTextColor(textColor);
   }
 
   /**
@@ -226,7 +226,7 @@ shaka.cea.Cea608DataChannel = class {
       // If background provided, last 3 bits of b1 are |0|0|0|. Color is in b2.
       backgroundColor = shaka.cea.Cea608DataChannel.BG_COLORS[(b2 & 0xe) >> 1];
     }
-    this.curbuf_.setBackgroundColor(backgroundColor);
+    this.curBuf_.setBackgroundColor(backgroundColor);
   }
 
   /**
@@ -302,7 +302,7 @@ shaka.cea.Cea608DataChannel = class {
    * @private
    */
   controlCr_(pts) {
-    const buf = this.curbuf_;
+    const buf = this.curBuf_;
     // Only rollup and text mode is affected, but we don't emit text mode.
     if (this.type_ !== shaka.cea.Cea608DataChannel.CaptionType.ROLLUP) {
       return null;
@@ -311,13 +311,13 @@ shaka.cea.Cea608DataChannel = class {
     const parsedClosedCaption = buf.forceEmit(this.prevEndTime_, pts);
 
     // Calculate the top of the scroll window.
-    const toprow = (buf.getRow() - buf.getScrollSize()) + 1;
+    const topRow = (buf.getRow() - buf.getScrollSize()) + 1;
 
     // Shift up the window one row higher.
-    buf.moveRows(toprow - 1, toprow, buf.getScrollSize());
+    buf.moveRows(topRow - 1, topRow, buf.getScrollSize());
 
     // Clear out anything that's outside of our current scroll window.
-    buf.resetRows(0, toprow - 1);
+    buf.resetRows(0, topRow - 1);
     buf.resetRows(buf.getRow(), shaka.cea.Cea608Memory.CC_ROWS - buf.getRow());
 
     // Update the end time so the next caption emits starting at this time.
@@ -335,8 +335,8 @@ shaka.cea.Cea608DataChannel = class {
    * @private
    */
   controlRu_(scrollSize, pts) {
-    this.curbuf_ = this.displayedMemory_;  // Point to displayed memory
-    const buf = this.curbuf_;
+    this.curBuf_ = this.displayedMemory_;  // Point to displayed memory
+    const buf = this.curBuf_;
     let parsedClosedCaption = null;
 
     // For any type except rollup and text mode, it should be emitted,
@@ -364,7 +364,7 @@ shaka.cea.Cea608DataChannel = class {
    * @private
    */
   controlFon_() {
-    this.curbuf_.addChar(
+    this.curBuf_.addChar(
         shaka.cea.Cea608Memory.CharSet.BASIC_NORTH_AMERICAN,
         ' '.charCodeAt(0));
   }
@@ -399,10 +399,10 @@ shaka.cea.Cea608DataChannel = class {
   controlRdc_(pts) {
     this.type_ = shaka.cea.Cea608DataChannel.CaptionType.PAINTON;
     // Point to displayed memory.
-    this.curbuf_ = this.displayedMemory_;
+    this.curBuf_ = this.displayedMemory_;
 
     // No scroll window now.
-    this.curbuf_.setScrollSize(0);
+    this.curBuf_.setScrollSize(0);
 
     // The next paint-on caption needs this time as the start time.
     this.prevEndTime_ = pts;
@@ -451,9 +451,9 @@ shaka.cea.Cea608DataChannel = class {
    */
   controlRcl_() {
     this.type_ = shaka.cea.Cea608DataChannel.CaptionType.POPON;
-    this.curbuf_ = this.nonDisplayedMemory_;
+    this.curBuf_ = this.nonDisplayedMemory_;
     // No scroll window now
-    this.curbuf_.setScrollSize(0);
+    this.curBuf_.setScrollSize(0);
   }
 
 
@@ -462,7 +462,7 @@ shaka.cea.Cea608DataChannel = class {
    * @private
    */
   controlBs_() {
-    this.curbuf_.eraseChar();
+    this.curBuf_.eraseChar();
   }
 
   /**
@@ -484,7 +484,7 @@ shaka.cea.Cea608DataChannel = class {
   controlRtd_() {
     shaka.log.warnOnce('Cea608DataChannel',
         'CEA-608 text mode entered, but is unsupported');
-    this.curbuf_ = this.text_;
+    this.curBuf_ = this.text_;
     this.type_ = shaka.cea.Cea608DataChannel.CaptionType.TEXT;
   }
 
@@ -494,9 +494,9 @@ shaka.cea.Cea608DataChannel = class {
    * @param {number} b2 Byte 2.
    */
   handleBasicNorthAmericanChar(b1, b2) {
-    this.curbuf_.addChar(
+    this.curBuf_.addChar(
         shaka.cea.Cea608Memory.CharSet.BASIC_NORTH_AMERICAN, b1);
-    this.curbuf_.addChar(
+    this.curBuf_.addChar(
         shaka.cea.Cea608Memory.CharSet.BASIC_NORTH_AMERICAN, b2);
   }
 
@@ -512,7 +512,7 @@ shaka.cea.Cea608DataChannel = class {
           shaka.cea.Cea608Memory.CharSet.PORTUGUESE_GERMAN:
           shaka.cea.Cea608Memory.CharSet.SPANISH_FRENCH;
 
-    this.curbuf_.addChar(charSet, b2);
+    this.curBuf_.addChar(charSet, b2);
   }
 
   /**
@@ -522,7 +522,7 @@ shaka.cea.Cea608DataChannel = class {
    * @private
    */
   handleOffset_(offset) {
-    this.curbuf_.setOffset(offset);
+    this.curBuf_.setOffset(offset);
   }
 
   /**
@@ -540,13 +540,13 @@ shaka.cea.Cea608DataChannel = class {
     // seen in broadcast captures. If the very next frame has a duplicate
     // control code, that duplicate is ignored. Note that this only applies
     // to the very next frame, and only for one match.
-    if (this.lastcp_ === ((b1 << 8) | b2)) {
-      this.lastcp_ = null;
+    if (this.lastCp_ === ((b1 << 8) | b2)) {
+      this.lastCp_ = null;
       return null;
     }
 
     // Remember valid control code for checking in next frame!
-    this.lastcp_ = (b1 << 8) | b2;
+    this.lastCp_ = (b1 << 8) | b2;
 
     if (this.isPAC_(b1, b2)) {
       this.controlPac_(b1, b2);
@@ -555,7 +555,7 @@ shaka.cea.Cea608DataChannel = class {
     } else if (this.isBackgroundAttribute_(b1, b2)) {
       this.controlBackgroundAttribute_(b1, b2);
     } else if (this.isSpecialNorthAmericanChar_(b1, b2)) {
-      this.curbuf_.addChar(
+      this.curBuf_.addChar(
           shaka.cea.Cea608Memory.CharSet.SPECIAL_NORTH_AMERICAN, b2);
     } else if (this.isExtendedWesternEuropeanChar_(b1, b2)) {
       this.handleExtendedWesternEuropeanChar_(b1, b2);
@@ -794,21 +794,21 @@ shaka.cea.Cea608DataChannel.Style;
 /**
  * CEA closed captions packet.
  * @typedef {{
-  *   pts: number,
-  *   type: number,
-  *   ccData1: number,
-  *   ccData2: number,
-  *   order: number
-  * }}
-  *
-  * @property {number} pts
-  *   Presentation timestamp (in second) at which this packet was received.
-  * @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
-  *   A number indicating the order this packet was received in a sequence
-  *   of packets. Used to break ties in a stable sorting algorithm
-  */
+ *   pts: number,
+ *   type: number,
+ *   ccData1: number,
+ *   ccData2: number,
+ *   order: number
+ * }}
+ *
+ * @property {number} pts
+ *   Presentation timestamp (in second) at which this packet was received.
+ * @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
+ *   A number indicating the order this packet was received in a sequence
+ *   of packets. Used to break ties in a stable sorting algorithm
+ */
 shaka.cea.Cea608DataChannel.Cea608Packet;

package/lib/cea/cea708_service.js

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+// cspell:ignore PNSTY
+
 goog.provide('shaka.cea.Cea708Service');
 
 goog.require('shaka.cea.Cea708Window');
@@ -43,7 +45,7 @@ shaka.cea.Cea708Service = class {
   /**
    * Processes a CEA-708 control code.
    * @param {!shaka.cea.DtvccPacket} dtvccPacket
-   * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
+   * @return {!Array<shaka.extern.ICaptionDecoder.ClosedCaption>}
    * @throws {!shaka.util.Error}
    */
   handleCea708ControlCode(dtvccPacket) {
@@ -77,7 +79,7 @@ shaka.cea.Cea708Service = class {
       this.handleG3_(controlCode & 0xff);
     }
 
-    return null;
+    return [];
   }
 
   /**
@@ -156,37 +158,29 @@ shaka.cea.Cea708Service = class {
    * @param {!shaka.cea.DtvccPacket} dtvccPacket
    * @param {number} controlCode
    * @param {number} pts
-   * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
+   * @return {!Array<shaka.extern.ICaptionDecoder.ClosedCaption>}
    * @private
    */
   handleC0_(dtvccPacket, controlCode, pts) {
     // All these commands pertain to the current window, so ensure it exists.
     if (!this.currentWindow_) {
-      return null;
+      return [];
     }
 
     if (controlCode == 0x18) {
       const firstByte = dtvccPacket.readByte().value;
       const secondByte = dtvccPacket.readByte().value;
 
-      const isTextBlock = (b) => {
-        return (b >= 0x20 && b <= 0x7f) || (b >= 0xa0 && b <= 0xff);
+      const toHexString = (byteArray) => {
+        return byteArray.map((byte) => {
+          return ('0' + (byte & 0xFF).toString(16)).slice(-2);
+        }).join('');
       };
-
-      if (isTextBlock(firstByte) && isTextBlock(secondByte)) {
-        const toHexString = (byteArray) => {
-          return byteArray.map((byte) => {
-            return ('0' + (byte & 0xFF).toString(16)).slice(-2);
-          }).join('');
-        };
-        const unicode = toHexString([firstByte, secondByte]);
-        // Takes a unicode hex string and creates a single character.
-        const char = String.fromCharCode(parseInt(unicode, 16));
-        this.currentWindow_.setCharacter(char);
-        return null;
-      } else {
-        dtvccPacket.rewind(2);
-      }
+      const unicode = toHexString([firstByte, secondByte]);
+      // Takes a unicode hex string and creates a single character.
+      const char = String.fromCharCode(parseInt(unicode, 16));
+      this.currentWindow_.setCharacter(char);
+      return [];
     }
 
     const window = this.currentWindow_;
@@ -222,7 +216,7 @@ shaka.cea.Cea708Service = class {
         window.setPenLocation(0, 0);
         break;
     }
-    return parsedClosedCaption;
+    return parsedClosedCaption ? [parsedClosedCaption] : [];
   }
 
   /**
@@ -231,7 +225,7 @@ shaka.cea.Cea708Service = class {
    * @param {!shaka.cea.DtvccPacket} dtvccPacket
    * @param {number} captionCommand
    * @param {number} pts in seconds
-   * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
+   * @return {!Array<shaka.extern.ICaptionDecoder.ClosedCaption>}
    * @throws {!shaka.util.Error} a possible out-of-range buffer read.
    * @private
    */
@@ -272,7 +266,7 @@ shaka.cea.Cea708Service = class {
       const windowNum = (captionCommand & 0x0f) - 8;
       this.defineWindow_(dtvccPacket, windowNum, pts);
     }
-    return null;
+    return [];
   }
 
   /**
@@ -324,7 +318,7 @@ shaka.cea.Cea708Service = class {
   /**
    * Yields each non-null window specified in the 8-bit bitmap.
    * @param {number} bitmap 8 bits corresponding to each of the 8 windows.
-   * @return {!Array.<number>}
+   * @return {!Array<number>}
    * @private
    */
   getSpecifiedWindowIds_(bitmap) {
@@ -342,22 +336,26 @@ shaka.cea.Cea708Service = class {
   /**
    * @param {number} windowsBitmap
    * @param {number} pts
-   * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
+   * @return {!Array<shaka.extern.ICaptionDecoder.ClosedCaption>}
    * @private
    */
   clearWindows_(windowsBitmap, pts) {
-    let parsedClosedCaption = null;
+    const parsedClosedCaptions = [];
 
     // Clears windows from the 8 bit bitmap.
     for (const windowId of this.getSpecifiedWindowIds_(windowsBitmap)) {
       // If window visible and being cleared, emit buffer and reset start time!
       const window = this.windows_[windowId];
       if (window.isVisible()) {
-        parsedClosedCaption = window.forceEmit(pts, this.serviceNumber_);
+        const newParsedClosedCaption =
+            window.forceEmit(pts, this.serviceNumber_);
+        if (newParsedClosedCaption) {
+          parsedClosedCaptions.push(newParsedClosedCaption);
+        }
       }
       window.resetMemory();
     }
-    return parsedClosedCaption;
+    return parsedClosedCaptions;
   }
 
   /**
@@ -380,7 +378,7 @@ shaka.cea.Cea708Service = class {
   /**
    * @param {number} windowsBitmap
    * @param {number} pts
-   * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
+   * @return {!Array<shaka.extern.ICaptionDecoder.ClosedCaption>}
    * @private
    */
   hideWindows_(windowsBitmap, pts) {
@@ -395,13 +393,13 @@ shaka.cea.Cea708Service = class {
       }
       window.hide();
     }
-    return parsedClosedCaption;
+    return parsedClosedCaption ? [parsedClosedCaption] : [];
   }
 
   /**
    * @param {number} windowsBitmap
    * @param {number} pts
-   * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
+   * @return {!Array<shaka.extern.ICaptionDecoder.ClosedCaption>}
    * @private
    */
   toggleWindows_(windowsBitmap, pts) {
@@ -420,42 +418,46 @@ shaka.cea.Cea708Service = class {
 
       window.toggle();
     }
-    return parsedClosedCaption;
+    return parsedClosedCaption ? [parsedClosedCaption] : [];
   }
 
   /**
    * @param {number} windowsBitmap
    * @param {number} pts
-   * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
+   * @return {!Array<shaka.extern.ICaptionDecoder.ClosedCaption>}
    * @private
    */
   deleteWindows_(windowsBitmap, pts) {
-    let parsedClosedCaption = null;
+    const parsedClosedCaptions = [];
     // Deletes windows from the 8 bit bitmap.
     for (const windowId of this.getSpecifiedWindowIds_(windowsBitmap)) {
       const window = this.windows_[windowId];
       if (window.isVisible()) {
         // We are turning off the visibility, emit!
-        parsedClosedCaption = window.forceEmit(pts, this.serviceNumber_);
+        const newParsedClosedCaption =
+            window.forceEmit(pts, this.serviceNumber_);
+        if (newParsedClosedCaption) {
+          parsedClosedCaptions.push(newParsedClosedCaption);
+        }
       }
       // Delete the window from the list of windows
       this.windows_[windowId] = null;
     }
-    return parsedClosedCaption;
+    return parsedClosedCaptions;
   }
 
   /**
    * Emits anything currently present in any of the windows, and then
    * deletes all windows, cancels all delays, reinitializes the service.
    * @param {number} pts
-   * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
+   * @return {!Array<shaka.extern.ICaptionDecoder.ClosedCaption>}
    * @private
    */
   reset_(pts) {
     const allWindowsBitmap = 0xff; // All windows should be deleted.
-    const caption = this.deleteWindows_(allWindowsBitmap, pts);
+    const captions = this.deleteWindows_(allWindowsBitmap, pts);
     this.clear();
-    return caption;
+    return captions;
   }
 
   /**

package/lib/cea/cea708_window.js

@@ -18,6 +18,7 @@ goog.require('shaka.text.CueRegion');
 shaka.cea.Cea708Window = class {
   /**
    * @param {number} windowNum
+   * @param {number} parentService
    */
   constructor(windowNum, parentService) {
     /**
@@ -229,6 +230,7 @@ shaka.cea.Cea708Window = class {
   }
 
   /**
+   * @return {boolean}
    * @private
    */
   isPenInBounds_() {
@@ -424,8 +426,9 @@ shaka.cea.Cea708Window = class {
     // WebVTT's region viewport anchors are technically always in percentages.
     // However, we don't know the aspect ratio of the video at this point,
     // which determines how we interpret the horizontal anchor.
-    // So, we expose the additonal flag to reflect whether these viewport anchor
-    // values can be used be used as is or should be converted to percentages.
+    // So, we expose the additional flag to reflect whether these viewport
+    // anchor values can be used as is or should be converted
+    // to percentages.
     region.viewportAnchorUnits = this.relativeToggle_ ?
       shaka.text.CueRegion.units.PERCENTAGE : shaka.text.CueRegion.units.LINES;
 

package/lib/cea/cea_decoder.js

@@ -85,7 +85,7 @@ shaka.cea.CeaDecoder = class {
 
     /**
      * Set used to track available streams.
-     * @private {!Set.<string>}
+     * @private {!Set<string>}
      */
     this.streams_ = new Set();
 
@@ -221,7 +221,7 @@ shaka.cea.CeaDecoder = class {
    * @override
    */
   decode() {
-    /** @type {!Array.<!shaka.extern.ICaptionDecoder.ClosedCaption>} */
+    /** @type {!Array<!shaka.extern.ICaptionDecoder.ClosedCaption>} */
     const parsedClosedCaptions = [];
 
     // In some versions of Chrome, and other browsers, the default sorting
@@ -346,7 +346,7 @@ shaka.cea.CeaDecoder = class {
 
         // First 3 bits are service number, next 5 are block size,
         // representing the number of bytes coming in this block
-        // (discluding a possible extended service block header byte)
+        // (excluding a possible extended service block header byte)
         let serviceNumber = (serviceBlockHeader & 0xe0) >> 5;
         const blockSize = serviceBlockHeader & 0x1f;
 
@@ -371,10 +371,8 @@ shaka.cea.CeaDecoder = class {
 
           // Execute this loop `blockSize` times, to decode the control codes.
           while (dtvccPacket.getPosition() - startPos < blockSize) {
-            const closedCaption = service.handleCea708ControlCode(dtvccPacket);
-            if (closedCaption) {
-              parsedClosedCaptions.push(closedCaption);
-            }
+            const closedCaptions = service.handleCea708ControlCode(dtvccPacket);
+            parsedClosedCaptions.push(...closedCaptions);
           }  // position < end of block
         }  // serviceNumber != 0
       }  // hasMoreData