shaka-player 4.8.5 → 4.8.7

package/externs/cast-namespace.js

@@ -0,0 +1,14 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2024 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Google Cast namespace definitions, shared by other externs
+ * files.
+ * @externs
+ */
+
+/** @const */
+var cast = {};

package/externs/{chromecast.js → cast-sdk-v2.js}

@@ -15,10 +15,6 @@
 var __onGCastApiAvailable;
 
 
-/** @const */
-var cast = {};
-
-
 /** @const */
 cast.receiver = {};
 

package/externs/cast-sdk-v3.js

@@ -0,0 +1,35 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2024 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Externs for the limited subset of the Cast Application
+ * Framework (Receiver SDK v3) that we use in our test infrastructure.
+ *
+ * @externs
+ */
+
+/** @const */
+cast.framework = {};
+
+/**
+ * @typedef {{
+ *   statusText: string,
+ *   disableIdleTimeout: boolean,
+ *   skipPlayersLoad: boolean
+ * }}
+ */
+cast.framework.CastReceiverOptions;
+
+cast.framework.CastReceiverContext = class {
+  /** @return {!cast.framework.CastReceiverContext} */
+  static getInstance() {}
+
+  /**
+   * @param {!cast.framework.CastReceiverOptions} options
+   * @return {!cast.framework.CastReceiverContext}
+   */
+  start(options) {}
+};

package/externs/{cast.js → remote-playback.js}

@@ -5,8 +5,8 @@
  */
 
 /**
- * @fileoverview Externs for HTMLMediaElement related to casting which were
- * missing in the Closure compiler.
+ * @fileoverview Externs for HTMLMediaElement related to remote playback which
+ * were missing in the Closure compiler.
  *
  * @externs
  */

package/externs/shaka/player.js

@@ -1230,7 +1230,8 @@ shaka.extern.ManifestConfiguration;
  *   vodDynamicPlaybackRate: boolean,
  *   vodDynamicPlaybackRateLowBufferRate: number,
  *   vodDynamicPlaybackRateBufferRatio: number,
- *   infiniteLiveStreamDuration: boolean
+ *   infiniteLiveStreamDuration: boolean,
+ *   loadTimeout: number
  * }}
  *
  * @description
@@ -1421,6 +1422,10 @@ shaka.extern.ManifestConfiguration;
  *   If <code>true</code>, the media source live duration
  *   set as a<code>Infinity</code>
  *   Defaults to <code> false </code>.
+ * @property {number} loadTimeout
+ *   The maximum timeout to reject the load when using src= in case the content
+ *   does not work correctly.  Measured in seconds.
+ *   Defaults to <code> 30 </code>.
  * @exportDoc
  */
 shaka.extern.StreamingConfiguration;

package/lib/hls/hls_parser.js

@@ -741,6 +741,18 @@ shaka.hls.HlsParser = class {
     /** @type {!Array.<!shaka.extern.Stream>} */
     let imageStreams = [];
 
+    // This assert is our own sanity check.
+    goog.asserts.assert(this.presentationTimeline_ == null,
+        'Presentation timeline created early!');
+    // We don't know if the presentation is VOD or live until we parse at least
+    // one media playlist, so make a VOD-style presentation timeline for now
+    // and change the type later if we discover this is live.
+    // Since the player will load the first variant chosen early in the process,
+    // there isn't a window during playback where the live-ness is unknown.
+    this.presentationTimeline_ = new shaka.media.PresentationTimeline(
+        /* presentationStartTime= */ null, /* delay= */ 0);
+    this.presentationTimeline_.setStatic(true);
+
     const getUris = () => {
       return [uri];
     };
@@ -843,18 +855,6 @@ shaka.hls.HlsParser = class {
           shaka.util.Error.Code.OPERATION_ABORTED);
     }
 
-    // This assert is our own sanity check.
-    goog.asserts.assert(this.presentationTimeline_ == null,
-        'Presentation timeline created early!');
-    // We don't know if the presentation is VOD or live until we parse at least
-    // one media playlist, so make a VOD-style presentation timeline for now
-    // and change the type later if we discover this is live.
-    // Since the player will load the first variant chosen early in the process,
-    // there isn't a window during playback where the live-ness is unknown.
-    this.presentationTimeline_ = new shaka.media.PresentationTimeline(
-        /* presentationStartTime= */ null, /* delay= */ 0);
-    this.presentationTimeline_.setStatic(true);
-
     // Single-variant streams aren't lazy-loaded, so for them we already have
     // enough info here to determine the presentation type and duration.
     if (playlist.type == shaka.hls.PlaylistType.MEDIA) {

package/lib/media/closed_caption_parser.js

@@ -26,8 +26,10 @@ shaka.media.IClosedCaptionParser = class {
    * Initialize the caption parser. This should be called whenever new init
    * segment arrives.
    * @param {BufferSource} initSegment
+   * @param {boolean=} adaptation True if we just automatically switched active
+   *   variant(s).
    */
-  init(initSegment) {}
+  init(initSegment, adaptation = false) {}
 
   /**
    * Parses embedded CEA closed captions and interacts with the underlying
@@ -89,12 +91,16 @@ shaka.media.ClosedCaptionParser = class {
   /**
    * @override
    */
-  init(initSegment) {
+  init(initSegment, adaptation = false) {
     shaka.log.debug('Passing new init segment to CEA parser');
-    // Reset underlying decoder when new init segment arrives
-    // to clear stored pts values.
-    this.reset();
-    this.ceaParser_.init(initSegment);
+    if (!adaptation) {
+      // Reset underlying decoder when new init segment arrives
+      // to clear stored pts values.
+      // This is necessary when a new Period comes in DASH or a discontinuity
+      // in HLS.
+      this.reset();
+      this.ceaParser_.init(initSegment);
+    }
   }
 
   /**

package/lib/media/media_source_engine.js

@@ -964,7 +964,7 @@ shaka.media.MediaSourceEngine = class {
       // If it is the init segment for closed captions, initialize the closed
       // caption parser.
       if (!reference) {
-        this.captionParser_.init(data);
+        this.captionParser_.init(data, adaptation);
       } else {
         const closedCaptions = this.captionParser_.parseFrom(data);
         if (closedCaptions.length) {

package/lib/net/http_fetch_plugin.js

@@ -167,8 +167,10 @@ shaka.net.HttpFetchPlugin = class {
             // is long enough, or if a whole segment is downloaded, call
             // progressUpdated().
             if (currentTime - lastTime > 100 || readObj.done) {
+              const numBytesRemaining =
+                  readObj.done ? 0 : contentLength - loaded;
               progressUpdated(currentTime - lastTime, loaded - lastLoaded,
-                  contentLength - loaded);
+                  numBytesRemaining);
               lastLoaded = loaded;
               lastTime = currentTime;
             }

package/lib/net/http_xhr_plugin.js

@@ -67,6 +67,9 @@ shaka.net.HttpXHRPlugin = class {
         const xhrResponse = xhr.response;
 
         try {
+          const currentTime = Date.now();
+          progressUpdated(currentTime - lastTime, event.loaded - lastLoaded,
+              /* numBytesRemaining= */ 0);
           const response = shaka.net.HttpPluginUtils.makeResponse(headers,
               xhrResponse, xhr.status, uri, xhr.responseURL, requestType);
           resolve(response);
@@ -97,8 +100,10 @@ shaka.net.HttpXHRPlugin = class {
         // progressUpdated().
         if (currentTime - lastTime > 100 ||
             (event.lengthComputable && event.loaded == event.total)) {
+          const numBytesRemaining =
+              xhr.readyState == 4 ? 0 : event.total - event.loaded;
           progressUpdated(currentTime - lastTime, event.loaded - lastLoaded,
-              event.total - event.loaded);
+              numBytesRemaining);
           lastLoaded = event.loaded;
           lastTime = currentTime;
         }

package/lib/player.js

@@ -2454,42 +2454,49 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       disabledUntilTime: 0,
       primary: false,
       audio: null,
-      video: {
-        id: 0,
-        originalId: null,
-        groupId: null,
-        createSegmentIndex: () => Promise.resolve(),
-        segmentIndex: null,
-        mimeType: mimeType ? shaka.util.MimeUtils.getBasicType(mimeType) : '',
-        codecs: mimeType ? shaka.util.MimeUtils.getCodecs(mimeType) : '',
-        encrypted: true,
-        drmInfos: [],  // Filled in by DrmEngine config.
-        keyIds: new Set(),
-        language: 'und',
-        originalLanguage: null,
-        label: null,
-        type: ContentType.VIDEO,
-        primary: false,
-        trickModeVideo: null,
-        emsgSchemeIdUris: null,
-        roles: [],
-        forced: false,
-        channelsCount: null,
-        audioSamplingRate: null,
-        spatialAudio: false,
-        closedCaptions: null,
-        accessibilityPurpose: null,
-        external: false,
-        fastSwitching: false,
-        fullMimeTypes: new Set(),
-      },
+      video: null,
       bandwidth: 100,
       allowedByApplication: true,
       allowedByKeySystem: true,
       decodingInfos: [],
     };
-    variant.video.fullMimeTypes.add(shaka.util.MimeUtils.getFullType(
-        variant.video.mimeType, variant.video.codecs));
+    const stream = {
+      id: 0,
+      originalId: null,
+      groupId: null,
+      createSegmentIndex: () => Promise.resolve(),
+      segmentIndex: null,
+      mimeType: mimeType ? shaka.util.MimeUtils.getBasicType(mimeType) : '',
+      codecs: mimeType ? shaka.util.MimeUtils.getCodecs(mimeType) : '',
+      encrypted: true,
+      drmInfos: [],  // Filled in by DrmEngine config.
+      keyIds: new Set(),
+      language: 'und',
+      originalLanguage: null,
+      label: null,
+      type: ContentType.VIDEO,
+      primary: false,
+      trickModeVideo: null,
+      emsgSchemeIdUris: null,
+      roles: [],
+      forced: false,
+      channelsCount: null,
+      audioSamplingRate: null,
+      spatialAudio: false,
+      closedCaptions: null,
+      accessibilityPurpose: null,
+      external: false,
+      fastSwitching: false,
+      fullMimeTypes: new Set(),
+    };
+    stream.fullMimeTypes.add(shaka.util.MimeUtils.getFullType(
+        stream.mimeType, stream.codecs));
+    if (mimeType.startsWith('audio/')) {
+      stream.type = ContentType.AUDIO;
+      variant.audio = stream;
+    } else {
+      variant.video = stream;
+    }
 
     this.drmEngine_.setSrcEquals(/* srcEquals= */ true);
     await this.drmEngine_.initForPlayback(
@@ -2708,7 +2715,15 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       fullyLoaded.reject(this.videoErrorToShakaError_());
     });
 
-    await fullyLoaded;
+    const timeout = new Promise((resolve, reject) => {
+      const timer = new shaka.util.Timer(reject);
+      timer.tickAfter(this.config_.streaming.loadTimeout);
+    });
+
+    await Promise.race([
+      fullyLoaded,
+      timeout,
+    ]);
 
     const isLive = this.isLive();
 
@@ -3026,10 +3041,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     /** @type {shaka.net.NetworkingEngine.OnResponse} */
     const onResponse_ = (type, response, context) => {
-      const bytesDownloaded = response.data.byteLength;
-      const stats = getStats();
-      if (stats) {
-        stats.addBytesDownloaded(bytesDownloaded);
+      if (response.data) {
+        const bytesDownloaded = response.data.byteLength;
+        const stats = getStats();
+        if (stats) {
+          stats.addBytesDownloaded(bytesDownloaded);
+        }
       }
     };
 
@@ -7217,7 +7234,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.8.5' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.8.7' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -25,10 +25,8 @@ shaka.polyfill.MediaCapabilities = class {
    * @export
    */
   static install() {
-    // Since MediaCapabilities implementation is buggy on the Chromecast
-    // platform (see https://github.com/shaka-project/shaka-player/issues/4569),
-    // we should always install polyfills on all Chromecast models.
-    // TODO: re-evaluate MediaCapabilities in the future versions of Chromecast.
+    // We can enable MediaCapabilities in Android and Fuchsia devices, but not
+    // in Linux devices because the implementation is buggy.
     // Since MediaCapabilities implementation is buggy in Apple browsers, we
     // should always install polyfill for Apple browsers.
     // See: https://github.com/shaka-project/shaka-player/issues/3530
@@ -50,12 +48,16 @@ shaka.polyfill.MediaCapabilities = class {
     // Since MediaCapabilities implementation is buggy in Hisense browsers, we
     // should always install polyfill for Hisense browsers.
     let canUseNativeMCap = true;
+    if (shaka.util.Platform.isChromecast() &&
+        !shaka.util.Platform.isAndroidCastDevice() &&
+        !shaka.util.Platform.isFuchsiaCastDevice()) {
+      canUseNativeMCap = false;
+    }
     if (shaka.util.Platform.isApple() ||
         shaka.util.Platform.isPS5() ||
         shaka.util.Platform.isPS4() ||
         shaka.util.Platform.isWebOS() ||
         shaka.util.Platform.isTizen() ||
-        shaka.util.Platform.isChromecast() ||
         shaka.util.Platform.isEOS() ||
         shaka.util.Platform.isHisense()) {
       canUseNativeMCap = false;

package/lib/util/player_configuration.js

@@ -248,6 +248,7 @@ shaka.util.PlayerConfiguration = class {
       vodDynamicPlaybackRateLowBufferRate: 0.95,
       vodDynamicPlaybackRateBufferRatio: 0.5,
       infiniteLiveStreamDuration: false,
+      loadTimeout: 30,
     };
 
     // WebOS, Tizen, Chromecast and Hisense have long hardware pipelines

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.8.5",
+  "version": "4.8.7",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -39,7 +39,7 @@
     "jimp": "^0.16.1",
     "js-yaml": "^4.1.0",
     "jsdoc": "github:joeyparrish/jsdoc#2ca85bb6",
-    "karma": "^6.3.16",
+    "karma": "github:joeyparrish/karma#shaka-fixes",
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",

package/support.html

@@ -38,8 +38,10 @@
 }
 
     </style>
+    <script src="dist/cast-boot.js"></script>
     <script src="dist/shaka-player.compiled.js"></script>
     <script>
+
       function whenLoaded(fn) {
         // IE 9 fires DOMContentLoaded, and enters the "interactive"
         // readyState, before document.body has been initialized, so wait

package/ui/range_element.js

@@ -70,11 +70,12 @@ shaka.ui.RangeElement = class extends shaka.ui.Element {
     this.container.appendChild(this.bar);
     this.parent.appendChild(this.container);
 
-    this.eventManager.listen(this.bar, 'mousedown', () => {
+    this.eventManager.listen(this.bar, 'mousedown', (e) => {
       if (this.controls.isOpaque()) {
         this.isChanging_ = true;
         this.onChangeStart();
       }
+      e.stopPropagation();
     });
 
     this.eventManager.listen(this.bar, 'touchstart', (e) => {
@@ -83,6 +84,7 @@ shaka.ui.RangeElement = class extends shaka.ui.Element {
         this.setBarValueForTouch_(e);
         this.onChangeStart();
       }
+      e.stopPropagation();
     });
 
     this.eventManager.listen(this.bar, 'input', () => {
@@ -94,6 +96,7 @@ shaka.ui.RangeElement = class extends shaka.ui.Element {
         this.setBarValueForTouch_(e);
         this.onChange();
       }
+      e.stopPropagation();
     });
 
     this.eventManager.listen(this.bar, 'touchend', (e) => {
@@ -102,6 +105,7 @@ shaka.ui.RangeElement = class extends shaka.ui.Element {
         this.setBarValueForTouch_(e);
         this.onChangeEnd();
       }
+      e.stopPropagation();
     });
 
     this.eventManager.listen(this.bar, 'touchcancel', (e) => {
@@ -110,13 +114,15 @@ shaka.ui.RangeElement = class extends shaka.ui.Element {
         this.setBarValueForTouch_(e);
         this.onChangeEnd();
       }
+      e.stopPropagation();
     });
 
-    this.eventManager.listen(this.bar, 'mouseup', () => {
+    this.eventManager.listen(this.bar, 'mouseup', (e) => {
       if (this.isChanging_) {
         this.isChanging_ = false;
         this.onChangeEnd();
       }
+      e.stopPropagation();
     });
 
     this.eventManager.listen(this.bar, 'blur', () => {

package/ui/vr_webgl.js

@@ -245,7 +245,9 @@ shaka.ui.VRWebgl = class {
         }).tickNow().tickEvery(1 / frameRate);
       });
       this.eventManager_.listen(this.video_, 'pause', () => {
-        this.activeTimer_.stop();
+        if (this.activeTimer_) {
+          this.activeTimer_.stop();
+        }
         this.activeTimer_ = null;
         this.renderGL_();
       });