shaka-player 4.8.1 → 4.8.2

package/lib/dash/mpd_utils.js

@@ -282,12 +282,6 @@ shaka.dash.MpdUtils = class {
     const durationStr =
         MpdUtils.inheritAttribute(context, callback, 'duration');
     let segmentDuration = TXml.parsePositiveInt(durationStr || '');
-    const ContentType = shaka.util.ManifestParserUtils.ContentType;
-    // TODO: The specification is not clear, check this once it is resolved:
-    // https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/404
-    if (context.representation.contentType == ContentType.IMAGE) {
-      segmentDuration = TXml.parseFloat(durationStr || '');
-    }
     if (segmentDuration) {
       segmentDuration /= timescale;
     }

package/lib/dash/segment_template.js

@@ -398,6 +398,11 @@ shaka.dash.SegmentTemplate = class {
         Math.ceil(availablePeriodTimes[1] / segmentDuration) - 1,
       ];
 
+      // For Low Latency we can request the partial current position.
+      if (context.representation.availabilityTimeOffset) {
+        availablePeriodPositions[1]++;
+      }
+
       // In absolute positions.
       const availablePresentationPositions =
           availablePeriodPositions.map((x) => x + startNumber);

package/lib/media/playhead.js

@@ -382,10 +382,10 @@ shaka.media.MediaSourcePlayhead = class {
       seekStart = seekEnd - this.minSeekRange_;
     }
 
-    if (currentTime < seekStart || currentTime > seekEnd) {
-      // playhead is outside of the seekrange.  Move playhead to catch up.
+    if (currentTime < seekStart) {
+      // The seek range has moved past the playhead.  Move ahead to catch up.
       const targetTime = this.reposition_(currentTime);
-      shaka.log.info('Jumping by ' + (targetTime - currentTime) +
+      shaka.log.info('Jumping forward ' + (targetTime - currentTime) +
                      ' seconds to catch up with the seek range.');
       this.mediaElement_.currentTime = targetTime;
     }

package/lib/media/segment_prefetch.js

@@ -147,7 +147,12 @@ shaka.media.SegmentPrefetch = class {
     }
 
     // init segments are ignored from the prefetch limit
-    if (!this.initSegmentPrefetchMap_.has(initSegmentReference)) {
+    const initSegments = Array.from(this.initSegmentPrefetchMap_.keys());
+    const someReference = initSegments.some((reference) => {
+      return shaka.media.InitSegmentReference.equal(
+          reference, initSegmentReference);
+    });
+    if (!someReference) {
       const segmentPrefetchOperation =
         new shaka.media.SegmentPrefetchOperation(this.fetchDispatcher_);
       segmentPrefetchOperation.dispatchFetch(
@@ -233,6 +238,15 @@ shaka.media.SegmentPrefetch = class {
     this.prefetchPosTime_ = 0;
   }
 
+  /**
+   * Remove a reference of prefetched segment if already exists.
+   * @param {!shaka.media.SegmentReference} reference
+   * @public
+   */
+  removeReference(reference) {
+    this.abortPrefetchedSegment_(reference);
+  }
+
   /**
    * @param {number} time
    * @param {boolean=} clearInitSegments
@@ -261,9 +275,11 @@ shaka.media.SegmentPrefetch = class {
     const segmentReferences = Array.from(this.segmentPrefetchMap_.keys());
     for (const initSegmentReference of this.initSegmentPrefetchMap_.keys()) {
       // if no segment references this init segment, we should remove it.
-      if (!segmentReferences.some(
-          (segmentReference) =>
-            segmentReference.initSegmentReference === initSegmentReference)) {
+      const someReference = segmentReferences.some((segmentReference) => {
+        return shaka.media.InitSegmentReference.equal(
+            segmentReference.initSegmentReference, initSegmentReference);
+      });
+      if (!someReference) {
         this.abortPrefetchedSegment_(initSegmentReference);
       }
     }

package/lib/media/streaming_engine.js

@@ -1702,6 +1702,11 @@ shaka.media.StreamingEngine = class {
             error.code);
         mediaState.hasError = true;
 
+        if (error.category == shaka.util.Error.Category.NETWORK &&
+            mediaState.segmentPrefetch) {
+          mediaState.segmentPrefetch.removeReference(reference);
+        }
+
         error.severity = shaka.util.Error.Severity.CRITICAL;
         await this.handleStreamingError_(mediaState, error);
       }

package/lib/player.js

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

package/lib/text/ui_text_displayer.js

@@ -8,6 +8,7 @@
 goog.provide('shaka.text.UITextDisplayer');
 
 goog.require('goog.asserts');
+goog.require('shaka.Deprecate');
 goog.require('shaka.text.Cue');
 goog.require('shaka.text.CueRegion');
 goog.require('shaka.util.Dom');
@@ -65,12 +66,22 @@ shaka.text.UITextDisplayer = class {
 
     this.videoContainer_.appendChild(this.textContainer_);
 
+    if (!config || !config.captionsUpdatePeriod) {
+      shaka.Deprecate.deprecateFeature(5,
+          'UITextDisplayer w/ config',
+          'Please migrate to initializing UITextDisplayer with a config.');
+    }
+
+    /** @private {number} */
+    const updatePeriod = (config && config.captionsUpdatePeriod) ?
+       config.captionsUpdatePeriod : 0.25;
+
     /** @private {shaka.util.Timer} */
     this.captionsTimer_ = new shaka.util.Timer(() => {
       if (!this.video_.paused) {
         this.updateCaptions_();
       }
-    }).tickEvery(config.captionsUpdatePeriod);
+    }).tickEvery(updatePeriod);
 
     /**
      * Maps cues to cue elements. Specifically points out the wrapper element of

package/lib/util/platform.js

@@ -186,6 +186,17 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('CrKey');
   }
 
+  /**
+   * Check if the current platform is a Google Chromecast with Android
+   * (i.e. Chromecast with GoogleTV).
+   *
+   * @return {boolean}
+   */
+  static isAndroidCastDevice() {
+    const Platform = shaka.util.Platform;
+    return Platform.isChromecast() && Platform.isAndroid();
+  }
+
   /**
    * Returns a major version number for Chrome, or Chromium-based browsers.
    *
@@ -416,6 +427,9 @@ shaka.util.Platform = class {
       return navigator.userAgentData.platform.toLowerCase() == 'macos';
     }
     // Fall back to the old API, with less strict matching.
+    if (!navigator.platform) {
+      return false;
+    }
     return navigator.platform.toLowerCase().includes('mac');
   }
 
@@ -430,6 +444,9 @@ shaka.util.Platform = class {
       return navigator.userAgentData.platform.toLowerCase() == 'windows';
     }
     // Fall back to the old API, with less strict matching.
+    if (!navigator.platform) {
+      return false;
+    }
     return navigator.platform.toLowerCase().includes('windows');
   }
 
@@ -556,6 +573,10 @@ shaka.util.Platform = class {
         Platform.isWebOS4() || Platform.isWebOS5()) {
       return false;
     }
+    // Older chromecasts without GoogleTV seem to not support SMOOTH properly.
+    if (Platform.isChromecast() && !Platform.isAndroidCastDevice()) {
+      return false;
+    }
     // See: https://chromium-review.googlesource.com/c/chromium/src/+/4577759
     if (Platform.isWindows() && Platform.isEdge()) {
       return false;

package/lib/util/tXml.js

@@ -779,7 +779,7 @@ shaka.util.TXml = class {
       element.setAttribute(k, v);
     }
 
-    if (doParents && node.parent) {
+    if (doParents && node.parent && node.parent.tagName != '?xml') {
       const parentElement = TXml.txmlNodeToDomElement(
           node.parent, /* doParents= */ true, /* doChildren= */ false);
       parentElement.appendChild(element);

package/package.json

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

package/ui/resolution_selection.js

@@ -116,6 +116,7 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
       } else {
         otherIdx = tracks.findIndex((t) => {
           return t.height == track.height &&
+              t.videoBandwidth == track.videoBandwidth &&
               t.frameRate == track.frameRate &&
               t.hdr == track.hdr &&
               t.videoLayout == track.videoLayout;