shaka-player 4.9.26 → 4.9.28

package/externs/ima.js

@@ -269,7 +269,6 @@ google.ima.Ad = class {
   getMediaUrl() {}
 };
 
-
 /** @const */
 google.ima.AdPodInfo = class {
   /** @return {number} */
@@ -366,7 +365,7 @@ google.ima.AdEvent.Type = {
  * @description Request for the ad server
  * @property {string|undefined} adTagUrl
  *   Specifies the ad tag url that is requested from the ad server.
- *   This parameter is optional if adsReponse is given.
+ *   This parameter is optional if adsResponse is given.
  * @property {string|undefined} adsResponse
  *   Specifies a VAST 2.0 document to be used as the ads response instead of
  *   making a request via an ad tag url. This can be useful for debugging
@@ -518,6 +517,9 @@ google.ima.dai.api.Ad = class {
 
   /** @return {string} */
   getCreativeAdId() {}
+
+  /** @return {!Array.<!google.ima.dai.api.CompanionAd>} */
+  getCompanionAds() {}
 };
 
 
@@ -536,6 +538,24 @@ google.ima.dai.api.AdPodInfo = class {
   getPodIndex() {}
 };
 
+/** @const */
+google.ima.dai.api.CompanionAd = class {
+  /** @return {?string} */
+  getAdSlotId() {}
+
+  /** @return {string} */
+  getContent() {}
+
+  /** @return {?string} */
+  getContentType() {}
+
+  /** @return {number} */
+  getHeight() {}
+
+  /** @return {?number} */
+  getWidth() {}
+};
+
 
 /** @const */
 google.ima.dai.api.CuePoint = class {};

package/externs/shaka/player.js

@@ -1239,6 +1239,7 @@ shaka.extern.ManifestConfiguration;
  *   alwaysStreamText: boolean,
  *   startAtSegmentBoundary: boolean,
  *   gapDetectionThreshold: number,
+ *   gapPadding: number,
  *   gapJumpTimerTime: number,
  *   durationBackoff: number,
  *   safeSeekOffset: number,
@@ -1323,7 +1324,16 @@ shaka.extern.ManifestConfiguration;
  *   to <code>false</code>.
  * @property {number} gapDetectionThreshold
  *   The maximum distance (in seconds) before a gap when we'll automatically
- *   jump. This value defaults to <code>0.5</code>.
+ *   jump.
+ *   <br>
+ *   Defaults to <code>0.5</code>.
+ * @property {number} gapPadding
+ *   Padding added only for Xbox, Legacy Edge and Tizen.
+ *   Based on our research (specific to Tizen), the gapPadding value must be
+ *   greater than your GOP length.
+ *   It’s crucial to verify this value according to your actual stream.
+ *   <br>
+ *   Defaults to <code>0.01</code> for Xbox and Legacy Edge, Tizen at 2.
  * @property {number} gapJumpTimerTime
  *   The polling time in seconds to check for gaps in the media. This value
  *   defaults to <code>0.25</code>.
@@ -1837,7 +1847,8 @@ shaka.extern.LcevcConfiguration;
  *   view.
  *   Defaults to <code>true</code>.
  * @property {number} numberOfParallelDownloads
- *   Number of parallel downloads.
+ *   Number of parallel downloads. If the value is 0, downloads will be
+ *   sequential for each stream.
  *   Note: normally browsers limit to 5 request in parallel, so putting a
  *   number higher than this will not help it download faster.
  *   Defaults to <code>5</code>.

package/lib/dash/dash_parser.js

@@ -163,6 +163,9 @@ shaka.dash.DashParser = class {
 
     /** @private {boolean} */
     this.isTransitionFromDynamicToStatic_ = false;
+
+    /** @private {?Array.<string>} */
+    this.lastCalculatedBaseUris_ = [];
   }
 
   /**
@@ -551,7 +554,6 @@ shaka.dash.DashParser = class {
     }
 
     const uriObjs = TXml.findChildren(mpd, 'BaseURL');
-    let calculatedBaseUris;
     let someLocationValid = false;
     if (this.contentSteeringManager_) {
       for (const uriObj of uriObjs) {
@@ -564,9 +566,10 @@ shaka.dash.DashParser = class {
         }
       }
     }
+    this.lastCalculatedBaseUris_ = null;
     if (!someLocationValid || !this.contentSteeringManager_) {
       const uris = uriObjs.map(TXml.getContents);
-      calculatedBaseUris = shaka.util.ManifestParserUtils.resolveUris(
+      this.lastCalculatedBaseUris_ = shaka.util.ManifestParserUtils.resolveUris(
           manifestBaseUris, uris);
     }
 
@@ -574,8 +577,8 @@ shaka.dash.DashParser = class {
       if (this.contentSteeringManager_ && someLocationValid) {
         return this.contentSteeringManager_.getLocations('BaseURL');
       }
-      if (calculatedBaseUris) {
-        return calculatedBaseUris;
+      if (this.lastCalculatedBaseUris_) {
+        return this.lastCalculatedBaseUris_;
       }
       return [];
     };
@@ -1430,14 +1433,14 @@ shaka.dash.DashParser = class {
    */
   cleanStreamMap_() {
     const oldPeriodIds = Object.keys(this.indexStreamMap_);
-    if (oldPeriodIds.length === this.lastManifestUpdatePeriodIds_.length) {
-      return;
-    }
     const diffPeriodsIDs = oldPeriodIds.filter((pId) => {
       return !this.lastManifestUpdatePeriodIds_.includes(pId);
     });
     for (const pId of diffPeriodsIDs) {
       for (const contextId of this.indexStreamMap_[pId]) {
+        if (this.periodCombiner_) {
+          this.periodCombiner_.deleteStream(this.streamMap_[contextId], pId);
+        }
         delete this.streamMap_[contextId];
       }
       delete this.indexStreamMap_[pId];
@@ -2804,6 +2807,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 =
@@ -2811,7 +2816,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.
@@ -2833,7 +2841,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/dash/mpd_utils.js

@@ -481,9 +481,6 @@ shaka.dash.MpdUtils = class {
           // Move the children of the loaded xml into the current element.
           while (rootElem.children.length) {
             const child = rootElem.children.shift();
-            if (TXml.isNode(child)) {
-              child.parent = element;
-            }
             element.children.push(child);
           }
 

package/lib/hls/hls_parser.js

@@ -147,6 +147,14 @@ shaka.hls.HlsParser = class {
      */
     this.lowestSyncTime_ = Infinity;
 
+    /**
+     * Flag to indicate if any of the media playlists use
+     * EXT-X-PROGRAM-DATE-TIME.
+     *
+     * @private {boolean}
+     */
+    this.usesProgramDateTime_ = false;
+
     /**
      * Whether the streams have previously been "finalized"; that is to say,
      * whether we have loaded enough streams to know information about the asset
@@ -545,9 +553,10 @@ shaka.hls.HlsParser = class {
    * Align the streams by sequence number by dropping early segments.  Then
    * offset the streams to begin at presentation time 0.
    * @param {!Array.<!shaka.hls.HlsParser.StreamInfo>} streamInfos
+   * @param {boolean=} force
    * @private
    */
-  syncStreamsWithSequenceNumber_(streamInfos) {
+  syncStreamsWithSequenceNumber_(streamInfos, force = false) {
     // We assume that, when this is first called, we have enough info to
     // determine how to use the program date times (e.g. we have both a video
     // and an audio, and all other videos and audios match those).
@@ -602,7 +611,7 @@ shaka.hls.HlsParser = class {
         this.minSequenceNumber_);
 
     for (const streamInfo of streamInfos) {
-      if (!this.ignoreManifestProgramDateTimeFor_(streamInfo.type)) {
+      if (!this.ignoreManifestProgramDateTimeFor_(streamInfo.type) && !force) {
         continue;
       }
       const segmentIndex = streamInfo.stream.segmentIndex;
@@ -2573,8 +2582,12 @@ shaka.hls.HlsParser = class {
       }
     }
     this.notifySegmentsForStreams_(streamInfos.map((s) => s.stream));
-    if (this.config_.hls.ignoreManifestProgramDateTime) {
-      this.syncStreamsWithSequenceNumber_(streamInfos);
+    const liveWithNoProgramaDateTime =
+        this.isLive_() && !this.usesProgramDateTime_;
+    if (this.config_.hls.ignoreManifestProgramDateTime ||
+        liveWithNoProgramaDateTime) {
+      this.syncStreamsWithSequenceNumber_(
+          streamInfos, liveWithNoProgramaDateTime);
     } else {
       this.syncStreamsWithProgramDateTime_(streamInfos);
       if (this.config_.hls.ignoreManifestProgramDateTimeForTypes.length > 0) {
@@ -3367,6 +3380,7 @@ shaka.hls.HlsParser = class {
         syncTime = shaka.util.TXml.parseDate(dateTimeTag.value);
         goog.asserts.assert(syncTime != null,
             'EXT-X-PROGRAM-DATE-TIME format not valid');
+        this.usesProgramDateTime_ = true;
       }
     }
 

package/lib/media/gap_jumping_controller.js

@@ -223,8 +223,10 @@ shaka.media.GapJumpingController = class {
     // often rounds value we want to set as currentTime and we are not able
     // to jump over the gap.
     if (shaka.util.Platform.isLegacyEdge() ||
-        shaka.util.Platform.isXboxOne()) {
-      jumpTo = Math.ceil((jumpTo + 0.01) * 100) / 100;
+        shaka.util.Platform.isXboxOne() ||
+        shaka.util.Platform.isTizen()) {
+      const gapPadding = this.config_.gapPadding;
+      jumpTo = Math.ceil((jumpTo + gapPadding) * 100) / 100;
     }
     const seekEnd = this.timeline_.getSeekRangeEnd();
     if (jumpTo >= seekEnd) {

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_) {
@@ -822,10 +834,10 @@ shaka.media.MetaSegmentIndex = class extends shaka.media.SegmentIndex {
    * @export
    */
   evict(time) {
-    // evict() is only used internally by the DASH and HLS parser on
-    // SegmentIndexes, but never on MetaSegmentIndex.
-    goog.asserts.assert(
-        false, 'evict() should not be used in MetaSegmentIndex!');
+    for (const index of this.indexes_) {
+      index.evict(time);
+    }
+    this.evictEmpty();
   }
 
   /**

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');
@@ -1513,9 +1514,11 @@ shaka.media.StreamingEngine = class {
           logPrefix, 'looking up segment from new stream endTime:', time);
 
       const reverse = this.playerInterface_.getPlaybackRate() < 0;
-      mediaState.segmentIterator =
-          mediaState.stream.segmentIndex.getIteratorForTime(
-              time, /* allowNonIndepedent= */ false, reverse);
+      if (mediaState.stream.segmentIndex) {
+        mediaState.segmentIterator =
+            mediaState.stream.segmentIndex.getIteratorForTime(
+                time, /* allowNonIndepedent= */ false, reverse);
+      }
       const ref = mediaState.segmentIterator &&
           mediaState.segmentIterator.next().value;
       if (ref == null) {
@@ -1539,18 +1542,22 @@ shaka.media.StreamingEngine = class {
       const reverse = this.playerInterface_.getPlaybackRate() < 0;
       let ref = null;
       if (inaccurateTolerance) {
-        mediaState.segmentIterator =
-            mediaState.stream.segmentIndex.getIteratorForTime(
-                lookupTime, /* allowNonIndepedent= */ false, reverse);
+        if (mediaState.stream.segmentIndex) {
+          mediaState.segmentIterator =
+              mediaState.stream.segmentIndex.getIteratorForTime(
+                  lookupTime, /* allowNonIndepedent= */ false, reverse);
+        }
         ref = mediaState.segmentIterator &&
             mediaState.segmentIterator.next().value;
       }
       if (!ref) {
         // If we can't find a valid segment with the drifted time, look for a
         // segment with the presentation time.
-        mediaState.segmentIterator =
-            mediaState.stream.segmentIndex.getIteratorForTime(
-                presentationTime, /* allowNonIndepedent= */ false, reverse);
+        if (mediaState.stream.segmentIndex) {
+          mediaState.segmentIterator =
+              mediaState.stream.segmentIndex.getIteratorForTime(
+                  presentationTime, /* allowNonIndepedent= */ false, reverse);
+        }
         ref = mediaState.segmentIterator &&
             mediaState.segmentIterator.next().value;
       }
@@ -2465,6 +2472,12 @@ shaka.media.StreamingEngine = class {
    * @private
    */
   async evict_(mediaState, presentationTime) {
+    const segmentIndex = mediaState.stream.segmentIndex;
+    if (segmentIndex instanceof shaka.media.MetaSegmentIndex) {
+      segmentIndex.evict(
+          this.manifest_.presentationTimeline.getSeekRangeStart());
+    }
+
     const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
     shaka.log.v2(logPrefix, 'checking buffer length');
 

package/lib/net/networking_utils.js

@@ -103,4 +103,9 @@ shaka.net.NetworkingUtils.EXTENSIONS_TO_MIME_TYPES_ = {
   'lrc': 'application/x-subtitle-lrc',
   'ssa': 'text/x-ssa',
   'ass': 'text/x-ssa',
+  'jpg': 'image/jpeg',
+  'png': 'image/png',
+  'svg': 'image/svg+xml',
+  'webp': 'image/webp',
+  'avif': 'image/avif',
 };

package/lib/offline/storage.js

@@ -1343,7 +1343,7 @@ shaka.offline.Storage = class {
         manifest.presentationTimeline.getSegmentAvailabilityStart();
 
     const numberOfParallelDownloads = config.offline.numberOfParallelDownloads;
-    let groupId = 0;
+    let groupId = numberOfParallelDownloads === 0 ? stream.id : 0;
 
     shaka.offline.Storage.forEachSegment_(stream, startTime, (segment) => {
       const pendingSegmentRefId =
@@ -1395,7 +1395,9 @@ shaka.offline.Storage = class {
         codecs: segment.codecs,
       };
       streamDb.segments.push(segmentDB);
-      groupId = (groupId + 1) % numberOfParallelDownloads;
+      if (numberOfParallelDownloads !== 0) {
+        groupId = (groupId + 1) % numberOfParallelDownloads;
+      }
     });
 
     return streamDb;
@@ -1590,14 +1592,6 @@ shaka.offline.Storage = class {
     /** @type {!Set.<shaka.extern.Stream>} */
     const set = new Set();
 
-    for (const text of manifest.textStreams) {
-      set.add(text);
-    }
-
-    for (const image of manifest.imageStreams) {
-      set.add(image);
-    }
-
     for (const variant of manifest.variants) {
       if (variant.audio) {
         set.add(variant.audio);
@@ -1607,6 +1601,14 @@ shaka.offline.Storage = class {
       }
     }
 
+    for (const text of manifest.textStreams) {
+      set.add(text);
+    }
+
+    for (const image of manifest.imageStreams) {
+      set.add(image);
+    }
+
     return set;
   }
 

package/lib/player.js

@@ -5566,6 +5566,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       references.push(reference);
     }
 
+    let segmentMimeType = mimeType;
+    if (references.length) {
+      segmentMimeType = await shaka.net.NetworkingUtils.getMimeType(
+          references[0].getUris()[0],
+          this.networkingEngine_, this.config_.manifest.retryParameters);
+    }
+
     /** @type {shaka.extern.Stream} */
     const stream = {
       id: this.nextExternalStreamId_++,
@@ -5573,7 +5580,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       groupId: null,
       createSegmentIndex: () => Promise.resolve(),
       segmentIndex: new shaka.media.SegmentIndex(references),
-      mimeType: mimeType || '',
+      mimeType: segmentMimeType || '',
       codecs: '',
       kind: '',
       encrypted: false,
@@ -5597,7 +5604,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       external: true,
       fastSwitching: false,
       fullMimeTypes: new Set([shaka.util.MimeUtils.getFullType(
-          mimeType || '', '')]),
+          segmentMimeType || '', '')]),
     };
 
     if (this.loadMode_ == shaka.Player.LoadMode.SRC_EQUALS) {
@@ -6740,11 +6747,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.playhead_.notifyOfBufferingChange();
       // Skip the initial buffer gap
       const startTime = this.mediaSourceEngine_.bufferStart(contentType);
+      const ContentType = shaka.util.ManifestParserUtils.ContentType;
       if (
         !this.isLive() &&
         // If not paused then GapJumpingController will handle this gap.
         this.video_.paused &&
         startTime != null &&
+        contentType != ContentType.TEXT &&
         startTime > 0 &&
         this.playhead_.getTime() < startTime
       ) {
@@ -7517,8 +7526,8 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-// eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.9.26' + '-uncompiled';  // x-release-please-version
+// eslint-disable-next-line no-useless-concat, max-len
+shaka.Player.version = 'v4.9.28' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/simple_text_displayer.js

@@ -112,7 +112,7 @@ shaka.text.SimpleTextDisplayer = class {
         return false;
       });
 
-      if (!containsCue) {
+      if (!containsCue && inCue.payload) {
         const cue =
             shaka.text.Utils.mapShakaCueToNativeCue(inCue);
         if (cue) {

package/lib/text/text_utils.js

@@ -31,6 +31,10 @@ shaka.text.Utils = class {
       }).join('');
     }
 
+    if (!cue.payload) {
+      return cue.payload;
+    }
+
     // Handle bold, italics and underline
     const openStyleTags = [];
     const bold = cue.fontWeight >= shaka.text.Cue.fontWeight.BOLD;

package/lib/text/ttml_text_parser.js

@@ -65,7 +65,7 @@ shaka.text.TtmlTextParser = class {
       return cues;
     }
 
-    const tt = TXml.parseXmlString(str, 'tt');
+    const tt = TXml.parseXmlString(str, 'tt', /* includeParent= */ true);
     if (!tt) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
@@ -108,7 +108,8 @@ shaka.text.TtmlTextParser = class {
       TtmlTextParser.getCellResolution_(cellResolution);
 
     const metadata = TXml.getElementsByTagName(tt, 'metadata')[0];
-    const metadataElements = metadata ? metadata.children : [];
+    const metadataElements =
+        (metadata ? metadata.children : []).filter((c) => c != '\n');
     const styles = TXml.getElementsByTagName(tt, 'style');
     const regionElements = TXml.getElementsByTagName(tt, 'region');
 
@@ -508,6 +509,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.
    *
@@ -586,7 +605,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
@@ -600,7 +619,8 @@ shaka.text.TtmlTextParser = class {
         cueElement, region, styles, 'backgroundColor',
         shouldInheritRegionStyles);
     if (backgroundColor) {
-      cue.backgroundColor = backgroundColor;
+      cue.backgroundColor =
+        TtmlTextParser.convertTTMLrgbaToHTMLrgba_(backgroundColor);
     }
 
     const border = TtmlTextParser.getStyleAttribute_(
@@ -709,7 +729,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_)) {