shaka-player 3.3.4 → 4.0.1

package/docs/tutorials/config.md

@@ -73,10 +73,8 @@ player.getConfiguration();
        failureCallback: Function
        ignoreTextStreamFailures: false
        alwaysStreamText: false
-       jumpLargeGaps: false
        rebufferingGoal: 2
        retryParameters: Object
-       smallGapLimit: 0.5
        startAtSegmentBoundary: false
        safeSeekOffset: 5
      textDisplayFactory: Function

package/docs/tutorials/drm-config.md

@@ -184,6 +184,11 @@ Microsoft Documentation: https://docs.microsoft.com/en-us/playready/overview/sec
 
 NB: Audio Hardware DRM is not supported (PlayReady limitation)
 
+##### FairPlay
+
+Based on [Apple's Documentation](https://developer.apple.com/streaming/fps/),
+you should provide an empty string as robustness
+
 ##### Other key-systems
 
 Values for other key systems are not known to us at this time.

package/docs/tutorials/fairplay.md

@@ -1,40 +1,25 @@
 # FairPlay Support
 
-When using native `src=` playback, we support using FairPlay on Safari.
+We support FairPlay with EME on compatible environments or native `src=`.
 Adding FairPlay support involves a bit more work than other key systems.
 
-
 ## Server certificate
 
-All FairPlay content requires setting a server certificate.  This is set in the
-Player configuration:
+All FairPlay content requires setting a server certificate. You can either
+provide it directly or set a serverCertificateUri for Shaka to fetch it for
+you.
 
 ```js
 const req = await fetch('https://example.com/cert.der');
 const cert = await req.arrayBuffer();
 
-player.configure('drm.advanced.com\\.apple\\.fps\\.1_0.serverCertificate',
+player.configure('drm.advanced.com\\.apple\\.fps\\.serverCertificate',
                  new Uint8Array(cert));
 ```
 
-
-## Content ID
-
-Some FairPlay content use custom signaling for the content ID.  The content ID
-is used by the browser to generate the license request.  If you don't use the
-default content ID derivation, you need to specify a custom init data transform:
-
 ```js
-player.configure('drm.initDataTransform', (initData, initDataType) => {
-  if (initDataType != 'skd')
-    return initData;
-
-  // 'initData' is a buffer containing an 'skd://' URL as a UTF-8 string.
-  const skdUri = shaka.util.StringUtils.fromBytesAutoDetect(initData);
-  const contentId = getMyContentId(skdUri);
-  const cert = player.drmInfo().serverCertificate;
-  return shaka.util.FairPlayUtils.initDataTransform(initData, contentId, cert);
-});
+player.configure('drm.advanced.com\\.apple\\.fps\\.serverCertificateUri',
+                 'https://example.com/cert.der');
 ```
 
 ## License wrapping

package/docs/tutorials/faq.md

@@ -43,17 +43,6 @@ headers in the response.  Additionally, with some manifests, we will send a
 This can also happen with mixed-content restrictions.  If the site is using
 `https:`, then your manifest and segments must also.
 
-*Sending `Range` header at the start of HLS playback can be disabled using this config:*
-```
-player.configure({
-    manifest: {
-        hls: {
-            useFullSegmentsForStartTime: true,
-        },
-    },
-})
-```
-
 <hr>
 
 **Q:** I am getting `REQUESTED_KEY_SYSTEM_CONFIG_UNAVAILABLE` or error code

package/docs/tutorials/index.json

@@ -21,12 +21,6 @@
   { "blob-url": { "title": "Blob URL" } },
   { "selenium-grid-config": { "title": "Selenium Grid Config" } },
   { "faq": { "title": "Frequently Asked Questions" } },
-  { "upgrade": {
-      "title": "Upgrade Guide",
-      "children": {
-        "upgrade-v2-5": { "title": "Upgrade Guide, v2.5 => v3" },
-        "upgrade-v3": { "title": "Upgrade Guide, v3" },
-        "upgrade-manifest": { "title": "Shaka Player Manifest Upgrade Guide" }
-      }
-  } }
+  { "upgrade": { "title": "Upgrade Guide" } },
+  { "upgrade-manifest": { "title": "ManifestParser Upgrade Guide" } }
 ]

package/docs/tutorials/plugins.md

@@ -69,9 +69,7 @@ __Polyfills__
       {@linksource shaka.polyfill.Fullscreen}
     - prefixed video QoE metrics:
       {@linksource shaka.polyfill.VideoPlaybackQuality}
-    - prefixed EME implementations for IE 11 and very old versions of embedded
-      Chrome/Chromium:
-      - {@linksource shaka.polyfill.PatchedMediaKeysMs}
+    - prefixed EME implementations:
       - {@linksource shaka.polyfill.PatchedMediaKeysWebkit}
       - {@linksource shaka.polyfill.PatchedMediaKeysNop}
     - variants of VTTCue and TextTrackCue constructors:

package/docs/tutorials/upgrade.md

@@ -1,17 +1,91 @@
 # Shaka Player Upgrade Guide
 
-If you are upgrading from **v1 - v2.2**, please see
-{@link https://v2-4-7-dot-shaka-player-demo.appspot.com/docs/api/tutorial-upgrade.html
-the upgrade guides from the v2.4 releases}, then return to this guide.
+If you are upgrading from **v1 or v2**, these releases are no longer supported,
+and upgrade guides are no longer maintained.  You can use these old upgrades
+guides to upgrade in stages:
 
-If you are upgrading from **v2.3 - v2.4**, please see
-{@link https://v2-5-10-dot-shaka-player-demo.appspot.com/docs/api/tutorial-upgrade.html
-the upgrade guides from the v2.5 releases}, then return to this guide.
+ - {@link https://v2-4-7-dot-shaka-player-demo.appspot.com/docs/api/tutorial-upgrade.html Upgrade to v2.4}
+ - {@link https://v2-5-23-dot-shaka-player-demo.appspot.com/docs/api/tutorial-upgrade-v2-4.html Upgrade v2.4 => v2.5}
+ - {@link https://v3-0-15-dot-shaka-player-demo.appspot.com/docs/api/tutorial-upgrade-v2-5.html Upgrade v2.5 => v3.0}
 
-From these older release branches, you will have to use our upgrade guides in
-phases.  This is necessary to keep our guides maintainable.  Thanks for your
-understanding!
+Since v3.0, Shaka Player has been following semantic versioning.  (The
+IE11 deprecation announced before v3.0 happened in v3.1, which technically
+breaks semantic versioning guarantees.  It is the only intentional exception.)
 
-If you are upgrading from **v2.5**, please see {@tutorial upgrade-v2-5}.
+Upgrading from any v3 release to a newer v3 release should be backward
+compatible.  The same is true of all major version numbers (v4 => v4, etc).
 
-If you are upgrading from another **v3** release, please see {@tutorial upgrade-v3}.
+Here is a summary of breaking changes that might require upgrades to your
+application:
+
+
+## v3.1
+
+  - New dependencies:
+    - TextDecoder/TextEncoder platform support or polyfill required (affects
+      Xbox One, but not evergreen browsers); we suggest the polyfill
+      [https://github.com/anonyco/FastestSmallestTextEncoderDecoder](fastestsmallesttextencoderdecoder/EncoderDecoderTogether.min.js)
+
+  - Support removed:
+    - IE11 support removed
+
+
+## v4.0
+
+  - Support removed:
+    - Older TVs and set-top boxes that do not support MediaSource sequence mode
+      can no longer play HLS content (since we now use sequence mode for that)
+    - Support for iOS 12 and Safari 12 has been removed
+
+  - Configuration changes:
+    - `manifest.dash.defaultPresentationDelay` has been replaced by
+      `manifest.defaultPresentationDelay` (deprecated in v3.0.0)
+    - Configuration of factories should be plain factory functions, not
+      constructors; these will not be invoked with `new` (deprecated in v3.1.0)
+    - `drm.initDataTransform` now defaults to a no-op
+    - `streaming.smallGapLimit` and `streaming.jumpLargeGaps` have been removed;
+      all gaps will now be jumped
+    - `manifest.hls.useFullSegmentsForStartTime` has been removed; this setting
+      is no longer necessary, as we no longer fetch segments for start times in
+      the HLS parser
+
+  - Player API changes:
+    - `shaka.Player.prototype.addTextTrack()` has been replaced by
+      `addTextTrackAsync()`, which returns a `Promise` (deprecated in v3.1.0)
+
+  - UI API changes:
+    - `shaka.ui.TrackLabelFormat` has been renamed to
+      `shaka.ui.Overlay.TrackLabelFormat` (deprecated in v3.1.0)
+    - `shaka.ui.FailReasonCode` has been renamed to
+      `shaka.ui.Overlay.FailReasonCode` (deprecated in v3.1.0)
+
+  - Offline API changes:
+    - `shaka.offline.Storage.prototype.store()` returns `AbortableOperation`
+      instead of `Promise`; callers should change `.then()` to
+      `.promise.then()` and `await rv` to `await rv.promise` (deprecated in
+      v3.0.0)
+    - `shaka.offline.Storage.prototype.getStoreInProgress()` has been removed;
+      concurrent operations are supported since v3, so callers don't need to
+      check this (deprecated in v3.0.0)
+
+  - Utility API changes:
+    - `shaka.util.Uint8ArrayUtils.equal` has been replaced by
+      `shaka.util.BufferUtils.equal`, which can handle multiple types of
+      buffers (deprecated in v3.0.0)
+
+  - Manifest API changes:
+    - `shaka.media.SegmentIndex.prototype.destroy()` has been replaced by
+      `release()`, which is synchronous (deprecated in v3.0.0)
+    - `shaka.media.SegmentIterator.prototype.seek()`, which mutates the
+      iterator, has been replaced by
+      `shaka.media.SegmentIndex.getIteratorForTime()` (deprecated in v3.1.0)
+    - `shaka.media.SegmentIndex.prototype.merge()` has become private; use
+      `mergeAndEvict()` instead (deprecated in v3.2.0)
+
+  - Plugin changes:
+    - `AbrManager` plugins must implement the `playbackRateChanged()` method
+      (deprecated in v3.0.0)
+    - `shaka.extern.Cue.prototype.spacer` has been replaced by the more
+      clearly-named `lineBreak` (deprecated in v3.1.0)
+    - `IUIElement` plugins must have a `release()` method (not `destroy()`)
+      (deprecated in v3.0.0)

package/externs/polyfill.js

@@ -0,0 +1,15 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Externs for Shaka polyfills
+ *
+ * @externs
+ */
+
+
+/** @type {boolean} */
+window.shakaMediaKeysPolyfill;

package/externs/shaka/manifest.js

@@ -17,7 +17,8 @@
  *   textStreams: !Array.<shaka.extern.Stream>,
  *   imageStreams: !Array.<shaka.extern.Stream>,
  *   offlineSessionIds: !Array.<string>,
- *   minBufferTime: number
+ *   minBufferTime: number,
+ *   sequenceMode: boolean
  * }}
  *
  * @description
@@ -72,6 +73,9 @@
  *   The minimum number of seconds of content that must be buffered before
  *   playback can begin.  Can be overridden by a higher value from the Player
  *   configuration.
+ * @property {boolean} sequenceMode
+ *   If true, we will append the media segments using sequence mode; that is to
+ *   say, ignoring any timestamps inside the media files.
  *
  * @exportDoc
  */

package/externs/shaka/net.js

@@ -60,6 +60,9 @@ shaka.extern.RetryParameters;
  *   retryParameters: !shaka.extern.RetryParameters,
  *   licenseRequestType: ?string,
  *   sessionId: ?string,
+ *   drmInfo: ?shaka.extern.DrmInfo,
+ *   initData: ?Uint8Array,
+ *   initDataType: ?string,
  *   streamDataCallback: ?function(BufferSource):!Promise
  * }}
  *
@@ -90,6 +93,15 @@ shaka.extern.RetryParameters;
  * @property {?string} sessionId
  *   If this is a LICENSE request, this field contains the session ID of the
  *   EME session that made the request.
+ * @property {?shaka.extern.DrmInfo} drmInfo
+ *   If this is a LICENSE request, this field contains the DRM info used to
+ *   initialize EME.
+ * @property {?Uint8Array} initData
+ *   If this is a LICENSE request, this field contains the initData info used
+ *   to initialize EME.
+ * @property {?string} initDataType
+ *   If this is a LICENSE request, this field contains the initDataType info
+ *   used to initialize EME.
  * @property {?function(BufferSource):!Promise} streamDataCallback
  *   A callback function to handle the chunked data of the ReadableStream.
  * @exportDoc

package/externs/shaka/offline.js

@@ -73,7 +73,8 @@ shaka.extern.StoredContent;
  *   sessionIds: !Array.<string>,
  *   drmInfo: ?shaka.extern.DrmInfo,
  *   appMetadata: Object,
- *   isIncomplete: (boolean|undefined)
+ *   isIncomplete: (boolean|undefined),
+ *   sequenceMode: (boolean|undefined)
  * }}
  *
  * @property {number} creationTime
@@ -98,6 +99,9 @@ shaka.extern.StoredContent;
  *   A metadata object passed from the application.
  * @property {(boolean|undefined)} isIncomplete
  *   If true, the content is still downloading.
+ * @property {(boolean|undefined)} sequenceMode
+ *   If true, we will append the media segments using sequence mode; that is to
+ *   say, ignoring any timestamps inside the media files.
  */
 shaka.extern.ManifestDB;
 

package/externs/shaka/player.js

@@ -208,6 +208,8 @@ shaka.extern.BufferedInfo;
  *   pixelAspectRatio: ?string,
  *   hdr: ?string,
  *   mimeType: ?string,
+ *   audioMimeType: ?string,
+ *   videoMimeType: ?string,
  *   codecs: ?string,
  *   audioCodec: ?string,
  *   videoCodec: ?string,
@@ -267,6 +269,10 @@ shaka.extern.BufferedInfo;
  *   The video HDR provided in the manifest, if present.
  * @property {?string} mimeType
  *   The MIME type of the content provided in the manifest.
+ * @property {?string} audioMimeType
+ *   The audio MIME type of the content provided in the manifest.
+ * @property {?string} videoMimeType
+ *   The video MIME type of the content provided in the manifest.
  * @property {?string} codecs
  *   The audio/video codecs string provided in the manifest, if present.
  * @property {?string} audioCodec
@@ -740,9 +746,10 @@ shaka.extern.DashManifestConfiguration;
  * @typedef {{
  *   ignoreTextStreamFailures: boolean,
  *   ignoreImageStreamFailures: boolean,
- *   useFullSegmentsForStartTime: boolean,
  *   defaultAudioCodec: string,
- *   defaultVideoCodec: string
+ *   defaultVideoCodec: string,
+ *   ignoreManifestProgramDateTime: boolean,
+ *   mediaPlaylistFullMimeType: string
  * }}
  *
  * @property {boolean} ignoreTextStreamFailures
@@ -751,15 +758,26 @@ shaka.extern.DashManifestConfiguration;
  * @property {boolean} ignoreImageStreamFailures
  *   If <code>true</code>, ignore any errors in a image stream and filter out
  *   those streams.
- * @property {boolean} useFullSegmentsForStartTime
- *   If <code>true</code>, force HlsParser to use a full segment request for
- *   determining start time in case the server does not support partial requests
  * @property {string} defaultAudioCodec
  *   The default audio codec if it is not specified in the HLS playlist.
  *   <i>Defaults to <code>'mp4a.40.2'</code>.</i>
  * @property {string} defaultVideoCodec
  *   The default video codec if it is not specified in the HLS playlist.
  *   <i>Defaults to <code>'avc1.42E01E'</code>.</i>
+ * @property {boolean} ignoreManifestProgramDateTime
+ *   If <code>true</code>, the HLS parser will ignore the
+ *   <code>EXT-X-PROGRAM-DATE-TIME</code> tags in the manifest.
+ *   Meant for tags that are incorrect or malformed.
+ *   <i>Defaults to <code>false</code>.</i>
+ * @property {string} mediaPlaylistFullMimeType
+ *   A string containing a full mime type, including both the basic mime type
+ *   and also the codecs. Used when the HLS parser parses a media playlist
+ *   directly, required since all of the mime type and codecs information is
+ *   contained within the master playlist.
+ *   You can use the <code>shaka.util.MimeUtils.getFullType()</code> utility to
+ *   format this value.
+ *   <i>Defaults to
+ *   <code>'video/mp2t; codecs="avc1.42E01E, mp4a.40.2"'</code>.</i>
  * @exportDoc
  */
 shaka.extern.HlsManifestConfiguration;
@@ -774,6 +792,7 @@ shaka.extern.HlsManifestConfiguration;
  *   disableText: boolean,
  *   disableThumbnails: boolean,
  *   defaultPresentationDelay: number,
+ *   segmentRelativeVttTiming: boolean,
  *   dash: shaka.extern.DashManifestConfiguration,
  *   hls: shaka.extern.HlsManifestConfiguration
  * }}
@@ -805,6 +824,10 @@ shaka.extern.HlsManifestConfiguration;
  *   configured or set as 0.
  *   For HLS, the default value is 3 segments duration if not configured or
  *   set as 0.
+ * @property {boolean} segmentRelativeVttTiming
+ *   Option to calculate VTT text timings relative to the segment start
+ *   instead of relative to the period start (which is the default).
+ *   Defaults to <code>false</code>.
  * @property {shaka.extern.DashManifestConfiguration} dash
  *   Advanced parameters used by the DASH manifest parser.
  * @property {shaka.extern.HlsManifestConfiguration} hls
@@ -826,8 +849,6 @@ shaka.extern.ManifestConfiguration;
  *   alwaysStreamText: boolean,
  *   startAtSegmentBoundary: boolean,
  *   gapDetectionThreshold: number,
- *   smallGapLimit: number,
- *   jumpLargeGaps: boolean,
  *   durationBackoff: number,
  *   forceTransmuxTS: boolean,
  *   safeSeekOffset: number,
@@ -882,18 +903,8 @@ shaka.extern.ManifestConfiguration;
  *   to <code>false</code>.
  * @property {number} gapDetectionThreshold
  *   TThe maximum distance (in seconds) before a gap when we'll automatically
- *   jump. This value  defaults to <code>0.1</code>, except in Edge Legacy, IE,
+ *   jump. This value  defaults to <code>0.1</code>, except in Edge Legacy,
  *   Tizen, Chromecast that value defaults value is <code>0.5</code>
- * @property {number} smallGapLimit
- *   The limit (in seconds) for a gap in the media to be considered "small".
- *   Small gaps are jumped automatically without events.  Large gaps result
- *   in a Player event and can be jumped.
- * @property {boolean} jumpLargeGaps
- *   If <code>true</code>, jump large gaps in addition to small gaps.  A
- *   <code>largegap</code> event will be raised first.  Then, if the app doesn't
- *   call <code>preventDefault()</code> on the event, the Player will jump the
- *   gap.  If <code>false</code>, then the event will be raised, but the gap
- *   will not be jumped.
  * @property {number} durationBackoff
  *   By default, we will not allow seeking to exactly the duration of a
  *   presentation.  This field is the number of seconds before duration we will
@@ -928,8 +939,9 @@ shaka.extern.ManifestConfiguration;
  * @property {boolean} useNativeHlsOnSafari
  *   Desktop Safari has both MediaSource and their native HLS implementation.
  *   Depending on the application's needs, it may prefer one over the other.
- *   Examples: FairPlay is only supported via Safari's native HLS, but it
- *   doesn't have an API for selecting specific tracks.
+ *   Warning when disabled: Where single-key DRM streams work fine, multi-keys
+ *   streams is showing unexpected behaviours (stall, audio playing with video
+ *   freezes, ...). Use with care.
  * @property {number} inaccurateManifestTolerance
  *   The maximum difference, in seconds, between the times in the manifest and
  *   the times in the segments.  Larger values allow us to compensate for more
@@ -1074,7 +1086,8 @@ shaka.extern.CmcdConfiguration;
  *       function(shaka.extern.TrackList):!Promise<shaka.extern.TrackList>,
  *   downloadSizeCallback: function(number):!Promise<boolean>,
  *   progressCallback: function(shaka.extern.StoredContent,number),
- *   usePersistentLicense: boolean
+ *   usePersistentLicense: boolean,
+ *   numberOfParallelDownloads: number
  * }}
  *
  * @property {function(shaka.extern.TrackList):!Promise<shaka.extern.TrackList>}
@@ -1097,6 +1110,11 @@ shaka.extern.CmcdConfiguration;
  *   license.  A network will be required to retrieve a temporary license to
  *   view.
  *   Defaults to <code>true</code>.
+ * @property {number} numberOfParallelDownloads
+ *   Number of parallel downloads.
+ *   Note: normally browsers limit to 5 request in parallel, so putting a
+ *   number higher than this will not help it download faster.
+ *   Defaults to <code>5</code>.
  * @exportDoc
  */
 shaka.extern.OfflineConfiguration;

package/externs/shaka/text.js

@@ -380,17 +380,6 @@ shaka.extern.Cue = class {
      * @exportDoc
      */
     this.lineBreak;
-
-    /**
-     * @deprecated
-     * "spacer" is deprecated and will be removed in v4. Use "lineBreak"
-     * instead.
-     * Whether or not the cue only acts as a line break between two nested cues.
-     * Should only appear in nested cues.
-     * @type {boolean}
-     * @exportDoc
-     */
-    this.spacer;
   }
 };
 
@@ -426,6 +415,13 @@ shaka.extern.TextParser = class {
    * @exportDoc
    */
   parseMedia(data, timeContext) {}
+
+  /**
+   * Notifies the stream if the manifest is in sequence mode or not.
+   *
+   * @param {boolean} sequenceMode
+   */
+  setSequenceMode(sequenceMode) {}
 };
 
 
@@ -435,7 +431,8 @@ shaka.extern.TextParser = class {
  * @typedef {{
  *   periodStart: number,
  *   segmentStart: number,
- *   segmentEnd: number
+ *   segmentEnd: number,
+ *   vttOffset: number
  * }}
  *
  * @property {number} periodStart
@@ -444,6 +441,9 @@ shaka.extern.TextParser = class {
  *     The absolute start time of the segment in seconds.
  * @property {number} segmentEnd
  *     The absolute end time of the segment in seconds.
+ * @property {number} vttOffset
+ *     The start time relative to either segment or period start depending
+ *     on <code>segmentRelativeVttTiming</code> configuration.
  *
  * @exportDoc
  */

package/externs/sourcebuffer.js

@@ -0,0 +1,15 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Externs for SourceBuffer which are missing from the Closure
+ * compiler.
+ *
+ * @externs
+ */
+
+/** @type {string} */
+SourceBuffer.prototype.mode;

package/karma.conf.js

@@ -363,6 +363,8 @@ module.exports = (config) => {
     // If testing custom assets, we don't serve other unit or integration tests.
     // External asset tests are the basis for custom asset testing, so this file
     // is automatically included.
+    clientArgs.testFiles.push('demo/common/asset.js');
+    clientArgs.testFiles.push('demo/common/assets.js');
     clientArgs.testFiles.push('test/player_external.js');
   } else {
     // In a normal test run, we serve unit tests.
@@ -374,6 +376,8 @@ module.exports = (config) => {
     }
     if (settings.external) {
       // If --external is present, we serve external asset tests.
+      clientArgs.testFiles.push('demo/common/asset.js');
+      clientArgs.testFiles.push('demo/common/assets.js');
       clientArgs.testFiles.push('test/**/*_external.js');
     }
   }

package/lib/ads/client_side_ad.js

@@ -18,14 +18,18 @@ shaka.ads.ClientSideAd = class {
   /**
    * @param {!google.ima.Ad} imaAd
    * @param {!google.ima.AdsManager} imaAdManager
+   * @param {HTMLMediaElement} video
    */
-  constructor(imaAd, imaAdManager) {
+  constructor(imaAd, imaAdManager, video) {
     /** @private {google.ima.Ad} */
     this.ad_ = imaAd;
 
     /** @private {google.ima.AdsManager} */
     this.manager_ = imaAdManager;
 
+    /** @private {HTMLMediaElement} */
+    this.video_ = video;
+
     /** @private {boolean} */
     this.isPaused_ = false;
 
@@ -176,7 +180,14 @@ shaka.ads.ClientSideAd = class {
    * @export
    */
   resize(width, height) {
-    const viewMode = document.fullscreenElement ?
+    let isInFullscreen = false;
+    const video = /** @type {HTMLVideoElement} */(this.video_);
+    if (document.fullscreenEnabled) {
+      isInFullscreen = !!document.fullscreenElement;
+    } else if (video.webkitSupportsFullscreen) {
+      isInFullscreen = video.webkitDisplayingFullscreen;
+    }
+    const viewMode = isInFullscreen ?
         google.ima.ViewMode.FULLSCREEN : google.ima.ViewMode.NORMAL;
     this.manager_.resize(width, height, viewMode);
   }

package/lib/ads/client_side_ad_manager.js

@@ -181,7 +181,7 @@ shaka.ads.ClientSideAdManager = class {
     this.addImaEventListeners_();
 
     try {
-      const viewMode = document.fullscreenElement ?
+      const viewMode = this.isFullScreenEnabled_() ?
           google.ima.ViewMode.FULLSCREEN : google.ima.ViewMode.NORMAL;
 
       this.imaAdsManager_.init(this.video_.offsetWidth,
@@ -191,7 +191,7 @@ shaka.ads.ClientSideAdManager = class {
       // because 'loadedmetadata' is sometimes called before the video resizes
       // on some platforms (e.g. Safari).
       this.eventManager_.listen(this.video_, 'loadeddata', () => {
-        const viewMode = document.fullscreenElement ?
+        const viewMode = this.isFullScreenEnabled_() ?
             google.ima.ViewMode.FULLSCREEN : google.ima.ViewMode.NORMAL;
         this.imaAdsManager_.resize(this.video_.offsetWidth,
             this.video_.offsetHeight, viewMode);
@@ -199,7 +199,7 @@ shaka.ads.ClientSideAdManager = class {
 
       if ('ResizeObserver' in window) {
         this.resizeObserver_ = new ResizeObserver(() => {
-          const viewMode = document.fullscreenElement ?
+          const viewMode = this.isFullScreenEnabled_() ?
               google.ima.ViewMode.FULLSCREEN : google.ima.ViewMode.NORMAL;
           this.imaAdsManager_.resize(this.video_.offsetWidth,
               this.video_.offsetHeight, viewMode);
@@ -221,6 +221,23 @@ shaka.ads.ClientSideAdManager = class {
   }
 
 
+  /**
+   * @return {boolean}
+   * @private
+   */
+  isFullScreenEnabled_() {
+    if (document.fullscreenEnabled) {
+      return !!document.fullscreenElement;
+    } else {
+      const video = /** @type {HTMLVideoElement} */(this.video_);
+      if (video.webkitSupportsFullscreen) {
+        return video.webkitDisplayingFullscreen;
+      }
+    }
+    return false;
+  }
+
+
   /**
    * @private
    */
@@ -389,7 +406,8 @@ shaka.ads.ClientSideAdManager = class {
         'Should have an ads manager at this point!');
 
     const imaAd = e.getAd();
-    this.ad_ = new shaka.ads.ClientSideAd(imaAd, this.imaAdsManager_);
+    this.ad_ = new shaka.ads.ClientSideAd(imaAd,
+        this.imaAdsManager_, this.video_);
     const data = new Map()
         .set('ad', this.ad_)
         .set('sdkAdObject', imaAd)

package/lib/cast/cast_utils.js

@@ -373,7 +373,6 @@ shaka.cast.CastUtils.PlayerInitAfterLoadState = [
  */
 shaka.cast.CastUtils.PlayerVoidMethods = [
   'addChaptersTrack',
-  'addTextTrack',
   'addTextTrackAsync',
   'cancelTrickPlay',
   'configure',