shaka-player 4.3.9 → 4.4.0

package/lib/cea/cea_decoder.js

@@ -9,16 +9,17 @@ goog.provide('shaka.cea.CeaDecoder');
 goog.require('shaka.cea.Cea608DataChannel');
 goog.require('shaka.cea.Cea708Service');
 goog.require('shaka.cea.DtvccPacketBuilder');
-goog.require('shaka.cea.ICaptionDecoder');
 goog.require('shaka.log');
+goog.require('shaka.media.ClosedCaptionParser');
 goog.require('shaka.util.DataViewReader');
 goog.require('shaka.util.Error');
 goog.requireType('shaka.cea.DtvccPacket');
 
 
 /**
- * CEA-X08 captions decoder. Currently only CEA-608 supported.
- * @implements {shaka.cea.ICaptionDecoder}
+ * CEA-X08 captions decoder.
+ * @implements {shaka.extern.ICaptionDecoder}
+ * @export
  */
 shaka.cea.CeaDecoder = class {
   /** */
@@ -77,6 +78,11 @@ shaka.cea.CeaDecoder = class {
      */
     this.serviceNumberToService_ = new Map();
 
+    /**
+     * @private {boolean}
+     */
+    this.waitingForFirstPacket_ = true;
+
     this.reset();
   }
 
@@ -106,6 +112,7 @@ shaka.cea.CeaDecoder = class {
     for (const stream of this.cea608ModeToStream_.values()) {
       stream.reset();
     }
+    this.waitingForFirstPacket_ = true;
   }
 
   /**
@@ -114,6 +121,13 @@ shaka.cea.CeaDecoder = class {
    * @override
    */
   extract(userDataSeiMessage, pts) {
+    if (this.waitingForFirstPacket_) {
+      for (const stream of this.cea608ModeToStream_.values()) {
+        stream.firstPts(pts);
+      }
+      this.waitingForFirstPacket_ = false;
+    }
+
     const reader = new shaka.util.DataViewReader(
         userDataSeiMessage, shaka.util.DataViewReader.Endianness.BIG_ENDIAN);
 
@@ -195,7 +209,7 @@ shaka.cea.CeaDecoder = class {
    * @override
    */
   decode() {
-    /** @type {!Array.<!shaka.cea.ICaptionDecoder.ClosedCaption>} */
+    /** @type {!Array.<!shaka.extern.ICaptionDecoder.ClosedCaption>} */
     const parsedClosedCaptions = [];
 
     // In some versions of Chrome, and other browsers, the default sorting
@@ -237,7 +251,7 @@ shaka.cea.CeaDecoder = class {
   /**
    * Decodes a CEA-608 closed caption packet based on ANSI/CEA-608.
    * @param {shaka.cea.Cea608DataChannel.Cea608Packet} ccPacket
-   * @return {?shaka.cea.ICaptionDecoder.ClosedCaption}
+   * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
    * @private
    */
   decodeCea608_(ccPacket) {
@@ -302,7 +316,7 @@ shaka.cea.CeaDecoder = class {
   /**
    * Decodes a CEA-708 DTVCC packet based on ANSI/CTA-708-E.
    * @param {shaka.cea.DtvccPacket} dtvccPacket
-   * @return {!Array<!shaka.cea.ICaptionDecoder.ClosedCaption>}
+   * @return {!Array<!shaka.extern.ICaptionDecoder.ClosedCaption>}
    * @private
    */
   decodeCea708_(dtvccPacket) {
@@ -402,3 +416,6 @@ shaka.cea.CeaDecoder.NTSC_CC_FIELD_2 = 1;
  * @private @const {number}
  */
 shaka.cea.CeaDecoder.USA_COUNTRY_CODE = 0xb5;
+
+shaka.media.ClosedCaptionParser.registerDecoder(
+    () => new shaka.cea.CeaDecoder());

package/lib/cea/cea_utils.js

@@ -7,7 +7,6 @@
 goog.provide('shaka.cea.CeaUtils');
 goog.provide('shaka.cea.CeaUtils.StyledChar');
 
-goog.require('shaka.cea.ICaptionDecoder');
 goog.require('shaka.text.Cue');
 
 
@@ -19,7 +18,7 @@ shaka.cea.CeaUtils = class {
    * @param {!Array<!Array<?shaka.cea.CeaUtils.StyledChar>>} memory
    * @param {number} startTime Start time of the cue.
    * @param {number} endTime End time of the cue.
-   * @return {?shaka.cea.ICaptionDecoder.ClosedCaption}
+   * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
    */
   static getParsedCaption(topLevelCue, stream, memory, startTime, endTime) {
     if (startTime >= endTime) {
@@ -270,3 +269,27 @@ shaka.cea.CeaUtils.DEFAULT_BG_COLOR = 'black';
  * @const {string}
  */
 shaka.cea.CeaUtils.DEFAULT_TXT_COLOR = 'white';
+
+/**
+ * NALU type for Supplemental Enhancement Information (SEI) for H.264.
+ * @const {number}
+ */
+shaka.cea.CeaUtils.H264_NALU_TYPE_SEI = 0x06;
+
+/**
+ * NALU type for Supplemental Enhancement Information (SEI) for H.265.
+ * @const {number}
+ */
+shaka.cea.CeaUtils.H265_PREFIX_NALU_TYPE_SEI = 0x27;
+
+/**
+ * NALU type for Supplemental Enhancement Information (SEI) for H.265.
+ * @const {number}
+ */
+shaka.cea.CeaUtils.H265_SUFFIX_NALU_TYPE_SEI = 0x28;
+
+/**
+ * Default timescale value for a track.
+ * @const {number}
+ */
+shaka.cea.CeaUtils.DEFAULT_TIMESCALE_VALUE = 90000;

package/lib/cea/dummy_caption_decoder.js

@@ -0,0 +1,21 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.cea.DummyCaptionDecoder');
+
+/** @implements {shaka.extern.ICaptionDecoder} */
+shaka.cea.DummyCaptionDecoder = class {
+  /** @override */
+  extract(userDataSeiMessage, pts) {}
+
+  /** @override */
+  decode() {
+    return [];
+  }
+
+  /** @override */
+  clear() {}
+};

package/lib/cea/dummy_cea_parser.js

@@ -6,11 +6,9 @@
 
 goog.provide('shaka.cea.DummyCeaParser');
 
-goog.require('shaka.cea.ICeaParser');
-
 /**
  * Dummy CEA parser.
- * @implements {shaka.cea.ICeaParser}
+ * @implements {shaka.extern.ICeaParser}
  */
 shaka.cea.DummyCeaParser = class {
   /**

package/lib/cea/mp4_cea_parser.js

@@ -7,9 +7,10 @@
 goog.provide('shaka.cea.Mp4CeaParser');
 
 goog.require('goog.asserts');
-goog.require('shaka.cea.ICeaParser');
+goog.require('shaka.cea.CeaUtils');
 goog.require('shaka.cea.SeiProcessor');
 goog.require('shaka.log');
+goog.require('shaka.media.ClosedCaptionParser');
 goog.require('shaka.util.DataViewReader');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.Mp4Parser');
@@ -17,7 +18,8 @@ goog.require('shaka.util.Mp4BoxParsers');
 
 /**
  * MPEG4 stream parser used for extracting 708 closed captions data.
- * @implements {shaka.cea.ICeaParser}
+ * @implements {shaka.extern.ICeaParser}
+ * @export
  */
 shaka.cea.Mp4CeaParser = class {
   /** */
@@ -157,7 +159,7 @@ shaka.cea.Mp4CeaParser = class {
       return [];
     }
 
-    /** @type {!Array<!shaka.cea.ICeaParser.CaptionPacket>} **/
+    /** @type {!Array<!shaka.extern.ICeaParser.CaptionPacket>} **/
     const captionPackets = [];
 
     // Fields that are found in MOOF boxes
@@ -167,7 +169,7 @@ shaka.cea.Mp4CeaParser = class {
     /** @type {!Array<shaka.util.ParsedTRUNBox>} */
     let parsedTRUNs = [];
     let baseMediaDecodeTime = null;
-    let timescale = shaka.cea.ICeaParser.DEFAULT_TIMESCALE_VALUE;
+    let timescale = shaka.cea.CeaUtils.DEFAULT_TIMESCALE_VALUE;
 
     new Mp4Parser()
         .box('moof', (box) => {
@@ -214,7 +216,7 @@ shaka.cea.Mp4CeaParser = class {
               box.version != null,
               'TFDT is a full box and should have a valid version.');
 
-          const parsedTFDT = shaka.util.Mp4BoxParsers.parseTFDT(
+          const parsedTFDT = shaka.util.Mp4BoxParsers.parseTFDTInaccurate(
               box.reader, box.version);
 
           baseMediaDecodeTime = parsedTFDT.baseMediaDecodeTime;
@@ -250,13 +252,13 @@ shaka.cea.Mp4CeaParser = class {
    * @param {number} defaultSampleSize
    * @param {number} offset
    * @param {!Array<shaka.util.ParsedTRUNBox>} parsedTRUNs
-   * @param {!Array<!shaka.cea.ICeaParser.CaptionPacket>} captionPackets
+   * @param {!Array<!shaka.extern.ICeaParser.CaptionPacket>} captionPackets
    * @private
    */
   parseMdat_(reader, time, timescale, defaultSampleDuration,
       defaultSampleSize, offset, parsedTRUNs, captionPackets) {
     const BitstreamFormat = shaka.cea.Mp4CeaParser.BitstreamFormat;
-    const ICeaParser = shaka.cea.ICeaParser;
+    const CeaUtils = shaka.cea.CeaUtils;
     let sampleIndex = 0;
 
     // The fields in each ParsedTRUNSample contained in the sampleData
@@ -288,7 +290,7 @@ shaka.cea.Mp4CeaParser = class {
       switch (this.bitstreamFormat_) {
         case BitstreamFormat.H264:
           naluType = naluHeader & 0x1f;
-          isSeiMessage = naluType == ICeaParser.H264_NALU_TYPE_SEI;
+          isSeiMessage = naluType == CeaUtils.H264_NALU_TYPE_SEI;
           break;
 
         case BitstreamFormat.H265:
@@ -296,8 +298,8 @@ shaka.cea.Mp4CeaParser = class {
           reader.skip(1);
           naluType = (naluHeader >> 1) & 0x3f;
           isSeiMessage =
-              naluType == ICeaParser.H265_PREFIX_NALU_TYPE_SEI ||
-              naluType == ICeaParser.H265_SUFFIX_NALU_TYPE_SEI;
+              naluType == CeaUtils.H265_PREFIX_NALU_TYPE_SEI ||
+              naluType == CeaUtils.H265_SUFFIX_NALU_TYPE_SEI;
           break;
 
         default:
@@ -376,3 +378,6 @@ shaka.cea.Mp4CeaParser.CodecBitstreamMap_ = {
   'dvh1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
   'dvhe': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
 };
+
+shaka.media.ClosedCaptionParser.registerParser('video/mp4',
+    () => new shaka.cea.Mp4CeaParser());

package/lib/cea/ts_cea_parser.js

@@ -0,0 +1,69 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.cea.TsCeaParser');
+
+goog.require('shaka.cea.CeaUtils');
+goog.require('shaka.cea.SeiProcessor');
+goog.require('shaka.media.ClosedCaptionParser');
+goog.require('shaka.util.BufferUtils');
+goog.require('shaka.util.TsParser');
+
+/**
+ * MPEG TS CEA parser.
+ * @implements {shaka.extern.ICeaParser}
+ * @export
+ */
+shaka.cea.TsCeaParser = class {
+  /** */
+  constructor() {
+    /**
+     * SEI data processor.
+     * @private
+     * @const {!shaka.cea.SeiProcessor}
+     */
+    this.seiProcessor_ = new shaka.cea.SeiProcessor();
+  }
+
+  /**
+   * @override
+   */
+  init(initSegment) {
+    // TS hasn't init segment
+  }
+
+  /**
+   * @override
+   */
+  parse(mediaSegment) {
+    const CeaUtils = shaka.cea.CeaUtils;
+
+    /** @type {!Array<!shaka.extern.ICeaParser.CaptionPacket>} **/
+    const captionPackets = [];
+
+    const uint8ArrayData = shaka.util.BufferUtils.toUint8(mediaSegment);
+    if (!shaka.util.TsParser.probe(uint8ArrayData)) {
+      return captionPackets;
+    }
+    const tsParser = new shaka.util.TsParser().parse(uint8ArrayData);
+    const videoNalus = tsParser.getVideoNalus();
+    for (const nalu of videoNalus) {
+      if (nalu.type == CeaUtils.H264_NALU_TYPE_SEI &&
+          nalu.time != null) {
+        for (const packet of this.seiProcessor_.process(nalu.data)) {
+          captionPackets.push({
+            packet: packet,
+            pts: nalu.time,
+          });
+        }
+      }
+    }
+    return captionPackets;
+  }
+};
+
+shaka.media.ClosedCaptionParser.registerParser('video/mp2t',
+    () => new shaka.cea.TsCeaParser());

package/lib/dash/content_protection.js

@@ -166,12 +166,19 @@ shaka.dash.ContentProtection = class {
 
   /**
    * Gets a Widevine license URL from a content protection element
-   * containing a custom `ms:laurl` element
+   * containing a custom `ms:laurl` or 'dashif:Laurl' elements
    *
    * @param {shaka.dash.ContentProtection.Element} element
    * @return {string}
    */
   static getWidevineLicenseUrl(element) {
+    const dashIfLaurlNode = shaka.util.XmlUtils.findChildNS(
+        element.node, shaka.dash.ContentProtection.DashIfNamespaceUri_,
+        'Laurl',
+    );
+    if (dashIfLaurlNode && dashIfLaurlNode.textContent) {
+      return dashIfLaurlNode.textContent;
+    }
     const mslaurlNode = shaka.util.XmlUtils.findChildNS(
         element.node, 'urn:microsoft', 'laurl');
     if (mslaurlNode) {
@@ -182,12 +189,19 @@ shaka.dash.ContentProtection = class {
 
   /**
    * Gets a ClearKey license URL from a content protection element
-   * containing a custom `clearkey::Laurl` element
+   * containing a custom `clearkey::Laurl` or 'dashif:Laurl' elements
    *
    * @param {shaka.dash.ContentProtection.Element} element
    * @return {string}
    */
   static getClearKeyLicenseUrl(element) {
+    const dashIfLaurlNode = shaka.util.XmlUtils.findChildNS(
+        element.node, shaka.dash.ContentProtection.DashIfNamespaceUri_,
+        'Laurl',
+    );
+    if (dashIfLaurlNode && dashIfLaurlNode.textContent) {
+      return dashIfLaurlNode.textContent;
+    }
     const clearKeyLaurlNode = shaka.util.XmlUtils.findChildNS(
         element.node, shaka.dash.ContentProtection.ClearKeyNamespaceUri_,
         'Laurl',
@@ -307,6 +321,14 @@ shaka.dash.ContentProtection = class {
    * @return {string}
    */
   static getPlayReadyLicenseUrl(element) {
+    const dashIfLaurlNode = shaka.util.XmlUtils.findChildNS(
+        element.node, shaka.dash.ContentProtection.DashIfNamespaceUri_,
+        'Laurl',
+    );
+    if (dashIfLaurlNode && dashIfLaurlNode.textContent) {
+      return dashIfLaurlNode.textContent;
+    }
+
     const proNode = shaka.util.XmlUtils.findChildNS(
         element.node, 'urn:microsoft:playready', 'pro');
 
@@ -657,3 +679,11 @@ shaka.dash.ContentProtection.ClearKeyNamespaceUri_ =
  */
 shaka.dash.ContentProtection.ClearKeySchemeUri_ =
     'urn:uuid:e2719d58-a985-b3c9-781a-b030af78d30e';
+
+
+/**
+ * @const {string}
+ * @private
+ */
+shaka.dash.ContentProtection.DashIfNamespaceUri_ =
+  'https://dashif.org/CPS';