shaka-player 4.3.7 → 4.3.9

package/lib/media/gap_jumping_controller.js

@@ -58,6 +58,9 @@ shaka.media.GapJumpingController = class {
     /** @private {number} */
     this.prevReadyState_ = video.readyState;
 
+    /** @private {number} */
+    this.startTime_ = 0;
+
     /** @private {number} */
     this.gapsJumped_ = 0;
 
@@ -123,6 +126,18 @@ shaka.media.GapJumpingController = class {
     this.onPollGapJump_();
   }
 
+  /**
+   * Called when playback has started and the video element is
+   * listening for seeks.
+   *
+   * @param {number} startTime
+   */
+  onStarted(startTime) {
+    if (this.video_.seeking && !this.seekingEventReceived_) {
+      this.seekingEventReceived_ = true;
+      this.startTime_ = startTime;
+    }
+  }
 
   /** Called when a seek has started. */
   onSeeking() {
@@ -164,8 +179,8 @@ shaka.media.GapJumpingController = class {
     // while paused on a livestream.  We make an exception for time 0, since we
     // may be _required_ to seek on startup before play can begin, but only if
     // autoplay is enabled.
-    if (this.video_.paused && (this.video_.currentTime != 0 ||
-      (!this.video_.autoplay && this.video_.currentTime == 0))) {
+    if (this.video_.paused && (this.video_.currentTime != this.startTime_ ||
+      (!this.video_.autoplay && this.video_.currentTime == this.startTime_))) {
       return;
     }
 
@@ -228,6 +243,13 @@ shaka.media.GapJumpingController = class {
     }
 
     this.video_.currentTime = jumpTo;
+    // This accounts for the possibility that we jump a gap at the start
+    // position but we jump _into_ another gap. By setting the start
+    // position to the new jumpTo we ensure that the check above will
+    // pass even though the video is still paused.
+    if (currentTime == this.startTime_) {
+      this.startTime_ = jumpTo;
+    }
     this.gapsJumped_++;
     this.onEvent_(
         new shaka.util.FakeEvent(shaka.util.FakeEvent.EventName.GapJumped));

package/lib/media/media_source_engine.js

@@ -369,7 +369,7 @@ shaka.media.MediaSourceEngine = class {
       let mimeType = shaka.util.MimeUtils.getFullType(
           stream.mimeType, stream.codecs);
       if (contentType == ContentType.TEXT) {
-        this.reinitText(mimeType, sequenceMode);
+        this.reinitText(mimeType, sequenceMode, stream.external);
       } else {
         if ((forceTransmux ||
             !shaka.media.Capabilities.isTypeSupported(mimeType)) &&
@@ -425,13 +425,14 @@ shaka.media.MediaSourceEngine = class {
    * Reinitialize the TextEngine for a new text type.
    * @param {string} mimeType
    * @param {boolean} sequenceMode
+   * @param {boolean} external
    */
-  reinitText(mimeType, sequenceMode) {
+  reinitText(mimeType, sequenceMode, external) {
     if (!this.textEngine_) {
       this.textEngine_ = new shaka.text.TextEngine(this.textDisplayer_);
     }
     this.textEngine_.initParser(mimeType, sequenceMode,
-        this.segmentRelativeVttTiming_);
+        external || this.segmentRelativeVttTiming_);
   }
 
   /**
@@ -582,11 +583,13 @@ shaka.media.MediaSourceEngine = class {
    * @param {boolean=} seeked True if we just seeked
    * @param {boolean=} adaptation True if we just automatically switched active
    *   variant(s).
+   * @param {boolean=} isChunkedData True if we add to the buffer from the
+   *   partial read of the segment.
    * @return {!Promise}
    */
   async appendBuffer(
       contentType, data, reference, hasClosedCaptions, seeked = false,
-      adaptation = false) {
+      adaptation = false, isChunkedData = false) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     if (contentType == ContentType.TEXT) {
@@ -649,7 +652,7 @@ shaka.media.MediaSourceEngine = class {
       // the video stream, so textEngine may not have been initialized.
       if (!this.textEngine_) {
         this.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,
-            this.sequenceMode_);
+            this.sequenceMode_, /* external= */ false);
       }
       // This doesn't work for native TS support (ex. Edge/Chromecast),
       // since no transmuxing is needed for native TS.
@@ -669,7 +672,7 @@ shaka.media.MediaSourceEngine = class {
     } else if (hasClosedCaptions && contentType == ContentType.VIDEO) {
       if (!this.textEngine_) {
         this.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,
-            this.sequenceMode_);
+            this.sequenceMode_, /* external= */ false);
       }
       if (!this.captionParser_) {
         this.captionParser_ = this.getCaptionParser(mimeType);
@@ -787,13 +790,13 @@ shaka.media.MediaSourceEngine = class {
     let bufferedBefore = null;
 
     await this.enqueueOperation_(contentType, () => {
-      if (goog.DEBUG && reference) {
+      if (goog.DEBUG && reference && !reference.isPreload() && !isChunkedData) {
         bufferedBefore = this.getBuffered_(contentType);
       }
       this.append_(contentType, data);
     });
 
-    if (goog.DEBUG && reference && !reference.isPreload()) {
+    if (goog.DEBUG && reference && !reference.isPreload() && !isChunkedData) {
       const bufferedAfter = this.getBuffered_(contentType);
       const newBuffered = shaka.media.TimeRangesUtils.computeAddedRange(
           bufferedBefore, bufferedAfter);

package/lib/media/playhead.js

@@ -251,6 +251,7 @@ shaka.media.MediaSourcePlayhead = class {
     this.videoWrapper_ = new shaka.media.VideoWrapper(
         mediaElement,
         () => this.onSeeking_(),
+        (realStartTime) => this.onStarted_(realStartTime),
         this.getStartTime_(startTime));
 
     /** @type {shaka.util.Timer} */
@@ -390,6 +391,16 @@ shaka.media.MediaSourcePlayhead = class {
     }
   }
 
+  /**
+   * Called when the video element has started up and is listening for new seeks
+   *
+   * @param {number} startTime
+   * @private
+   */
+  onStarted_(startTime) {
+    this.gapController_.onStarted(startTime);
+  }
+
   /**
    * Handles when a seek happens on the video.
    *

package/lib/media/region_observer.js

@@ -27,13 +27,24 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
    * destroy the timeline.
    *
    * @param {!shaka.media.RegionTimeline} timeline
+   * @param {boolean} startsPastZero
    */
-  constructor(timeline) {
+  constructor(timeline, startsPastZero) {
     super();
 
     /** @private {shaka.media.RegionTimeline} */
     this.timeline_ = timeline;
 
+    /**
+     * Whether the asset is expected to start at a time beyond 0 seconds.
+     * For example, if the asset is a live stream.
+     * If true, we will not start polling for regions until the playhead has
+     * moved past 0 seconds, to avoid bad behaviors where the current time is
+     * briefly 0 before we have enough data to play.
+     * @private {boolean}
+     */
+    this.startsPastZero_ = startsPastZero;
+
     /**
      * A mapping between a region and where we previously were relative to it.
      * When the value here differs from what we calculate, it means we moved and
@@ -121,6 +132,13 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
   /** @override */
   poll(positionInSeconds, wasSeeking) {
     const RegionObserver = shaka.media.RegionObserver;
+    if (this.startsPastZero_ && positionInSeconds == 0) {
+      // Don't start checking regions until the timeline has begun moving.
+      return;
+    }
+    // Now that we have seen the playhead go past 0, it's okay if it goes
+    // back there (e.g. seeking back to the start).
+    this.startsPastZero_ = false;
 
     for (const region of this.timeline_.regions()) {
       const previousPosition = this.oldPosition_.get(region);

package/lib/media/streaming_engine.js

@@ -244,7 +244,7 @@ shaka.media.StreamingEngine = class {
     const mimeType = shaka.util.MimeUtils.getFullType(
         stream.mimeType, stream.codecs);
     this.playerInterface_.mediaSourceEngine.reinitText(
-        mimeType, this.manifest_.sequenceMode);
+        mimeType, this.manifest_.sequenceMode, stream.external);
 
     const textDisplayer =
         this.playerInterface_.mediaSourceEngine.getTextDisplayer();
@@ -458,7 +458,7 @@ shaka.media.StreamingEngine = class {
       const fullMimeType = shaka.util.MimeUtils.getFullType(
           stream.mimeType, stream.codecs);
       this.playerInterface_.mediaSourceEngine.reinitText(
-          fullMimeType, this.manifest_.sequenceMode);
+          fullMimeType, this.manifest_.sequenceMode, stream.external);
     }
 
     // Releases the segmentIndex of the old stream.
@@ -1319,7 +1319,8 @@ shaka.media.StreamingEngine = class {
             const dataToAppend = remaining.subarray(0, offset);
             remaining = remaining.subarray(offset);
             await this.append_(
-                mediaState, presentationTime, stream, reference, dataToAppend);
+                mediaState, presentationTime, stream, reference, dataToAppend,
+                /* isChunkedData= */ true);
           }
         };
 
@@ -1731,10 +1732,12 @@ shaka.media.StreamingEngine = class {
    * @param {shaka.extern.Stream} stream
    * @param {!shaka.media.SegmentReference} reference
    * @param {BufferSource} segment
+   * @param {boolean=} isChunkedData
    * @return {!Promise}
    * @private
    */
-  async append_(mediaState, presentationTime, stream, reference, segment) {
+  async append_(mediaState, presentationTime, stream, reference, segment,
+      isChunkedData = false) {
     const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
 
     const hasClosedCaptions = stream.closedCaptions &&
@@ -1788,7 +1791,8 @@ shaka.media.StreamingEngine = class {
         reference,
         hasClosedCaptions,
         seeked,
-        adaptation);
+        adaptation,
+        isChunkedData);
     this.destroyer_.ensureNotDestroyed();
     shaka.log.v2(logPrefix, 'appended media segment');
   }
@@ -1852,7 +1856,6 @@ shaka.media.StreamingEngine = class {
     const messageData = box.reader.readBytes(
         box.reader.getLength() - box.reader.getPosition());
 
-
     // See DASH sec. 5.10.3.3.1
     // If a DASH client detects an event message box with a scheme that is not
     // defined in MPD, the client is expected to ignore it.
@@ -1862,22 +1865,8 @@ shaka.media.StreamingEngine = class {
       // A special scheme in DASH used to signal manifest updates.
       if (schemeId == 'urn:mpeg:dash:event:2012') {
         this.playerInterface_.onManifestUpdate();
-      } else if (schemeId == 'https://aomedia.org/emsg/ID3') {
-        // See https://aomediacodec.github.io/id3-emsg/
-        const frames = shaka.util.Id3Utils.getID3Frames(messageData);
-        if (frames.length && reference) {
-          /** @private {shaka.extern.ID3Metadata} */
-          const metadata = {
-            cueTime: reference.startTime,
-            data: messageData,
-            frames: frames,
-            dts: reference.startTime,
-            pts: reference.startTime,
-          };
-          this.playerInterface_.onMetadata(
-              [metadata], /* offset= */ 0, reference.endTime);
-        }
       } else {
+        // All other schemes are dispatched as a general 'emsg' event.
         /** @type {shaka.extern.EmsgInfo} */
         const emsg = {
           startTime: startTime,
@@ -1895,7 +1884,38 @@ shaka.media.StreamingEngine = class {
         const eventName = shaka.util.FakeEvent.EventName.Emsg;
         const data = (new Map()).set('detail', emsg);
         const event = new shaka.util.FakeEvent(eventName, data);
+        // A user can call preventDefault() on a cancelable event.
+        event.cancelable = true;
+
         this.playerInterface_.onEvent(event);
+
+        if (event.defaultPrevented) {
+          // If the caller uses preventDefault() on the 'emsg' event, don't
+          // process any further, and don't generate an ID3 'metadata' event
+          // for the same data.
+          return;
+        }
+
+        // Additionally, ID3 events generate a 'metadata' event.  This is a
+        // pre-parsed version of the metadata blob already dispatched in the
+        // 'emsg' event.
+        if (schemeId == 'https://aomedia.org/emsg/ID3' ||
+            schemeId == 'https://developer.apple.com/streaming/emsg-id3') {
+          // See https://aomediacodec.github.io/id3-emsg/
+          const frames = shaka.util.Id3Utils.getID3Frames(messageData);
+          if (frames.length && reference) {
+            /** @private {shaka.extern.ID3Metadata} */
+            const metadata = {
+              cueTime: reference.startTime,
+              data: messageData,
+              frames: frames,
+              dts: reference.startTime,
+              pts: reference.startTime,
+            };
+            this.playerInterface_.onMetadata(
+                [metadata], /* offset= */ 0, reference.endTime);
+          }
+        }
       }
     }
   }

package/lib/media/video_wrapper.js

@@ -27,15 +27,19 @@ shaka.media.VideoWrapper = class {
   /**
    * @param {!HTMLMediaElement} video
    * @param {function()} onSeek Called when the video seeks.
+   * @param {function(number)} onStarted Called when the video has started.
    * @param {number} startTime The time to start at.
    */
-  constructor(video, onSeek, startTime) {
+  constructor(video, onSeek, onStarted, startTime) {
     /** @private {HTMLMediaElement} */
     this.video_ = video;
 
     /** @private {function()} */
     this.onSeek_ = onSeek;
 
+    /** @private {function(number)} */
+    this.onStarted_ = onStarted;
+
     /** @private {number} */
     this.startTime_ = startTime;
 
@@ -165,6 +169,7 @@ shaka.media.VideoWrapper = class {
     this.started_ = true;
 
     this.eventManager_.listen(this.video_, 'seeking', () => this.onSeek_());
+    this.onStarted_(this.video_.currentTime);
   }
 };
 

package/lib/offline/indexeddb/v1_storage_cell.js

@@ -176,6 +176,7 @@ shaka.offline.indexeddb.V1StorageCell = class
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: undefined,
+      external: false,
     };
   }
 

package/lib/offline/indexeddb/v2_storage_cell.js

@@ -125,6 +125,7 @@ shaka.offline.indexeddb.V2StorageCell = class
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: undefined,
+      external: false,
     };
   }
 

package/lib/offline/manifest_converter.js

@@ -202,6 +202,7 @@ shaka.offline.ManifestConverter = class {
       spatialAudio: streamDB.spatialAudio,
       closedCaptions: streamDB.closedCaptions,
       tilesLayout: streamDB.tilesLayout,
+      external: streamDB.external,
     };
 
     return stream;

package/lib/offline/storage.js

@@ -1325,6 +1325,7 @@ shaka.offline.Storage = class {
       spatialAudio: stream.spatialAudio,
       closedCaptions: stream.closedCaptions,
       tilesLayout: stream.tilesLayout,
+      external: stream.external,
     };
 
     const startTime =

package/lib/player.js

@@ -99,7 +99,9 @@ goog.requireType('shaka.routing.Payload');
 
 /**
  * @event shaka.Player.EmsgEvent
- * @description Fired when a non-typical emsg is found in a segment.
+ * @description Fired when an emsg box is found in a segment.
+ *   If the application calls preventDefault() on this event, further parsing
+ *   will not happen, and no 'metadata' event will be raised for ID3 payloads.
  * @property {string} type
  *   'emsg'
  * @property {shaka.extern.EmsgInfo} detail
@@ -2190,8 +2192,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       await Promise.all(createSegmentIndexPromises);
     }
 
+    shaka.Player.applyPlayRange_(this.manifest_.presentationTimeline,
+        this.config_.playRangeStart,
+        this.config_.playRangeEnd);
+
     this.playhead_ = this.createPlayhead(has.startTime);
-    this.playheadObservers_ = this.createPlayheadObserversForMSE_();
+    this.playheadObservers_ =
+        this.createPlayheadObserversForMSE_(has.startTimeOfLoad);
 
     // We need to start the buffer management code near the end because it will
     // set the initial buffering state and that depends on other components
@@ -2217,10 +2224,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
         this.playhead_.setStartTime(adjustedTime);
       }
-
-      // Since the first streams just became active, send an adaptation event.
-      this.onAdaptation_(null,
-          shaka.util.StreamUtils.variantToTrack(initialVariant));
     }
 
     this.playhead_.ready();
@@ -2387,6 +2390,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         audioSamplingRate: null,
         spatialAudio: false,
         closedCaptions: null,
+        external: false,
       },
       bandwidth: 100,
       allowedByApplication: true,
@@ -2918,17 +2922,21 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * Create the observers for MSE playback. These observers are responsible for
    * notifying the app and player of specific events during MSE playback.
    *
+   * @param {number} startTimeOfLoad
    * @return {!shaka.media.PlayheadObserverManager}
    * @private
    */
-  createPlayheadObserversForMSE_() {
+  createPlayheadObserversForMSE_(startTimeOfLoad) {
     goog.asserts.assert(this.manifest_, 'Must have manifest');
     goog.asserts.assert(this.regionTimeline_, 'Must have region timeline');
     goog.asserts.assert(this.video_, 'Must have video element');
 
+    const startsPastZero = this.isLive() || startTimeOfLoad > 0;
+
     // Create the region observer. This will allow us to notify the app when we
     // move in and out of timeline regions.
-    const regionObserver = new shaka.media.RegionObserver(this.regionTimeline_);
+    const regionObserver = new shaka.media.RegionObserver(
+        this.regionTimeline_, startsPastZero);
 
     regionObserver.addEventListener('enter', (event) => {
       /** @type {shaka.extern.TimelineRegionInfo} */
@@ -4816,6 +4824,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       audioSamplingRate: null,
       spatialAudio: false,
       closedCaptions: null,
+      external: true,
     };
 
     const fullMimeType = shaka.util.MimeUtils.getFullType(
@@ -4967,6 +4976,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: '1x1',
+      external: true,
     };
 
     this.manifest_.imageStreams.push(stream);
@@ -5386,6 +5396,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
               audioSamplingRate: null,
               spatialAudio: false,
               closedCaptions: null,
+              external: false,
             };
             manifest.textStreams.push(textStream);
             closedCaptionsSet.add(id);
@@ -7009,7 +7020,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.3.7-uncompiled';
+shaka.Player.version = 'v4.3.9-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/abort_controller.js

@@ -86,6 +86,13 @@ class extends shaka.util.FakeEventTarget {
     return this.reason_;
   }
 
+  /** @return {void} */
+  throwIfAborted() {
+    if (this.aborted_) {
+      throw this.reason_;
+    }
+  }
+
   /**
    * @param {*} reason
    * @private

package/lib/polyfill/orientation.js

@@ -6,6 +6,7 @@
 
 goog.provide('shaka.polyfill.Orientation');
 
+goog.require('shaka.log');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.FakeEventTarget');
 goog.require('shaka.polyfill');
@@ -23,21 +24,47 @@ shaka.polyfill.Orientation = class {
    * @export
    */
   static install() {
-    if (screen.orientation) {
+    if (screen.orientation && screen.orientation.unlock) {
       // Not needed.
+      shaka.log.info('Using native screen.orientation');
       return;
     }
 
-    // There is no way to check to see if the 'orientationchange' event exists
-    // on window, which could theoretically lead to this making a
-    // screen.orientation object that doesn't actually work.
-    // However, it looks like all platforms that support the deprecated
-    // window.orientation feature also support that event.
-    if (window.orientation != undefined) {
+    if (screen.orientation != undefined) {
+      // There are some platforms where screen.orientation is defined but
+      // incomplete (e.g. Safari).
+      // Install a very simple polyfill in that case.
+      shaka.polyfill.Orientation.installBasedOnScreenMethods_();
+    } else if (window.orientation != undefined) {
+      // There is no way to check to see if the 'orientationchange' event exists
+      // on window, which could theoretically lead to this making a
+      // screen.orientation object that doesn't actually work.
+      // However, it looks like all platforms that support the deprecated
+      // window.orientation feature also support that event.
       shaka.polyfill.Orientation.installBasedOnWindowMethods_();
     }
   }
 
+  /**
+   * Modifies screen.orientation to add no-ops for missing methods.
+   * Meant for cases where screen.orientation is defined, but has missing
+   * methods that cannot be properly polyfilled.
+   * @private
+   */
+  static installBasedOnScreenMethods_() {
+    if (screen.orientation.lock === undefined) {
+      screen.orientation.lock = (orientation) => {
+        shaka.log.info('screen.orientation.lock is a no-op');
+        return Promise.resolve();
+      };
+    }
+    if (screen.orientation.unlock === undefined) {
+      screen.orientation.unlock = () => {
+        shaka.log.info('screen.orientation.unlock is a no-op');
+      };
+    }
+  }
+
   /**
    * Makes a polyfill for orientation, based on window methods.
    * Note that some of the features this is based on are deprecated, so this

package/lib/text/vtt_text_parser.js

@@ -674,6 +674,7 @@ shaka.text.VttTextParser = class {
     cue.fontWeight = refCue.fontWeight;
     cue.fontStyle = refCue.fontStyle;
     cue.opacity = refCue.opacity;
+    cue.textShadow = refCue.textShadow;
     cue.wrapLine = refCue.wrapLine;
   }
 
@@ -785,7 +786,8 @@ shaka.text.VttTextParser = class {
     } else if ((results = /^size:([\d.]+)%$/.exec(word))) {
       cue.size = Number(results[1]);
     } else if ((results =
-        /^position:([\d.]+)%(?:,(line-left|line-right|center|start|end))?$/
+        // eslint-disable-next-line max-len
+        /^position:([\d.]+)%(?:,(line-left|line-right|middle|center|start|end))?$/
             .exec(word))) {
       cue.position = Number(results[1]);
       if (results[2]) {

package/lib/util/manifest_parser_utils.js

@@ -168,7 +168,7 @@ shaka.util.ManifestParserUtils.VIDEO_CODEC_REGEXPS_ = [
   /^hvc/,
   /^vp0?[89]/,
   /^av01/,
-  /^dvhe/,
+  /^dvh/,
 ];
 
 
@@ -180,8 +180,10 @@ shaka.util.ManifestParserUtils.VIDEO_CODEC_REGEXPS_ = [
  */
 shaka.util.ManifestParserUtils.AUDIO_CODEC_REGEXPS_ = [
   /^vorbis$/,
-  /^opus$/,
-  /^flac$/,
+  /^Opus$/, // correct codec string according to RFC 6381 section 3.3
+  /^opus$/, // some manifests wrongfully use this
+  /^fLaC$/, // correct codec string according to RFC 6381 section 3.3
+  /^flac$/, // some manifests wrongfully use this
   /^mp4a/,
   /^[ae]c-3$/,
   /^ac-4$/,

package/lib/util/periods.js

@@ -1491,6 +1491,7 @@ shaka.util.PeriodCombiner = class {
       audioSamplingRate: null,
       spatialAudio: false,
       closedCaptions: null,
+      external: false,
     };
   }
 
@@ -1527,6 +1528,7 @@ shaka.util.PeriodCombiner = class {
       audioSamplingRate: null,
       spatialAudio: false,
       closedCaptions: null,
+      external: false,
     };
   }
 

package/lib/util/platform.js

@@ -346,6 +346,20 @@ shaka.util.Platform = class {
     return shaka.util.Platform.isApple() && navigator.maxTouchPoints > 1;
   }
 
+  /**
+   * Return true if the platform is a Mac, regardless of the browser.
+   *
+   * @return {boolean}
+   */
+  static isMac() {
+    // Try the newer standard first.
+    if (navigator.userAgentData && navigator.userAgentData.platform) {
+      return navigator.userAgentData.platform.toLowerCase() == 'macos';
+    }
+    // Fall back to the old API, with less strict matching.
+    return navigator.platform.toLowerCase().includes('mac');
+  }
+
   /**
    * Check if the user agent contains a key. This is the best way we know of
    * right now to detect platforms. If there is a better way, please send a