shaka-player 4.9.22 → 4.9.23

package/lib/dash/dash_parser.js

@@ -1006,12 +1006,16 @@ shaka.dash.DashParser = class {
   getContextIdsFromPath_(paths) {
     let periodId = '';
     let adaptationSetId = '';
+    let adaptationSetPosition = -1;
     let representationId = '';
     for (const node of paths) {
       if (node.name === 'Period') {
         periodId = node.id;
       } else if (node.name === 'AdaptationSet') {
         adaptationSetId = node.id;
+        if (node.position !== null) {
+          adaptationSetPosition = node.position;
+        }
       } else if (node.name === 'Representation') {
         representationId = node.id;
       }
@@ -1023,14 +1027,27 @@ shaka.dash.DashParser = class {
     if (representationId) {
       contextIds.push(periodId + ',' + representationId);
     } else {
-      for (const context of this.contextCache_.values()) {
-        if (context.period.id === periodId &&
-            context.adaptationSet.id === adaptationSetId &&
-            context.representation.id) {
-          contextIds.push(periodId + ',' + context.representation.id);
+      if (adaptationSetId) {
+        for (const context of this.contextCache_.values()) {
+          if (context.period.id === periodId &&
+              context.adaptationSet.id === adaptationSetId &&
+              context.representation.id) {
+            contextIds.push(periodId + ',' + context.representation.id);
+          }
+        }
+      } else {
+        if (adaptationSetPosition > -1) {
+          for (const context of this.contextCache_.values()) {
+            if (context.period.id === periodId &&
+                context.adaptationSet.position === adaptationSetPosition &&
+                context.representation.id) {
+              contextIds.push(periodId + ',' + context.representation.id);
+            }
+          }
         }
       }
     }
+
     return contextIds;
   }
 
@@ -1423,7 +1440,8 @@ shaka.dash.DashParser = class {
     const adaptationSetNodes =
         TXml.findChildren(periodInfo.node, 'AdaptationSet');
     const adaptationSets = adaptationSetNodes
-        .map((node) => this.parseAdaptationSet_(context, node))
+        .map((node, position) =>
+          this.parseAdaptationSet_(context, position, node))
         .filter(Functional.isNotNull);
 
     // For dynamic manifests, we use rep IDs internally, and they must be
@@ -1530,11 +1548,12 @@ shaka.dash.DashParser = class {
    * Parses an AdaptationSet XML element.
    *
    * @param {shaka.dash.DashParser.Context} context
+   * @param {number} position
    * @param {!shaka.extern.xml.Node} elem The AdaptationSet element.
    * @return {?shaka.dash.DashParser.AdaptationInfo}
    * @private
    */
-  parseAdaptationSet_(context, elem) {
+  parseAdaptationSet_(context, position, elem) {
     const TXml = shaka.util.TXml;
     const Functional = shaka.util.Functional;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
@@ -1542,6 +1561,7 @@ shaka.dash.DashParser = class {
     const ContentProtection = shaka.dash.ContentProtection;
 
     context.adaptationSet = this.createFrame_(elem, context.period, null);
+    context.adaptationSet.position = position;
 
     let main = false;
     const roleElements = TXml.findChildren(elem, 'Role');
@@ -2199,6 +2219,7 @@ shaka.dash.DashParser = class {
           pixelAspectRatio: frameRef.pixelAspectRatio,
           emsgSchemeIdUris: frameRef.emsgSchemeIdUris,
           id: frameRef.id,
+          position: frameRef.position,
           numChannels: frameRef.numChannels,
           audioSamplingRate: frameRef.audioSamplingRate,
           availabilityTimeOffset: frameRef.availabilityTimeOffset,
@@ -2949,6 +2970,7 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   pixelAspectRatio: (string|undefined),
  *   emsgSchemeIdUris: !Array.<string>,
  *   id: ?string,
+ *   position: (number|undefined),
  *   language: ?string,
  *   numChannels: ?number,
  *   audioSamplingRate: ?number,
@@ -2988,6 +3010,8 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   emsg registered schemeIdUris.
  * @property {?string} id
  *   The ID of the element.
+ * @property {number|undefined} position
+ *   Position of the element used for indexing in case of no id
  * @property {?string} language
  *   The original language of the element.
  * @property {?number} numChannels

package/lib/hls/hls_classes.js

@@ -120,9 +120,13 @@ shaka.hls.Tag = class {
   /**
    * Create the string key of the tag.
    *
+   * @param {boolean} keepAllAtributtes
    * @return {string}
    */
-  getTagKey() {
+  getTagKey(keepAllAtributtes) {
+    if (keepAllAtributtes) {
+      return this.toString();
+    }
     const attributesToSkip = new Set()
         .add('AUDIO')
         .add('VIDEO')

package/lib/hls/hls_parser.js

@@ -1375,7 +1375,7 @@ shaka.hls.HlsParser = class {
 
     const groupedTags = {};
     for (const tag of mediaTags) {
-      const key = tag.getTagKey();
+      const key = tag.getTagKey(!this.contentSteeringManager_);
       if (!groupedTags[key]) {
         groupedTags[key] = [tag];
       } else {
@@ -1456,7 +1456,7 @@ shaka.hls.HlsParser = class {
 
     const groupedTags = {};
     for (const tag of tags) {
-      const key = tag.getTagKey();
+      const key = tag.getTagKey(!this.contentSteeringManager_);
       if (!groupedTags[key]) {
         groupedTags[key] = [tag];
       } else {

package/lib/media/media_source_engine.js

@@ -1082,13 +1082,15 @@ shaka.media.MediaSourceEngine = class {
           bufferedBefore, bufferedAfter);
       if (newBuffered) {
         const segmentDuration = reference.endTime - reference.startTime;
+        const timeAdded = newBuffered.end - newBuffered.start;
         // Check end times instead of start times.  We may be overwriting a
         // buffer and only the end changes, and that would be fine.
         // Also, exclude tiny segments.  Sometimes alignment segments as small
         // as 33ms are seen in Google DAI content.  For such tiny segments,
         // half a segment duration would be no issue.
         const offset = Math.abs(newBuffered.end - reference.endTime);
-        if (segmentDuration > 0.100 && offset > segmentDuration / 2) {
+        if (segmentDuration > 0.100 && (offset > segmentDuration / 2 ||
+            Math.abs(segmentDuration - timeAdded) > 0.030)) {
           shaka.log.error('Possible encoding problem detected!',
               'Unexpected buffered range for reference', reference,
               'from URIs', reference.getUris(),

package/lib/media/streaming_engine.js

@@ -1993,6 +1993,8 @@ shaka.media.StreamingEngine = class {
     const MimeUtils = shaka.util.MimeUtils;
     const StreamingEngine = shaka.media.StreamingEngine;
     const logPrefix = StreamingEngine.logPrefix_(mediaState);
+    const nullLastReferences = mediaState.lastSegmentReference == null &&
+      mediaState.lastInitSegmentReference == null;
 
     /** @type {!Array.<!Promise>} */
     const operations = [];
@@ -2190,8 +2192,19 @@ shaka.media.StreamingEngine = class {
             throw error;
           }
         };
+        let initSegmentTime = reference.startTime;
+        if (nullLastReferences) {
+          const bufferEnd =
+            this.playerInterface_.mediaSourceEngine.bufferEnd(mediaState.type);
+          if (bufferEnd != null) {
+            // Adjust init segment appendance time if we have something in
+            // a buffer, i.e. due to running switchVariant() with non zero
+            // safe margin value.
+            initSegmentTime = bufferEnd;
+          }
+        }
         this.playerInterface_.onInitSegmentAppended(
-            reference.startTime, reference.initSegmentReference);
+            initSegmentTime, reference.initSegmentReference);
         operations.push(append());
       }
     }

package/lib/player.js

@@ -1728,7 +1728,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.dispatchEvent(shaka.Player.makeEvent_(
           shaka.util.FakeEvent.EventName.Loaded));
     } catch (error) {
-      if (error.code != shaka.util.Error.Code.LOAD_INTERRUPTED) {
+      if (error && error.code != shaka.util.Error.Code.LOAD_INTERRUPTED) {
         await this.unload(/* initializeMediaSource= */ false);
       }
       throw error;
@@ -2787,8 +2787,21 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     // By setting |src| we are done "loading" with src=. We don't need to set
     // the current time because |playhead| will do that for us.
-    mediaElement.src = this.cmcdManager_.appendSrcData(
-        this.assetUri_, mimeType);
+    let playbackUri = this.cmcdManager_.appendSrcData(this.assetUri_, mimeType);
+    // Apply temporal clipping using playRangeStart and playRangeEnd based
+    // in https://www.w3.org/TR/media-frags/
+    if (!playbackUri.includes('#t=') &&
+        (this.config_.playRangeStart > 0 ||
+        isFinite(this.config_.playRangeEnd))) {
+      playbackUri += '#t=';
+      if (this.config_.playRangeStart > 0) {
+        playbackUri += this.config_.playRangeStart;
+      }
+      if (isFinite(this.config_.playRangeEnd)) {
+        playbackUri += ',' + this.config_.playRangeEnd;
+      }
+    }
+    mediaElement.src = playbackUri;
 
     // Tizen 3 / WebOS won't load anything unless you call load() explicitly,
     // no matter the value of the preload attribute.  This is harmful on some
@@ -6166,10 +6179,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     let updateState = 'playing';
     if (this.bufferObserver_.getState() == State.STARVING) {
       updateState = 'buffering';
-    } else if (this.video_.paused) {
-      updateState = 'paused';
     } else if (this.video_.ended) {
       updateState = 'ended';
+    } else if (this.video_.paused) {
+      updateState = 'paused';
     }
     const stateChanged = history.update(updateState);
 
@@ -7072,18 +7085,25 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   /**
    * Turn the media element's error object into a Shaka Player error object.
    *
+   * @param {boolean=} printAllErrors
    * @return {shaka.util.Error}
    * @private
    */
-  videoErrorToShakaError_() {
+  videoErrorToShakaError_(printAllErrors = true) {
     goog.asserts.assert(this.video_.error,
         'Video error expected, but missing!');
     if (!this.video_.error) {
+      if (printAllErrors) {
+        return new shaka.util.Error(
+            shaka.util.Error.Severity.CRITICAL,
+            shaka.util.Error.Category.MEDIA,
+            shaka.util.Error.Code.VIDEO_ERROR);
+      }
       return null;
     }
 
     const code = this.video_.error.code;
-    if (code == 1 /* MEDIA_ERR_ABORTED */) {
+    if (!printAllErrors && code == 1 /* MEDIA_ERR_ABORTED */) {
       // Ignore this error code, which should only occur when navigating away or
       // deliberately stopping playback of HTTP content.
       return null;
@@ -7115,7 +7135,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @private
    */
   onVideoError_(event) {
-    const error = this.videoErrorToShakaError_();
+    const error = this.videoErrorToShakaError_(/* printAllErrors= */ false);
     if (!error) {
       return;
     }
@@ -7484,7 +7504,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.9.22' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.23' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/abort_controller.js

@@ -58,14 +58,11 @@ shaka.polyfill.AbortController = class {
 
 /**
  * @summary A polyfill for AbortSignal, part of the AbortController API.
- * @implements {AbortSignal}
+ * @extends AbortSignal
  */
-shaka.polyfill.AbortController.AbortSignal =
-class extends shaka.util.FakeEventTarget {
+shaka.polyfill.AbortController.AbortSignal = class {
   /** */
   constructor() {
-    super();
-
     /** @private {boolean} */
     this.aborted_ = false;
 
@@ -74,6 +71,24 @@ class extends shaka.util.FakeEventTarget {
 
     /** @type {?function(!Event)} */
     this.onabort = null;
+
+    /** @private {!shaka.util.FakeEventTarget} */
+    this.eventTarget_ = new shaka.util.FakeEventTarget();
+  }
+
+  /** @override */
+  addEventListener(type, listener, options) {
+    return this.eventTarget_.addEventListener(type, listener, options);
+  }
+
+  /** @override */
+  removeEventListener(type, listener, options) {
+    return this.eventTarget_.removeEventListener(type, listener, options);
+  }
+
+  /** @override */
+  dispatchEvent(event) {
+    return this.eventTarget_.dispatchEvent(event);
   }
 
   /** @override */
@@ -81,12 +96,12 @@ class extends shaka.util.FakeEventTarget {
     return this.aborted_;
   }
 
-  /** @return {*} */
+  /** @override */
   get reason() {
     return this.reason_;
   }
 
-  /** @return {void} */
+  /** @override */
   throwIfAborted() {
     if (this.aborted_) {
       throw this.reason_;
@@ -119,21 +134,14 @@ class extends shaka.util.FakeEventTarget {
     this.dispatchEvent(event);
   }
 
-
-  /**
-   * @param {*=} reason
-   * @return {!AbortSignal}
-   */
+  /** @override */
   static abort(reason) {
     const signal = new shaka.polyfill.AbortController.AbortSignal();
     signal.doAbort_(reason);
     return signal;
   }
 
-  /**
-   * @param {number} timeMs
-   * @return {!AbortSignal}
-   */
+  /** @override */
   static timeout(timeMs) {
     const signal = new shaka.polyfill.AbortController.AbortSignal();
 

package/lib/text/ui_text_displayer.js

@@ -842,7 +842,7 @@ shaka.text.UITextDisplayer = class {
       if (cue.position !== null) {
         style.position = 'absolute';
         if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
-          style.right = cue.position + '%';
+          style.right = (100 - cue.position) + '%';
           style.width = 'auto';
         } else {
           style.bottom = cue.position + '%';

package/lib/util/stream_utils.js

@@ -1382,6 +1382,13 @@ shaka.util.StreamUtils = class {
       track.hdr = video.hdr || null;
       track.colorGamut = video.colorGamut || null;
       track.videoLayout = video.videoLayout || null;
+
+      if (videoCodec.includes(',')) {
+        track.channelsCount = video.channelsCount;
+        track.audioSamplingRate = video.audioSamplingRate;
+        track.spatialAudio = video.spatialAudio;
+        track.originalLanguage = video.originalLanguage;
+      }
     }
 
     if (audio) {

package/lib/util/tXml.js

@@ -753,11 +753,18 @@ shaka.util.TXml = class {
         // We only want the id attribute in which case
         // /'(.*?)'/ will suffice to get it.
         const idAttr = path.match(/(@id='(.*?)')/);
+        const tAttr = path.match(/(@t='(\d+)')/);
+        const numberIndex = path.match(/(@n='(\d+)')/);
         const position = path.match(/\[(\d+)\]/);
         returnPaths.push({
           name: nodeName[0],
           id: idAttr ?
             idAttr[0].match(/'(.*?)'/)[0].replace(/'/gm, '') : null,
+          t: tAttr ?
+            Number(tAttr[0].match(/'(.*?)'/)[0].replace(/'/gm, '')) : null,
+          n: numberIndex ?
+            Number(numberIndex[0].match(/'(.*?)'/)[0].replace(/'/gm, '')):
+            null,
           // position is counted from 1, so make it readable for devs
           position: position ? Number(position[1]) - 1 : null,
           attribute: path.split('/@')[1] || null,
@@ -787,6 +794,14 @@ shaka.util.TXml = class {
     const position = patchNode.attributes['pos'] || null;
 
     let index = lastNode.position;
+    if (index == null) {
+      if (lastNode.t !== null) {
+        index = TXml.nodePositionByAttribute_(nodes, 't', lastNode.t);
+      }
+      if (lastNode.n !== null) {
+        index = TXml.nodePositionByAttribute_(nodes, 'n', lastNode.n);
+      }
+    }
     if (index === null) {
       index = position === 'prepend' ? 0 : nodes.length;
     } else if (position === 'prepend') {
@@ -798,7 +813,7 @@ shaka.util.TXml = class {
     const attribute = lastNode.attribute;
 
     // Modify attribute
-    if (attribute) {
+    if (attribute && nodes[index]) {
       TXml.modifyNodeAttribute(nodes[index], action, attribute,
           TXml.getContents(patchNode) || '');
     // Rearrange nodes
@@ -814,6 +829,28 @@ shaka.util.TXml = class {
   }
 
 
+  /**
+   * Search the node index by the t attribute
+   * and return the index. if not found return null
+   * @param {!Array<shaka.extern.xml.Node>} nodes
+   * @param {!string} attribute
+   * @param {!number} value
+   * @private
+   */
+  static nodePositionByAttribute_(nodes, attribute, value) {
+    let index = 0;
+    for (const node of nodes) {
+      const attrs = node.attributes;
+      const val = Number(attrs[attribute]);
+      if (val === value) {
+        return index;
+      }
+      index++;
+    }
+    return null;
+  }
+
+
   /**
    * @param {!shaka.extern.xml.Node} node
    * @param {string} action
@@ -875,6 +912,8 @@ shaka.util.TXml.knownNameSpaces_ = new Map([]);
  * @typedef {{
  *   name: string,
  *   id: ?string,
+ *   t: ?number,
+ *   n: ?number,
  *   position: ?number,
  *   attribute: ?string
  * }}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.9.22",
+  "version": "4.9.23",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -31,8 +31,8 @@
     "eslint-plugin-shaka-rules": "file:./build/eslint-plugin-shaka-rules",
     "esprima": "^4.0.1",
     "fontfaceonload": "^1.0.2",
-    "google-closure-compiler-java": "^20221102.0.0",
-    "google-closure-deps": "^20221102.0.0",
+    "google-closure-compiler-java": "^20240317.0.0",
+    "google-closure-deps": "^20230802.0.0",
     "google-closure-library": "^20221102.0.0",
     "htmlhint": "^1.1.3",
     "jasmine-ajax": "^4.0.0",

package/ui/presentation_time.js

@@ -83,7 +83,10 @@ shaka.ui.PresentationTimeTracker = class extends shaka.ui.Element {
     const seekRangeSize = seekRange.end - seekRange.start;
     const Utils = shaka.ui.Utils;
 
-    if (this.player.isLive()) {
+    if (!isFinite(seekRangeSize)) {
+      this.setValue_(this.localization.resolve(shaka.ui.Locales.Ids.LIVE));
+      this.currentTime_.disabled = true;
+    } else if (this.player.isLive()) {
       // The amount of time we are behind the live edge.
       const behindLive = Math.floor(seekRange.end - displayTime);
       displayTime = Math.max(0, behindLive);

package/ui/resolution_selection.js

@@ -259,9 +259,17 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
     if (height == 2160) {
       text = '4K';
     }
-    const frameRate = track.frameRate;
-    if (frameRate && (frameRate >= 50 || frameRate <= 20)) {
-      text += Math.round(track.frameRate);
+    const frameRates = new Set();
+    for (const item of tracks) {
+      if (item.frameRate) {
+        frameRates.add(Math.round(item.frameRate));
+      }
+    }
+    if (frameRates.size > 1) {
+      const frameRate = track.frameRate;
+      if (frameRate && (frameRate >= 50 || frameRate <= 20)) {
+        text += Math.round(track.frameRate);
+      }
     }
     if (track.hdr == 'PQ' || track.hdr == 'HLG') {
       text += ' (HDR)';

package/ui/seek_bar.js

@@ -470,7 +470,8 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
     const seekRangeSize = seekRange.end - seekRange.start;
 
     if (this.player.isLive() &&
-        seekRangeSize < shaka.ui.Constants.MIN_SEEK_WINDOW_TO_SHOW_SEEKBAR) {
+        (seekRangeSize < shaka.ui.Constants.MIN_SEEK_WINDOW_TO_SHOW_SEEKBAR ||
+        !isFinite(seekRangeSize))) {
       return false;
     }