shaka-player 4.3.3 → 4.3.4

package/lib/dash/segment_template.js

@@ -102,11 +102,23 @@ shaka.dash.SegmentTemplate = class {
       const periodEnd = context.periodInfo.duration ?
           context.periodInfo.start + context.periodInfo.duration : Infinity;
 
-      // Don't fit live content, since it might receive more segments.
-      // Unless that live content is multi-period; it's safe to fit every period
-      // but the last one, since only the last period might receive new
-      // segments.
-      const shouldFit = periodEnd != Infinity;
+      /* When to fit segments.  All refactors should honor/update this table:
+       *
+       * | dynamic | infinite | last   | should | notes                     |
+       * |         | period   | period | fit    |                           |
+       * | ------- | -------- | ------ | ------ | ------------------------- |
+       * |     F   |     F    |    X   |    T   | typical VOD               |
+       * |     F   |     T    |    X   |    X   | impossible: infinite VOD  |
+       * |     T   |     F    |    F   |    T   | typical live, old period  |
+       * |     T   |     F    |    T   |    F   | typical IPR               |
+       * |     T   |     T    |    F   |    X   | impossible: old, infinite |
+       * |     T   |     T    |    T   |    F   | typical live, new period  |
+       */
+
+      // We never fit the final period of dynamic content, which could be
+      // infinite live (with no limit to fit to) or IPR (which would expand the
+      // most recent segment to the end of the presentation).
+      const shouldFit = !(context.dynamic && context.periodInfo.isLastPeriod);
 
       if (segmentIndex) {
         if (shouldFit) {

package/lib/hls/hls_parser.js

@@ -945,6 +945,8 @@ shaka.hls.HlsParser = class {
       }
     });
 
+    const type = shaka.util.ManifestParserUtils.ContentType.TEXT;
+
     // Set the codecs for text streams.
     for (const tag of subtitleTags) {
       const groupId = tag.getRequiredAttrValue('GROUP-ID');
@@ -954,6 +956,9 @@ shaka.hls.HlsParser = class {
         if (textStreamInfos) {
           for (const textStreamInfo of textStreamInfos) {
             textStreamInfo.stream.codecs = codecs;
+            textStreamInfo.stream.mimeType =
+                this.guessMimeTypeBeforeLoading_(type, codecs) ||
+                this.guessMimeTypeFallback_(type);
           }
         }
       }
@@ -3342,7 +3347,7 @@ shaka.hls.HlsParser.TEXT_EXTENSIONS_TO_MIME_TYPES_ = {
   'm4f': 'application/mp4',
   'cmft': 'application/mp4',
   'vtt': 'text/vtt',
-  'webvtt': 'txt/vtt',
+  'webvtt': 'text/vtt',
   'ttml': 'application/ttml+xml',
 };
 

package/lib/player.js

@@ -6984,7 +6984,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.3.3-uncompiled';
+shaka.Player.version = 'v4.3.4-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -48,6 +48,8 @@ shaka.polyfill.MediaCapabilities = class {
     // should always install polyfill for WebOS browsers.
     // Since MediaCapabilities implementation is buggy in EOS browsers, we
     // should always install polyfill for EOS browsers.
+    // Since MediaCapabilities implementation is buggy in Hisense browsers, we
+    // should always install polyfill for Hisense browsers.
     let canUseNativeMCap = true;
     if (shaka.util.Platform.isApple() ||
         shaka.util.Platform.isPS5() ||
@@ -55,7 +57,8 @@ shaka.polyfill.MediaCapabilities = class {
         shaka.util.Platform.isWebOS() ||
         shaka.util.Platform.isTizen() ||
         shaka.util.Platform.isChromecast() ||
-        shaka.util.Platform.isEOS()) {
+        shaka.util.Platform.isEOS() ||
+        shaka.util.Platform.isHisense()) {
       canUseNativeMCap = false;
     }
     if (canUseNativeMCap && navigator.mediaCapabilities) {

package/lib/text/simple_text_displayer.js

@@ -14,6 +14,7 @@ goog.provide('shaka.text.SimpleTextDisplayer');
 goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.text.Cue');
+goog.require('shaka.text.Utils');
 
 
 /**
@@ -79,70 +80,7 @@ shaka.text.SimpleTextDisplayer = class {
    * @export
    */
   append(cues) {
-    // Flatten nested cue payloads recursively.  If a cue has nested cues,
-    // their contents should be combined and replace the payload of the parent.
-    const flattenPayload = (cue) => {
-      // Handle styles (currently bold/italics/underline).
-      // TODO add support for color rendering.
-      const openStyleTags = [];
-      const bold = cue.fontWeight >= shaka.text.Cue.fontWeight.BOLD;
-      const italics = cue.fontStyle == shaka.text.Cue.fontStyle.ITALIC;
-      const underline = cue.textDecoration.includes(
-          shaka.text.Cue.textDecoration.UNDERLINE);
-      if (bold) {
-        openStyleTags.push('b');
-      }
-      if (italics) {
-        openStyleTags.push('i');
-      }
-      if (underline) {
-        openStyleTags.push('u');
-      }
-
-      // Prefix opens tags, suffix closes tags in reverse order of opening.
-      const prefixStyleTags = openStyleTags.reduce((acc, tag) => {
-        return `${acc}<${tag}>`;
-      }, '');
-      const suffixStyleTags = openStyleTags.reduceRight((acc, tag) => {
-        return `${acc}</${tag}>`;
-      }, '');
-
-      if (cue.lineBreak) {
-        // This is a vertical lineBreak, so insert a newline.
-        return '\n';
-      } else if (cue.nestedCues.length) {
-        return cue.nestedCues.map(flattenPayload).join('');
-      } else {
-        // This is a real cue.
-        return prefixStyleTags + cue.payload + suffixStyleTags;
-      }
-    };
-
-    // We don't want to modify the array or objects passed in, since we don't
-    // technically own them.  So we build a new array and replace certain items
-    // in it if they need to be flattened.
-    // We also don't want to flatten the text payloads starting at a container
-    // element; otherwise, for containers encapsulating multiple caption lines,
-    // the lines would merge into a single cue. This is undesirable when a
-    // subset of the captions are outside of the append time window. To fix
-    // this, we only call flattenPayload() starting at elements marked as
-    // isContainer = false.
-    const getCuesToFlatten = (cues, result) => {
-      for (const cue of cues) {
-        if (cue.isContainer) {
-          // Recurse to find the actual text payload cues.
-          getCuesToFlatten(cue.nestedCues, result);
-        } else {
-          // Flatten the payload.
-          const flatCue = cue.clone();
-          flatCue.nestedCues = [];
-          flatCue.payload = flattenPayload(cue);
-          result.push(flatCue);
-        }
-      }
-      return result;
-    };
-    const flattenedCues = getCuesToFlatten(cues, []);
+    const flattenedCues = shaka.text.Utils.getCuesToFlatten(cues, []);
 
     // Convert cues.
     const textTrackCues = [];

package/lib/text/text_utils.js

@@ -0,0 +1,88 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.text.Utils');
+
+goog.require('shaka.text.Cue');
+
+
+shaka.text.Utils = class {
+  /**
+   * Flatten nested cue payloads recursively.  If a cue has nested cues,
+   * their contents should be combined and replace the payload of the parent.
+   *
+   * @param {!shaka.text.Cue} cue
+   * @return {string}
+   * @private
+   */
+  static flattenPayload_(cue) {
+    // Handle styles (currently bold/italics/underline).
+    // TODO: add support for color rendering.
+    const openStyleTags = [];
+    const bold = cue.fontWeight >= shaka.text.Cue.fontWeight.BOLD;
+    const italics = cue.fontStyle == shaka.text.Cue.fontStyle.ITALIC;
+    const underline = cue.textDecoration.includes(
+        shaka.text.Cue.textDecoration.UNDERLINE);
+    if (bold) {
+      openStyleTags.push('b');
+    }
+    if (italics) {
+      openStyleTags.push('i');
+    }
+    if (underline) {
+      openStyleTags.push('u');
+    }
+
+    // Prefix opens tags, suffix closes tags in reverse order of opening.
+    const prefixStyleTags = openStyleTags.reduce((acc, tag) => {
+      return `${acc}<${tag}>`;
+    }, '');
+    const suffixStyleTags = openStyleTags.reduceRight((acc, tag) => {
+      return `${acc}</${tag}>`;
+    }, '');
+
+    if (cue.lineBreak) {
+      // This is a vertical lineBreak, so insert a newline.
+      return '\n';
+    } else if (cue.nestedCues.length) {
+      return cue.nestedCues.map(shaka.text.Utils.flattenPayload_).join('');
+    } else {
+      // This is a real cue.
+      return prefixStyleTags + cue.payload + suffixStyleTags;
+    }
+  }
+
+  /**
+   * We don't want to modify the array or objects passed in, since we don't
+   * technically own them.  So we build a new array and replace certain items
+   * in it if they need to be flattened.
+   * We also don't want to flatten the text payloads starting at a container
+   * element; otherwise, for containers encapsulating multiple caption lines,
+   * the lines would merge into a single cue. This is undesirable when a
+   * subset of the captions are outside of the append time window. To fix
+   * this, we only call flattenPayload() starting at elements marked as
+   * isContainer = false.
+   *
+   * @param {!Array.<!shaka.text.Cue>} cues
+   * @param {!Array.<!shaka.text.Cue>} result
+   * @return {!Array.<!shaka.text.Cue>}
+   */
+  static getCuesToFlatten(cues, result) {
+    for (const cue of cues) {
+      if (cue.isContainer) {
+        // Recurse to find the actual text payload cues.
+        shaka.text.Utils.getCuesToFlatten(cue.nestedCues, result);
+      } else {
+        // Flatten the payload.
+        const flatCue = cue.clone();
+        flatCue.nestedCues = [];
+        flatCue.payload = shaka.text.Utils.flattenPayload_(cue);
+        result.push(flatCue);
+      }
+    }
+    return result;
+  }
+};

package/lib/text/ui_text_displayer.js

@@ -617,12 +617,7 @@ shaka.text.UITextDisplayer = class {
     // TODO: Implement lineAlignment of 'CENTER'.
     if (cue.line != null) {
       if (cue.lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
-        // When setting absolute positioning, you need to set x/y/width/height
-        // so the element is positioned correctly.  Set these as default and
-        // other settings will override them.
         style.position = 'absolute';
-        style.left = '0';
-        style.top = '0';
         if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
           style.width = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {