shaka-player 4.11.1 → 4.11.2

package/lib/dash/dash_parser.js

@@ -2978,6 +2978,8 @@ shaka.dash.DashParser = class {
     const schemeIdUri = elem.attributes['schemeIdUri'] || '';
     const value = elem.attributes['value'] || '';
     const timescale = TXml.parseAttr(elem, 'timescale', parseNumber) || 1;
+    const presentationTimeOffset =
+      TXml.parseAttr(elem, 'presentationTimeOffset', parseNumber) || 0;
 
     for (const eventNode of TXml.findChildren(elem, 'Event')) {
       const presentationTime =
@@ -2985,7 +2987,10 @@ shaka.dash.DashParser = class {
       const duration =
           TXml.parseAttr(eventNode, 'duration', parseNumber) || 0;
 
-      let startTime = presentationTime / timescale + periodStart;
+      // Ensure start time won't be lower than period start.
+      let startTime = Math.max(
+          (presentationTime - presentationTimeOffset) / timescale + periodStart,
+          periodStart);
       let endTime = startTime + (duration / timescale);
       if (periodDuration != null) {
         // An event should not go past the Period, even if the manifest says so.
@@ -3007,7 +3012,7 @@ shaka.dash.DashParser = class {
         endTime: endTime,
         id: eventNode.attributes['id'] || '',
         eventElement: TXml.txmlNodeToDomElement(eventNode),
-        eventNode: eventNode,
+        eventNode: TXml.cloneNode(eventNode),
       };
 
       this.playerInterface_.onTimelineRegionAdded(region);

package/lib/media/segment_index.js

@@ -700,6 +700,17 @@ shaka.media.MetaSegmentIndex = class extends shaka.media.SegmentIndex {
     this.indexes_ = [];
   }
 
+  /** Evicts all old SegmentIndexes in this MetaSegmentIndex that are empty. */
+  evictEmpty() {
+    while (this.indexes_.length > 1 && this.indexes_[0].isEmpty()) {
+      const index = this.indexes_.shift();
+      // In the case of this class, this.numEvicted_ represents the evicted
+      // segments that were in indexes that were entirely evicted.
+      this.numEvicted_ += index.getNumEvicted();
+      index.release();
+    }
+  }
+
   /**
    * Append a SegmentIndex to this MetaSegmentIndex.  This effectively stitches
    * the underlying Stream onto the end of the multi-Period Stream represented
@@ -724,6 +735,7 @@ shaka.media.MetaSegmentIndex = class extends shaka.media.SegmentIndex {
     // Be careful to clone the Array.  We don't want to share the reference with
     // our clone and affect each other accidentally.
     clone.indexes_ = this.indexes_.slice();
+    clone.numEvicted_ = this.numEvicted_;
     return clone;
   }
 
@@ -754,7 +766,7 @@ shaka.media.MetaSegmentIndex = class extends shaka.media.SegmentIndex {
    * @export
    */
   find(time) {
-    let numPassedInEarlierIndexes = 0;
+    let numPassedInEarlierIndexes = this.numEvicted_;
 
     for (const index of this.indexes_) {
       const position = index.find(time);
@@ -775,7 +787,7 @@ shaka.media.MetaSegmentIndex = class extends shaka.media.SegmentIndex {
    * @export
    */
   get(position) {
-    let numPassedInEarlierIndexes = 0;
+    let numPassedInEarlierIndexes = this.numEvicted_;
     let sawSegments = false;
 
     for (const index of this.indexes_) {

package/lib/media/streaming_engine.js

@@ -15,6 +15,7 @@ goog.require('shaka.log');
 goog.require('shaka.media.InitSegmentReference');
 goog.require('shaka.media.ManifestParser');
 goog.require('shaka.media.MediaSourceEngine');
+goog.require('shaka.media.MetaSegmentIndex');
 goog.require('shaka.media.SegmentIterator');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.media.SegmentPrefetch');
@@ -2502,6 +2503,11 @@ shaka.media.StreamingEngine = class {
    * @private
    */
   async evict_(mediaState, presentationTime) {
+    const segmentIndex = mediaState.stream.segmentIndex;
+    if (segmentIndex instanceof shaka.media.MetaSegmentIndex) {
+      segmentIndex.evictEmpty();
+    }
+
     const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
     shaka.log.v2(logPrefix, 'checking buffer length');
 

package/lib/player.js

@@ -8063,7 +8063,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.11.1' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.11.2' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/ttml_text_parser.js

@@ -519,6 +519,24 @@ shaka.text.TtmlTextParser = class {
     return region;
   }
 
+  /**
+   * Ensures any TTML RGBA's alpha range of 0-255 is converted to 0-1.
+   * @param {string} color
+   * @return {string}
+   * @private
+   */
+  static convertTTMLrgbaToHTMLrgba_(color) {
+    const rgba = color.match(/rgba\(([^)]+)\)/);
+    if (rgba) {
+      const values = rgba[1].split(',');
+      if (values.length == 4) {
+        values[3] = String(Number(values[3]) / 255);
+        return 'rgba(' + values.join(',') + ')';
+      }
+    }
+    return color;
+  }
+
   /**
    * Adds applicable style properties to a cue.
    *
@@ -597,7 +615,7 @@ shaka.text.TtmlTextParser = class {
     const color = TtmlTextParser.getStyleAttribute_(
         cueElement, region, styles, 'color', shouldInheritRegionStyles);
     if (color) {
-      cue.color = color;
+      cue.color = TtmlTextParser.convertTTMLrgbaToHTMLrgba_(color);
     }
 
     // Background color should not be set on a container.  If this is a nested
@@ -611,7 +629,8 @@ shaka.text.TtmlTextParser = class {
         cueElement, region, styles, 'backgroundColor',
         shouldInheritRegionStyles);
     if (backgroundColor) {
-      cue.backgroundColor = backgroundColor;
+      cue.backgroundColor =
+        TtmlTextParser.convertTTMLrgbaToHTMLrgba_(backgroundColor);
     }
 
     const border = TtmlTextParser.getStyleAttribute_(
@@ -720,7 +739,8 @@ shaka.text.TtmlTextParser = class {
         // There is no defined color, so default to the text color.
         cue.textStrokeColor = cue.color;
       } else {
-        cue.textStrokeColor = split[0];
+        cue.textStrokeColor =
+            TtmlTextParser.convertTTMLrgbaToHTMLrgba_(split[0]);
         split.shift();
       }
       if (split[0] && split[0].match(TtmlTextParser.unitValues_)) {

package/lib/util/periods.js

@@ -852,7 +852,10 @@ shaka.util.PeriodCombiner = class {
     if (output.originalId == null) {
       output.originalId = input.originalId;
     } else {
-      output.originalId += ',' + (input.originalId || '');
+      const newOriginalId = (input.originalId || '');
+      if (newOriginalId && !output.originalId.endsWith(newOriginalId)) {
+        output.originalId += ',' + newOriginalId;
+      }
     }
 
     const commonDrmInfos = shaka.util.DrmUtils.getCommonDrmInfos(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.11.1",
+  "version": "4.11.2",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [