shaka-player 4.9.30 → 4.9.32

package/lib/media/preload_manager.js

@@ -396,7 +396,12 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
         this.successPromise_.resolve();
       } catch (error) {
-        this.successPromise_.reject(error);
+        // Ignore OPERATION_ABORTED and OBJECT_DESTROYED errors.
+        if (!(error instanceof shaka.util.Error) ||
+            (error.code != shaka.util.Error.Code.OPERATION_ABORTED &&
+             error.code != shaka.util.Error.Code.OBJECT_DESTROYED)) {
+          this.successPromise_.reject(error);
+        }
       }
     })();
   }

package/lib/media/segment_index.js

@@ -679,6 +679,26 @@ shaka.media.SegmentIterator = class {
       'done': !res,
     };
   }
+
+  /**
+   * @export
+   */
+  resetToLastIndependent() {
+    const current = this.current();
+    if (current.isPartial() && !current.isIndependent()) {
+      const ref = this.segmentIndex_.get(this.currentPosition_);
+      if (ref && ref.hasPartialSegments()) {
+        let partial = ref.partialReferences[this.currentPartialPosition_];
+        while (partial.isIndependent()) {
+          if (this.currentPartialPosition_ <= 0) {
+            break;
+          }
+          this.currentPartialPosition_--;
+          partial = ref.partialReferences[this.currentPartialPosition_];
+        }
+      }
+    }
+  }
 };
 
 

package/lib/media/segment_prefetch.js

@@ -111,6 +111,9 @@ shaka.media.SegmentPrefetch = class {
           shaka.media.SegmentReference.Status.MISSING) {
         prefetchAllowed = false;
       }
+      if (reference.getSegmentData()) {
+        prefetchAllowed = false;
+      }
       if (prefetchAllowed && reference.initSegmentReference) {
         this.prefetchInitSegment(reference.initSegmentReference);
       }
@@ -143,6 +146,10 @@ shaka.media.SegmentPrefetch = class {
       return;
     }
 
+    if (initSegmentReference.getSegmentData()) {
+      return;
+    }
+
     // init segments are ignored from the prefetch limit
     const initSegments = Array.from(this.initSegmentPrefetchMap_.keys());
     const someReference = initSegments.some((reference) => {

package/lib/media/segment_reference.js

@@ -295,7 +295,7 @@ shaka.media.SegmentReference = class {
     this.thumbnailSprite = null;
 
     /** @type {number} */
-    this.discontinuitySequence = 0;
+    this.discontinuitySequence = -1;
 
     /** @type {boolean} */
     this.allPartialSegments = allPartialSegments;

package/lib/media/streaming_engine.js

@@ -2001,8 +2001,7 @@ 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;
+    const nullLastReferences = mediaState.lastSegmentReference == null;
 
     /** @type {!Array.<!Promise>} */
     const operations = [];
@@ -2217,17 +2216,15 @@ shaka.media.StreamingEngine = class {
       }
     }
 
-    if (this.manifest_.sequenceMode) {
-      const lastDiscontinuitySequence =
-          mediaState.lastSegmentReference ?
-              mediaState.lastSegmentReference.discontinuitySequence : null;
-      // Across discontinuity bounds, we should resync timestamps for
-      // sequence mode playbacks.  The next segment appended should
-      // land at its theoretical timestamp from the segment index.
-      if (reference.discontinuitySequence != lastDiscontinuitySequence) {
-        operations.push(this.playerInterface_.mediaSourceEngine.resync(
-            mediaState.type, reference.startTime));
-      }
+    const lastDiscontinuitySequence =
+        mediaState.lastSegmentReference ?
+            mediaState.lastSegmentReference.discontinuitySequence : null;
+    // Across discontinuity bounds, we should resync timestamps.  The next
+    // segment appended should land at its theoretical timestamp from the
+    // segment index.
+    if (reference.discontinuitySequence != lastDiscontinuitySequence) {
+      operations.push(this.playerInterface_.mediaSourceEngine.resync(
+          mediaState.type, reference.startTime));
     }
 
     await Promise.all(operations);
@@ -2871,12 +2868,18 @@ shaka.media.StreamingEngine = class {
       audioMediaState.lastInitSegmentReference = null;
       this.forceClearBuffer_(audioMediaState);
       this.abortOperations_(audioMediaState).catch(() => {});
+      if (audioMediaState.segmentIterator) {
+        audioMediaState.segmentIterator.resetToLastIndependent();
+      }
     }
     const videoMediaState = this.mediaStates_.get(ContentType.VIDEO);
     if (videoMediaState) {
       videoMediaState.lastInitSegmentReference = null;
       this.forceClearBuffer_(videoMediaState);
       this.abortOperations_(videoMediaState).catch(() => {});
+      if (videoMediaState.segmentIterator) {
+        videoMediaState.segmentIterator.resetToLastIndependent();
+      }
     }
     /**
      * @type {!Map.<shaka.util.ManifestParserUtils.ContentType,

package/lib/mss/mss_parser.js

@@ -943,6 +943,12 @@ shaka.mss.MssParser = class {
       let startTime = t != null ? t : lastEndTime;
 
       let repeat = r || 0;
+      // Unlike in DASH, in MSS r does not start counting repetitions at 0 but
+      // at 1, to maintain the code equivalent to DASH if r exists we
+      // subtract 1.
+      if (repeat) {
+        repeat--;
+      }
       if (repeat < 0) {
         if (next) {
           const nextStartTime =

package/lib/net/networking_engine.js

@@ -565,12 +565,12 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
         }
       };
       const headersReceived = (headers) => {
-        if (this.onHeadersReceived_) {
-          this.onHeadersReceived_(headers, request, type);
-        }
         headersReceivedCalled = true;
         request.timeToFirstByte = Date.now() -
         /** @type {number} */ (request.requestStartTime);
+        if (this.onHeadersReceived_) {
+          this.onHeadersReceived_(headers, request, type);
+        }
       };
       request.requestStartTime = Date.now();
 

package/lib/player.js

@@ -5922,7 +5922,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // Because this.video_ may not be set when the config is built, the default
     // TextDisplay factory must capture a reference to "this".
     config.textDisplayFactory = () => {
-      if (this.videoContainer_) {
+      // On iOS where the Fullscreen API is not available we prefer
+      // SimpleTextDisplayer because it works with the Fullscreen API of the
+      // video element itself.
+      const Platform = shaka.util.Platform;
+      if (this.videoContainer_ &&
+          (!Platform.safariVersion() || document.fullscreenEnabled)) {
         const latestConfig = this.getConfiguration();
         return new shaka.text.UITextDisplayer(
             this.video_, this.videoContainer_, latestConfig.textDisplayer);
@@ -6253,6 +6258,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return;
     }
 
+    // We don't want to block the user from pausing the stream.
+    if (this.video_.paused) {
+      return;
+    }
+
     let liveSyncMaxLatency;
     let liveSyncPlaybackRate;
     if (this.config_.streaming.liveSync) {
@@ -6943,6 +6953,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return false;
     }
 
+    if (!this.manifest_) {
+      return false;
+    }
+
     // It only makes sense to disable a stream if we have an alternative else we
     // end up disabling all variants.
     const hasAltStream = this.manifest_.variants.some((variant) => {
@@ -7535,7 +7549,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.9.30' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.32' + '-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

@@ -61,7 +61,8 @@ shaka.polyfill.MediaCapabilities = class {
         shaka.util.Platform.isWebOS() ||
         shaka.util.Platform.isTizen() ||
         shaka.util.Platform.isEOS() ||
-        shaka.util.Platform.isHisense()) {
+        shaka.util.Platform.isHisense() ||
+        shaka.util.Platform.isComcastX1()) {
       canUseNativeMCap = false;
     }
     if (canUseNativeMCap && navigator.mediaCapabilities) {
@@ -326,18 +327,56 @@ shaka.polyfill.MediaCapabilities = class {
 
     let displayType = videoConfig.contentType;
     if (videoConfig.width && videoConfig.height) {
-      displayType +=
-          `; width=${videoConfig.width}; height=${videoConfig.height}`;
+      // All Chromecast can support 720p videos
+      if (videoConfig.width > 1280 || videoConfig.height > 720) {
+        displayType +=
+            `; width=${videoConfig.width}; height=${videoConfig.height}`;
+      }
     }
     if (videoConfig.framerate) {
-      displayType += `; framerate=${videoConfig.framerate}`;
+      // All Chromecast can support a framerate of 24, 25 or 30.
+      const framerate = Math.round(videoConfig.framerate);
+      if (framerate < 24 || framerate > 30) {
+        displayType += `; framerate=${videoConfig.framerate}`;
+      }
     }
-    if (videoConfig.transferFunction === 'pq') {
-      // A "PQ" transfer function indicates this is an HDR-capable stream;
-      // "smpte2084" is the published standard. We need to inform the platform
-      // this query is specifically for HDR.
-      displayType += '; eotf=smpte2084';
+
+    // Don't trust Closure types here.  Although transferFunction is string or
+    // undefined, we don't want to count on the input type.  A switch statement
+    // will, however, differentiate between null and undefined.  So we default
+    // to a blank string.
+    const transferFunction = videoConfig.transferFunction || '';
+
+    // Based on internal sources.  Googlers, see go/cast-hdr-queries for source.
+    switch (transferFunction) {
+      // The empty case falls through to SDR.
+      case '':
+      // These are the only 3 values defined by MCap as of November 2024.
+      case 'srgb':
+        // https://en.wikipedia.org/wiki/Standard-dynamic-range_video
+        // https://en.wikipedia.org/wiki/SRGB
+        // https://en.wikipedia.org/wiki/Rec._709
+        // This is SDR, standardized in BT 709.
+        // The platform recognizes "eotf=bt709", but we can also omit it.
+        break;
+
+      case 'pq':
+        // https://en.wikipedia.org/wiki/Perceptual_quantizer
+        // This HDR transfer function is standardized as SMPTE ST 2084.
+        displayType += '; eotf=smpte2084';
+        break;
+
+      case 'hlg':
+        // https://en.wikipedia.org/wiki/Hybrid_log%E2%80%93gamma
+        // This HDR transfer function is standardized as ARIB STD-B67.
+        displayType += '; eotf=arib-std-b67';
+        break;
+
+      default:
+        // An unrecognized transfer function.  Reject this query.
+        return false;
     }
+
     let result = false;
     if (displayType in shaka.polyfill.MediaCapabilities
         .memoizedCanDisplayTypeRequests_) {

package/lib/polyfill/mediasource.js

@@ -87,6 +87,18 @@ shaka.polyfill.MediaSource = class {
       // the player from trying to play opus on Tizen, we will override media
       // source to always reject opus content.
       shaka.polyfill.MediaSource.rejectCodec_('opus');
+    } else if (shaka.util.Platform.isComcastX1()) {
+      // XOne look to be like safari 8 which do not correctly
+      // implement abort() on SourceBuffer.
+      // Calling abort() before appending a segment causes that segment to be
+      // incomplete in the buffer.
+      // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=165342
+      shaka.polyfill.MediaSource.stubAbort_();
+      // If you remove up to a keyframe, Webkit 601.x.x incorrectly will also
+      // remove that keyframe and the content up to the next.
+      // Offsetting the end of the removal range seems to help.
+      // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=177884
+      shaka.polyfill.MediaSource.patchRemovalRange_();
     } else {
       shaka.log.info('Using native MSE as-is.');
     }

package/lib/text/ui_text_displayer.js

@@ -9,6 +9,7 @@ goog.provide('shaka.text.UITextDisplayer');
 
 goog.require('goog.asserts');
 goog.require('shaka.Deprecate');
+goog.require('shaka.log');
 goog.require('shaka.text.Cue');
 goog.require('shaka.text.CueRegion');
 goog.require('shaka.text.Utils');
@@ -35,6 +36,12 @@ shaka.text.UITextDisplayer = class {
   constructor(video, videoContainer, config) {
     goog.asserts.assert(videoContainer, 'videoContainer should be valid.');
 
+    if (!document.fullscreenEnabled) {
+      shaka.log.alwaysWarn('Using UITextDisplayer in a browser without ' +
+          'Fullscreen API support causes subtitles to not be rendered in ' +
+          'fullscreen');
+    }
+
     /** @private {boolean} */
     this.isTextVisible_ = false;
 
@@ -248,6 +255,7 @@ shaka.text.UITextDisplayer = class {
    */
   setTextVisibility(on) {
     this.isTextVisible_ = on;
+    this.updateCaptions_(/* forceUpdate= */ true);
   }
 
   /**

package/lib/text/vtt_text_parser.js

@@ -87,13 +87,7 @@ shaka.text.VttTextParser = class {
     // Only use 'X-TIMESTAMP-MAP' with HLS.  This overrides offset above.
     if (blocks[0].includes('X-TIMESTAMP-MAP') &&
         this.manifestType_ == shaka.media.ManifestParser.HLS) {
-      if (this.sequenceMode_) {
-        // Compute a different, rollover-based offset for sequence mode.
-        offset = this.computeHlsSequenceModeOffset_(blocks[0], time);
-      } else {
-        // Calculate the offset from the segment startTime.
-        offset = time.segmentStart;
-      }
+      offset = this.computeHlsOffset_(blocks[0], time);
     }
 
     // Parse VTT regions.
@@ -130,7 +124,7 @@ shaka.text.VttTextParser = class {
    * @return {number}
    * @private
    */
-  computeHlsSequenceModeOffset_(headerBlock, time) {
+  computeHlsOffset_(headerBlock, time) {
     // https://bit.ly/2K92l7y
     // The 'X-TIMESTAMP-MAP' header is used in HLS to align text with
     // the rest of the media.

package/lib/util/abortable_operation.js

@@ -39,8 +39,8 @@ shaka.util.AbortableOperation = class {
     /** @private {function():!Promise} */
     this.onAbort_ = onAbort;
 
-    /** @private {boolean} */
-    this.aborted_ = false;
+    /** @private {?Promise} */
+    this.abortPromise_ = null;
   }
 
   /**
@@ -110,8 +110,10 @@ shaka.util.AbortableOperation = class {
    * @export
    */
   abort() {
-    this.aborted_ = true;
-    return this.onAbort_();
+    if (!this.abortPromise_) {
+      this.abortPromise_ = this.onAbort_();
+    }
+    return this.abortPromise_;
   }
 
   /**
@@ -166,7 +168,7 @@ shaka.util.AbortableOperation = class {
 
     const makeCallback = (isSuccess) => {
       return (value) => {
-        if (this.aborted_ && isSuccess) {
+        if (this.abortPromise_ && isSuccess) {
           // If "this" is not abortable(), or if abort() is called after "this"
           // is complete but before the next stage in the chain begins, we
           // should stop right away.

package/lib/util/mp4_generator.js

@@ -765,7 +765,7 @@ shaka.util.Mp4Generator = class {
       0x00, 0x00, 0x00, 0x01, // default_sample_description_index
       0x00, 0x00, 0x00, 0x00, // default_sample_duration
       0x00, 0x00, 0x00, 0x00, // default_sample_size
-      0x00, 0x01, 0x00, 0x01, // default_sample_flags
+      0x00, 0x00, 0x00, 0x00, // default_sample_flags
     ]);
     return Mp4Generator.box('trex', bytes);
   }

package/lib/util/platform.js

@@ -205,6 +205,17 @@ shaka.util.Platform = class {
         shaka.util.Platform.chromeVersion() === 68;
   }
 
+  /**
+   * Check if the current platform is a WebOS 6.
+   *
+   * @return {boolean}
+   */
+  static isWebOS6() {
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 79;
+  }
+
   /**
    * Check if the current platform is a Google Chromecast.
    *
@@ -300,7 +311,7 @@ shaka.util.Platform = class {
         !shaka.util.Platform.isOrange() &&
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV() &&
-        !shaka.util.Platform.isWPE() &&
+        !shaka.util.Platform.isComcastX1() &&
         !shaka.util.Platform.isZenterio() &&
         !shaka.util.Platform.isSkyQ();
   }
@@ -368,7 +379,7 @@ shaka.util.Platform = class {
    * Check if the current platform is Comcast X1.
    * @return {boolean}
    */
-  static isWPE() {
+  static isComcastX1() {
     return shaka.util.Platform.userAgentContains_('WPE');
   }
 
@@ -503,7 +514,7 @@ shaka.util.Platform = class {
     if (!navigator.platform) {
       return false;
     }
-    return navigator.platform.toLowerCase().includes('windows');
+    return navigator.platform.toLowerCase().includes('win32');
   }
 
   /**
@@ -536,7 +547,7 @@ shaka.util.Platform = class {
         Platform.isPS5() || Platform.isAmazonFireTV() ||
         Platform.isEOS() || Platform.isAPL() ||
         Platform.isVirginMedia() || Platform.isOrange() ||
-        Platform.isWPE() || Platform.isChromecast() ||
+        Platform.isComcastX1() || Platform.isChromecast() ||
         Platform.isHisense() || Platform.isZenterio()) {
       return true;
     }
@@ -627,19 +638,19 @@ shaka.util.Platform = class {
   /**
    * Returns if codec switching SMOOTH is known reliable device support.
    *
-   * Some devices are known not to support `MediaSource.changeType`
+   * Some devices are known not to support <code>SourceBuffer.changeType</code>
    * well. These devices should use the reload strategy. If a device
-   * reports that it supports `changeType` but support it unreliably
-   * it should be added to this list.
+   * reports that it supports <code<changeType</code> but supports it unreliably
+   * it should be disallowed in this method.
    *
    * @return {boolean}
    */
   static supportsSmoothCodecSwitching() {
     const Platform = shaka.util.Platform;
-    if (Platform.isTizen2() || Platform.isTizen3() || Platform.isTizen4() ||
-        Platform.isTizen5() || Platform.isTizen6() || Platform.isWebOS3() ||
-        Platform.isWebOS4() || Platform.isWebOS5() || Platform.isPS4() ||
-        Platform.isPS5()) {
+    // All Tizen versions (up to Tizen 8) do not support SMOOTH so far.
+    // webOS seems to support SMOOTH from webOS 22.
+    if (Platform.isTizen() || Platform.isPS4() || Platform.isPS5() ||
+        Platform.isWebOS6()) {
       return false;
     }
     // Older chromecasts without GoogleTV seem to not support SMOOTH properly.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.9.30",
+  "version": "4.9.32",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -26,7 +26,7 @@
     "core-js": "^3.21.1",
     "dialog-polyfill": "^0.5.6",
     "es6-promise-polyfill": "^1.2.0",
-    "eslint": "^8.9.0",
+    "eslint": "^8.57.1",
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-shaka-rules": "file:./build/eslint-plugin-shaka-rules",
     "esprima": "^4.0.1",

package/ui/controls.js

@@ -1301,7 +1301,7 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
     }
 
     // Use the cursor specified in the CSS file.
-    this.videoContainer_.style.cursor = '';
+    this.videoContainer_.classList.remove('no-cursor');
 
     this.recentMouseMovement_ = true;
 
@@ -1354,7 +1354,7 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
    */
   onMouseStill_() {
     // Hide the cursor.
-    this.videoContainer_.style.cursor = 'none';
+    this.videoContainer_.classList.add('no-cursor');
     this.recentMouseMovement_ = false;
     this.computeOpacity();
   }

package/ui/less/containers.less

@@ -394,3 +394,11 @@
   /* keep the rewind button to the left */
   .absolute-position();
 }
+
+.shaka-video-container.no-cursor {
+  cursor: none !important;
+
+  * {
+    cursor: none !important;
+  }
+}

package/ui/remote_button.js

@@ -33,6 +33,9 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
   constructor(parent, controls) {
     super(parent, controls);
 
+    /** @private {boolean} */
+    this.isAirPlay_ = shaka.util.Platform.isSafari();
+
     /** @private {!HTMLButtonElement} */
     this.remoteButton_ = shaka.util.Dom.createButton();
     this.remoteButton_.classList.add('shaka-remote-button');
@@ -42,12 +45,9 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
     /** @private {!HTMLElement} */
     this.remoteIcon_ = shaka.util.Dom.createHTMLElement('i');
     this.remoteIcon_.classList.add('material-icons-round');
-    let icon = shaka.ui.Enums.MaterialDesignIcons.CAST;
-    const safariVersion = shaka.util.Platform.safariVersion();
-    if (safariVersion && safariVersion >= 13) {
-      icon = shaka.ui.Enums.MaterialDesignIcons.AIRPLAY;
-    }
-    this.remoteIcon_.textContent = icon;
+    this.remoteIcon_.textContent = this.isAirPlay_ ?
+        shaka.ui.Enums.MaterialDesignIcons.AIRPLAY :
+        shaka.ui.Enums.MaterialDesignIcons.CAST;
     this.remoteButton_.appendChild(this.remoteIcon_);
 
     const label = shaka.util.Dom.createHTMLElement('label');
@@ -95,21 +95,25 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
 
       this.eventManager.listen(this.video.remote, 'connect', () => {
         this.updateRemoteState_();
+        this.updateIcon_();
       });
 
       this.eventManager.listen(this.video.remote, 'connecting', () => {
         this.updateRemoteState_();
+        this.updateIcon_();
       });
 
       this.eventManager.listen(this.video.remote, 'disconnect', () => {
         this.updateRemoteState_();
+        this.updateIcon_();
       });
 
       this.eventManager.listen(this.player, 'loaded', () => {
         this.updateRemoteState_();
       });
 
-      this.updateRemoteState_();
+      this.updateRemoteState_(/* force= */ true);
+      this.updateIcon_();
     }
   }
 
@@ -125,9 +129,10 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
   }
 
   /**
+   * @param {boolean=} force
    * @private
    */
-  async updateRemoteState_() {
+  async updateRemoteState_(force = false) {
     if (this.controls.getCastProxy().canCast() &&
         this.controls.isCastAllowed()) {
       shaka.ui.Utils.setDisplay(this.remoteButton_, false);
@@ -135,14 +140,20 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
         this.video.remote.cancelWatchAvailability(this.callbackId_);
         this.callbackId_ = -1;
       }
-    } else if (this.video.remote.state == 'disconnected') {
+    } else if (this.video.remote.state == 'disconnected' || force) {
       const handleAvailabilityChange = (availability) => {
         if (this.player) {
           const disableRemote = this.video.disableRemotePlayback;
-          const loadMode = this.player.getLoadMode();
-          const srcMode = loadMode == shaka.Player.LoadMode.SRC_EQUALS;
+          let canCast = true;
+          if (shaka.util.Platform.isSafari()) {
+            const loadMode = this.player.getLoadMode();
+            const mseMode = loadMode == shaka.Player.LoadMode.MEDIA_SOURCE;
+            if (mseMode && this.player.getManifestType() != 'HLS') {
+              canCast = false;
+            }
+          }
           shaka.ui.Utils.setDisplay(
-              this.remoteButton_, srcMode && availability && !disableRemote);
+              this.remoteButton_, canCast && availability && !disableRemote);
         } else {
           shaka.ui.Utils.setDisplay(this.remoteButton_, false);
         }
@@ -175,14 +186,28 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
    */
   updateLocalizedStrings_() {
     const LocIds = shaka.ui.Locales.Ids;
-    let text = this.localization.resolve(LocIds.CAST);
-    const safariVersion = shaka.util.Platform.safariVersion();
-    if (safariVersion && safariVersion >= 13) {
-      text = this.localization.resolve(LocIds.AIRPLAY);
-    }
+    const text = this.isAirPlay_ ?
+        this.localization.resolve(LocIds.AIRPLAY) :
+        this.localization.resolve(LocIds.CAST);
     this.remoteButton_.ariaLabel = text;
     this.remoteNameSpan_.textContent = text;
   }
+
+  /**
+   * @private
+   */
+  updateIcon_() {
+    if (this.isAirPlay_) {
+      return;
+    }
+    if (this.video.remote.state == 'disconnected') {
+      this.remoteIcon_.textContent =
+          shaka.ui.Enums.MaterialDesignIcons.CAST;
+    } else {
+      this.remoteIcon_.textContent =
+          shaka.ui.Enums.MaterialDesignIcons.EXIT_CAST;
+    }
+  }
 };
 
 

package/ui/statistics_button.js

@@ -232,8 +232,6 @@ shaka.ui.StatisticsButton = class extends shaka.ui.Element {
         const element = this.generateComponent_(name);
         this.container_.appendChild(element);
         this.statisticsList_.push(name);
-        shaka.ui.Utils.setDisplay(element.parentElement,
-            !isNaN(this.currentStats_[name]));
       } else {
         shaka.log.alwaysWarn('Unrecognized statistic element:', name);
       }