shaka-player 4.2.4 → 4.3.0

package/lib/cea/mp4_cea_parser.js

@@ -9,6 +9,7 @@ goog.provide('shaka.cea.Mp4CeaParser');
 goog.require('goog.asserts');
 goog.require('shaka.cea.ICeaParser');
 goog.require('shaka.cea.SeiProcessor');
+goog.require('shaka.log');
 goog.require('shaka.util.DataViewReader');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.Mp4Parser');
@@ -45,6 +46,11 @@ shaka.cea.Mp4CeaParser = class {
      * @private {number}
      */
     this.defaultSampleSize_ = 0;
+
+    /**
+     * @private {shaka.cea.Mp4CeaParser.BitstreamFormat}
+     */
+    this.bitstreamFormat_ = shaka.cea.Mp4CeaParser.BitstreamFormat.UNKNOWN;
   }
 
   /**
@@ -56,9 +62,19 @@ shaka.cea.Mp4CeaParser = class {
    */
   init(initSegment) {
     const Mp4Parser = shaka.util.Mp4Parser;
+    const BitstreamFormat = shaka.cea.Mp4CeaParser.BitstreamFormat;
     const trackIds = [];
     const timescales = [];
 
+    // This generates a box-parser callback that simply sets a particular
+    // bitstream format.  It makes the list of codec-signalling boxes below
+    // more compact and readable.
+    const bitstreamFormatSetter = (format) => {
+      return (box) => {
+        this.bitstreamFormat_ = format;
+      };
+    };
+
     new Mp4Parser()
         .box('moov', Mp4Parser.children)
         .box('mvex', Mp4Parser.children)
@@ -87,6 +103,20 @@ shaka.cea.Mp4CeaParser = class {
               box.reader, box.version);
           timescales.push(parsedMDHDBox.timescale);
         })
+        .box('minf', Mp4Parser.children)
+        .box('stbl', Mp4Parser.children)
+        .fullBox('stsd', Mp4Parser.sampleDescription)
+
+        // These are the various boxes that signal a codec.
+        // Use these to set bistreamFormat_.
+        .box('avc1', bitstreamFormatSetter(BitstreamFormat.H264))
+        .box('avc3', bitstreamFormatSetter(BitstreamFormat.H264))
+        .box('hev1', bitstreamFormatSetter(BitstreamFormat.H265))
+        .box('hvc1', bitstreamFormatSetter(BitstreamFormat.H265))
+        // Dobly vision is also H265.
+        .box('dvh1', bitstreamFormatSetter(BitstreamFormat.H265))
+        .box('dvhe', bitstreamFormatSetter(BitstreamFormat.H265))
+
         .parse(initSegment, /* partialOkay= */ true);
 
     // At least one track should exist, and each track should have a
@@ -99,6 +129,11 @@ shaka.cea.Mp4CeaParser = class {
           shaka.util.Error.Code.INVALID_MP4_CEA);
     }
 
+    if (this.bitstreamFormat_ == BitstreamFormat.UNKNOWN) {
+      shaka.log.alwaysWarn(
+          'Unable to determine bitstream format for CEA parsing!');
+    }
+
     // Populate the map from track Id to timescale
     trackIds.forEach((trackId, idx) => {
       this.trackIdToTimescale_.set(trackId, timescales[idx]);
@@ -115,6 +150,12 @@ shaka.cea.Mp4CeaParser = class {
    */
   parse(mediaSegment) {
     const Mp4Parser = shaka.util.Mp4Parser;
+    const BitstreamFormat = shaka.cea.Mp4CeaParser.BitstreamFormat;
+
+    if (this.bitstreamFormat_ == BitstreamFormat.UNKNOWN) {
+      // We don't know how to extract SEI from this.
+      return [];
+    }
 
     /** @type {!Array<!shaka.cea.ICeaParser.CaptionPacket>} **/
     const captionPackets = [];
@@ -123,11 +164,16 @@ shaka.cea.Mp4CeaParser = class {
     let defaultSampleDuration = this.defaultSampleDuration_;
     let defaultSampleSize = this.defaultSampleSize_;
     let sampleData = [];
+    let moofOffset = null;
+    let trunOffset = null;
     let baseMediaDecodeTime = null;
     let timescale = shaka.cea.ICeaParser.DEFAULT_TIMESCALE_VALUE;
 
     new Mp4Parser()
-        .box('moof', Mp4Parser.children)
+        .box('moof', (box) => {
+          moofOffset = box.start;
+          Mp4Parser.children(box);
+        })
         .box('traf', Mp4Parser.children)
         .fullBox('trun', (box) => {
           goog.asserts.assert(
@@ -138,6 +184,7 @@ shaka.cea.Mp4CeaParser = class {
               box.reader, box.version, box.flags);
 
           sampleData = parsedTRUN.sampleData;
+          trunOffset = parsedTRUN.dataOffset;
         })
 
         .fullBox('tfhd', (box) => {
@@ -183,8 +230,9 @@ shaka.cea.Mp4CeaParser = class {
                 shaka.util.Error.Category.TEXT,
                 shaka.util.Error.Code.INVALID_MP4_CEA);
           }
+          const offset = (moofOffset || 0) + (trunOffset || 0) - box.start - 8;
           this.parseMdat_(box.reader, baseMediaDecodeTime, timescale,
-              defaultSampleDuration, defaultSampleSize, sampleData,
+              defaultSampleDuration, defaultSampleSize, offset, sampleData,
               captionPackets);
         })
         .parse(mediaSegment, /* partialOkay= */ false);
@@ -199,12 +247,15 @@ shaka.cea.Mp4CeaParser = class {
    * @param {number} timescale
    * @param {number} defaultSampleDuration
    * @param {number} defaultSampleSize
+   * @param {number} offset
    * @param {!Array<shaka.util.ParsedTRUNSample>} sampleData
    * @param {!Array<!shaka.cea.ICeaParser.CaptionPacket>} captionPackets
    * @private
    */
   parseMdat_(reader, time, timescale, defaultSampleDuration,
-      defaultSampleSize, sampleData, captionPackets) {
+      defaultSampleSize, offset, sampleData, captionPackets) {
+    const BitstreamFormat = shaka.cea.Mp4CeaParser.BitstreamFormat;
+    const ICeaParser = shaka.cea.ICeaParser;
     let sampleIndex = 0;
 
     // The fields in each ParsedTRUNSample contained in the sampleData
@@ -217,10 +268,34 @@ shaka.cea.Mp4CeaParser = class {
       sampleSize = sampleData[0].sampleSize || defaultSampleSize;
     }
 
+    reader.skip(offset);
+
     while (reader.hasMoreData()) {
       const naluSize = reader.readUint32();
-      const naluType = reader.readUint8() & 0x1F;
-      if (naluType == shaka.cea.ICeaParser.NALU_TYPE_SEI) {
+      const naluHeader = reader.readUint8();
+      let naluType = null;
+      let isSeiMessage = false;
+
+      goog.asserts.assert(this.bitstreamFormat_ != BitstreamFormat.UNKNOWN,
+          'Bitstream format should have been checked before now!');
+      switch (this.bitstreamFormat_) {
+        case BitstreamFormat.H264:
+          naluType = naluHeader & 0x1f;
+          isSeiMessage = naluType == ICeaParser.H264_NALU_TYPE_SEI;
+          break;
+
+        case BitstreamFormat.H265:
+          naluType = (naluHeader >> 1) & 0x3f;
+          isSeiMessage =
+              naluType == ICeaParser.H265_PREFIX_NALU_TYPE_SEI ||
+              naluType == ICeaParser.H265_SUFFIX_NALU_TYPE_SEI;
+          break;
+
+        default:
+          return;
+      }
+
+      if (isSeiMessage) {
         let timeOffset = 0;
 
         if (sampleData.length > sampleIndex) {
@@ -264,3 +339,10 @@ shaka.cea.Mp4CeaParser = class {
     }
   }
 };
+
+/** @enum {number} */
+shaka.cea.Mp4CeaParser.BitstreamFormat = {
+  UNKNOWN: 0,
+  H264: 1,
+  H265: 2,
+};

package/lib/config/auto_show_text.js

@@ -0,0 +1,33 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.config.AutoShowText');
+
+/**
+ * @enum {number}
+ * @export
+ */
+shaka.config.AutoShowText = {
+  /** Never show text automatically on startup. */
+  'NEVER': 0,
+  /** Always show text automatically on startup. */
+  'ALWAYS': 1,
+  /**
+   * Show text automatically on startup if it matches the preferred text
+   * language.
+   */
+  'IF_PREFERRED_TEXT_LANGUAGE': 2,
+  /**
+   * Show text automatically on startup if we think that subtitles may be
+   * needed.  This is specifically if the selected text matches the preferred
+   * text language AND is different from the initial audio language.  (Example:
+   * You prefer English, but the audio is only available in French, so English
+   * subtitles should be enabled by default.)
+   * <br>
+   * This is the default setting.
+   */
+  'IF_SUBTITLES_MAY_BE_NEEDED': 3,
+};

package/lib/dash/dash_parser.js

@@ -498,7 +498,7 @@ shaka.dash.DashParser = class {
         imageStreams: this.periodCombiner_.getImageStreams(),
         offlineSessionIds: [],
         minBufferTime: minBufferTime || 0,
-        sequenceMode: false,
+        sequenceMode: this.config_.dash.sequenceMode,
       };
 
       // We only need to do clock sync when we're using presentation start