shaka-player 4.11.13 → 4.12.1

package/externs/shaka/ads.js

@@ -65,6 +65,7 @@ shaka.extern.AdCuePoint;
  *   uri: string,
  *   isSkippable: boolean,
  *   skipOffset: ?number,
+ *   skipFor: ?number,
  *   canJump: boolean,
  *   resumeOffset: ?number,
  *   playoutLimit: ?number,
@@ -91,6 +92,9 @@ shaka.extern.AdCuePoint;
  * @property {?number} skipOffset
  *   Time value that identifies when skip controls are made available to the
  *   end user.
+ * @property {?number} skipFor
+ *   The amount of time in seconds a skip button should be displayed for.
+ *   Note that this value should be >= 0.
  * @property {boolean} canJump
  *   Indicate if the interstitial is jumpable.
  * @property {?number} resumeOffset
@@ -297,6 +301,11 @@ shaka.extern.IAd = class {
    */
   isClientRendering() {}
 
+  /**
+   * @return {boolean}
+   */
+  isUsingAnotherMediaElement() {}
+
   /**
    * @return {number}
    */

package/externs/shaka/manifest.js

@@ -387,7 +387,8 @@ shaka.extern.SegmentIndex = class {
  *   mssPrivateData: (shaka.extern.MssPrivateData|undefined),
  *   external: boolean,
  *   fastSwitching: boolean,
- *   fullMimeTypes: !Set.<string>
+ *   fullMimeTypes: !Set.<string>,
+ *   isAudioMuxedInVideo: boolean
  * }}
  *
  * @description
@@ -534,6 +535,8 @@ shaka.extern.SegmentIndex = class {
  *   represents the types used in each period of the original manifest.
  *   Meant for being used by compatibility checking, such as with
  *   MediaSource.isTypeSupported.
+ * @property {boolean} isAudioMuxedInVideo
+ *   Indicate if the audio of this stream is muxed in the video of other stream.
  *
  * @exportDoc
  */
@@ -562,3 +565,25 @@ shaka.extern.Stream;
  * @exportDoc
  */
 shaka.extern.MssPrivateData;
+
+
+/**
+ * @typedef {{
+ *   height: number,
+ *   positionX: number,
+ *   positionY: number,
+ *   width: number
+ * }}
+ *
+ * @property {number} height
+ *    The thumbnail height in px.
+ * @property {number} positionX
+ *    The thumbnail left position in px.
+ * @property {number} positionY
+ *    The thumbnail top position in px.
+ * @property {number} width
+ *    The thumbnail width in px.
+ *
+ * @exportDoc
+ */
+shaka.extern.ThumbnailSprite;

package/externs/shaka/offline.js

@@ -142,7 +142,8 @@ shaka.extern.ManifestDB;
  *   closedCaptions: Map.<string, string>,
  *   tilesLayout: (string|undefined),
  *   external: boolean,
- *   fastSwitching: boolean
+ *   fastSwitching: boolean,
+ *   isAudioMuxedInVideo: boolean
  * }}
  *
  * @property {number} id
@@ -218,6 +219,8 @@ shaka.extern.ManifestDB;
  *   Eg: external text tracks.
  * @property {boolean} fastSwitching
  *   Indicate if the stream should be used for fast switching.
+ * @property {boolean} isAudioMuxedInVideo
+ *   Indicate if the audio of this stream is muxed in the video of other stream.
  */
 shaka.extern.StreamDB;
 
@@ -235,7 +238,8 @@ shaka.extern.StreamDB;
  *   pendingInitSegmentRefId: (string|undefined),
  *   dataKey: number,
  *   mimeType: ?string,
- *   codecs: ?string
+ *   codecs: ?string,
+ *   thumbnailSprite: ?shaka.extern.ThumbnailSprite
  * }}
  *
  * @property {?number} initSegmentKey
@@ -272,6 +276,8 @@ shaka.extern.StreamDB;
  *   The mimeType of the segment.
  * @property {?string} codecs
  *   The codecs of the segment.
+ * @property {?shaka.extern.ThumbnailSprite} thumbnailSprite
+ *   The segment's thumbnail sprite.
  */
 shaka.extern.SegmentDB;
 

package/externs/shaka/player.js

@@ -1074,7 +1074,6 @@ shaka.extern.xml.Node;
  *   manifestPreprocessor: function(!Element),
  *   manifestPreprocessorTXml: function(!shaka.extern.xml.Node),
  *   sequenceMode: boolean,
- *   enableAudioGroups: boolean,
  *   multiTypeVariantsAllowed: boolean,
  *   useStreamOnceInPeriodFlattening: boolean,
  *   updatePeriod: number,
@@ -1096,7 +1095,7 @@ shaka.extern.xml.Node;
  * @property {boolean} disableXlinkProcessing
  *   If true, xlink-related processing will be disabled.
  *   <br>
- *   Defaults to <code>false</code>.
+ *   Defaults to <code>true</code>.
  * @property {boolean} xlinkFailGracefully
  *   If true, xlink-related errors will result in a fallback to the tag's
  *   existing contents. If false, xlink-related errors will be propagated
@@ -1155,11 +1154,6 @@ shaka.extern.xml.Node;
  *   "sequence mode" (ignoring their internal timestamps).
  *   <br>
  *   Defaults to <code>false</code>.
- * @property {boolean} enableAudioGroups
- *   If set, audio streams will be grouped and filtered by their parent
- *   adaptation set ID.
- *   <br>
- *   Defaults to <code>false</code>.
  * @property {boolean} multiTypeVariantsAllowed
  *   If true, the manifest parser will create variants that have multiple
  *   mimeTypes or codecs for video or for audio if there is no other choice.
@@ -1179,10 +1173,10 @@ shaka.extern.xml.Node;
  *   <br>
  *   Defaults to <code>false</code>.
  * @property {number} updatePeriod
- *   Override the minimumUpdatePeriod of the manifest. The value is in second
- *   if the value is greater than the minimumUpdatePeriod, it will update the
- *   manifest less frequently. if you update the value during for a dynamic
- *   manifest, it will directly trigger a new download of the manifest
+ *   Override the minimumUpdatePeriod of the manifest. The value is in seconds.
+ *   If the value is greater than the minimumUpdatePeriod, it will update the
+ *   manifest less frequently. If you update the value during for a dynamic
+ *   manifest, it will directly trigger a new download of the manifest.
  *   <br>
  *   Defaults to <code>-1</code>.
  * @property {boolean} enableFastSwitching
@@ -1208,7 +1202,8 @@ shaka.extern.DashManifestConfiguration;
  *   ignoreManifestTimestampsInSegmentsMode: boolean,
  *   disableCodecGuessing: boolean,
  *   disableClosedCaptionsDetection: boolean,
- *   allowLowLatencyByteRangeOptimization: boolean
+ *   allowLowLatencyByteRangeOptimization: boolean,
+ *   updatePeriod: number
  * }}
  *
  * @property {boolean} ignoreTextStreamFailures
@@ -1294,6 +1289,14 @@ shaka.extern.DashManifestConfiguration;
  *   https://www.akamai.com/blog/performance/-using-ll-hls-with-byte-range-addressing-to-achieve-interoperabi
  *   <br>
  *   Defaults to <code>true</code>.
+ * @property {number} updatePeriod
+ *   Override the update period of the playlist. The value is in seconds.
+ *   If the value is less than 0, the period will be determined based on the
+ *   segment length.  If the value is greater than 0, it will update the target
+ *   duration.  If you update the value during the live, it will directly
+ *   trigger a new download of the manifest.
+ *   <br>
+ *   Defaults to <code>-1</code>.
  * @exportDoc
  */
 shaka.extern.HlsManifestConfiguration;
@@ -1337,6 +1340,7 @@ shaka.extern.MssManifestConfiguration;
  *   disableVideo: boolean,
  *   disableText: boolean,
  *   disableThumbnails: boolean,
+ *   disableIFrames: boolean,
  *   defaultPresentationDelay: number,
  *   segmentRelativeVttTiming: boolean,
  *   dash: shaka.extern.DashManifestConfiguration,
@@ -1371,6 +1375,10 @@ shaka.extern.MssManifestConfiguration;
  *   If <code>true</code>, the image tracks are ignored.
  *   <br>
  *   Defaults to <code>false</code>.
+ * @property {boolean} disableIFrames
+ *   If <code>true</code>, the I-Frames tracks are ignored.
+ *   <br>
+ *   Defaults to <code>false</code>.
  * @property {number} defaultPresentationDelay
  *   For DASH, it's a default <code>presentationDelay</code> value if
  *   <code>suggestedPresentationDelay</code> is missing in the MPEG DASH
@@ -1536,6 +1544,7 @@ shaka.extern.LiveSyncConfiguration;
  *   gapJumpTimerTime: number,
  *   durationBackoff: number,
  *   safeSeekOffset: number,
+ *   safeSeekEndOffset: number,
  *   stallEnabled: boolean,
  *   stallThreshold: number,
  *   stallSkip: number,
@@ -1548,10 +1557,8 @@ shaka.extern.LiveSyncConfiguration;
  *   minBytesForProgressEvents: number,
  *   preferNativeHls: boolean,
  *   updateIntervalSeconds: number,
- *   dispatchAllEmsgBoxes: boolean,
  *   observeQualityChanges: boolean,
  *   maxDisabledTime: number,
- *   parsePrftBox: boolean,
  *   segmentPrefetchLimit: number,
  *   prefetchAudioLanguages: !Array<string>,
  *   disableAudioPrefetch: boolean,
@@ -1653,6 +1660,13 @@ shaka.extern.LiveSyncConfiguration;
  *   bandwidth scenarios.
  *   <br>
  *   Defaults to <code>5</code>.
+ * @property {number} safeSeekEndOffset
+ *   The amount of seconds that should be added when repositioning the playhead
+ *   after falling out of the seakable end range. This is helpful for live
+ *   stream with a lot of GAP. This will reposition the playback in the past
+ *   and avoid to be block at the edge and buffer at the next GAP
+ *   <br>
+ *   Defaults to <code>0</code>.
  * @property {boolean} stallEnabled
  *   When set to <code>true</code>, the stall detector logic will run.  If the
  *   playhead stops moving for <code>stallThreshold</code> seconds, the player
@@ -1724,10 +1738,6 @@ shaka.extern.LiveSyncConfiguration;
  *   The minimum number of seconds to see if the manifest has changes.
  *   <br>
  *   Defaults to <code>1</code>.
- * @property {boolean} dispatchAllEmsgBoxes
- *   If true, all emsg boxes are parsed and dispatched.
- *   <br>
- *   Defaults to <code>false</code>.
  * @property {boolean} observeQualityChanges
  *   If true, monitor media quality changes and emit
  *   <code>shaka.Player.MediaQualityChangedEvent</code>.
@@ -1739,14 +1749,6 @@ shaka.extern.LiveSyncConfiguration;
  *   If all variants are disabled this way, NETWORK HTTP_ERROR will be thrown.
  *   <br>
  *   Defaults to <code>30</code>.
- * @property {boolean} parsePrftBox
- *   If <code>true</code>, will raise a shaka.extern.ProducerReferenceTime
- *   player event (event name 'prft').
- *   The event will be raised only once per playback session as program
- *   start date will not change, and would save parsing the segment multiple
- *   times needlessly.
- *   <br>
- *   Defaults to <code>false</code>.
  * @property {number} segmentPrefetchLimit
  *   The maximum number of segments for each active stream to be prefetched
  *   ahead of playhead in parallel.
@@ -1843,7 +1845,8 @@ shaka.extern.StreamingConfiguration;
  *   addExtraFeaturesToSourceBuffer: function(string): string,
  *   forceTransmux: boolean,
  *   insertFakeEncryptionInInit: boolean,
- *   modifyCueCallback: shaka.extern.TextParser.ModifyCueCallback
+ *   modifyCueCallback: shaka.extern.TextParser.ModifyCueCallback,
+ *   dispatchAllEmsgBoxes: boolean
  * }}
  *
  * @description
@@ -1882,6 +1885,10 @@ shaka.extern.StreamingConfiguration;
  *    A callback called for each cue after it is parsed, but right before it
  *    is appended to the presentation.
  *    Gives a chance for client-side editing of cue text, cue timing, etc.
+ * @property {boolean} dispatchAllEmsgBoxes
+ *   If true, all emsg boxes are parsed and dispatched.
+ *   <br>
+ *   Defaults to <code>false</code>.
  * @exportDoc
  */
 shaka.extern.MediaSourceConfiguration;
@@ -1891,7 +1898,9 @@ shaka.extern.MediaSourceConfiguration;
  * @typedef {{
  *   customPlayheadTracker: boolean,
  *   skipPlayDetection: boolean,
- *   supportsMultipleMediaElements: boolean
+ *   supportsMultipleMediaElements: boolean,
+ *   disableHLSInterstitial: boolean,
+ *   disableDASHInterstitial: boolean
  * }}
  *
  * @description
@@ -1918,6 +1927,14 @@ shaka.extern.MediaSourceConfiguration;
  *   Defaults to <code>true</code> except on Tizen, WebOS, Chromecast,
  *   Hisense, PlayStation 4, PlayStation5, Xbox whose default value is
  *   <code>false</code>.
+ * @property {boolean} disableHLSInterstitial
+ *   If this is true, we ignore HLS interstitial events.
+ *   <br>
+ *   Defaults to <code>false</code>.
+ * @property {boolean} disableDASHInterstitial
+ *   If this is true, we ignore DASH interstitial events.
+ *   <br>
+ *   Defaults to <code>false</code>.
  *
  * @exportDoc
  */
@@ -2278,6 +2295,7 @@ shaka.extern.TextDisplayerConfiguration;
  *   cmsd: shaka.extern.CmsdConfiguration,
  *   lcevc: shaka.extern.LcevcConfiguration,
  *   offline: shaka.extern.OfflineConfiguration,
+ *   ignoreHardwareResolution: boolean,
  *   preferredAudioLanguage: string,
  *   preferredAudioLabel: string,
  *   preferredTextLanguage: string,
@@ -2285,6 +2303,7 @@ shaka.extern.TextDisplayerConfiguration;
  *   preferredTextRole: string,
  *   preferredVideoCodecs: !Array.<string>,
  *   preferredAudioCodecs: !Array.<string>,
+ *   preferredTextFormats: !Array.<string>,
  *   preferredAudioChannelCount: number,
  *   preferredVideoHdrLevel: string,
  *   preferredVideoLayout: string,
@@ -2327,6 +2346,11 @@ shaka.extern.TextDisplayerConfiguration;
  *   (Low Complexity Enhancement Video Codec)
  * @property {shaka.extern.OfflineConfiguration} offline
  *   Offline configuration and settings.
+ * @property {boolean} ignoreHardwareResolution
+ *   Do not detect the hardware resolution.  For some niche cases where content
+ *   is only available at resolutions beyond the device's native resolution,
+ *   and you are confident it can be decoded and downscaled, this flag can
+ *   allow playback when it would otherwise fail.
  * @property {string} preferredAudioLanguage
  *   The preferred language to use for audio tracks.  If not given it will use
  *   the <code>'main'</code> track.
@@ -2364,6 +2388,10 @@ shaka.extern.TextDisplayerConfiguration;
  *   The list of preferred audio codecs, in order of highest to lowest priority.
  *   <br>
  *   Defaults to <code>[]</code>.
+ * @property {!Array.<string>} preferredTextFormats
+ *   The list of preferred text formats, in order of highest to lowest priority.
+ *   <br>
+ *   Defaults to <code>[]</code>.
  * @property {number} preferredAudioChannelCount
  *   The preferred number of audio channels.
  *   <br>
@@ -2508,3 +2536,27 @@ shaka.extern.Thumbnail;
  * @exportDoc
  */
 shaka.extern.Chapter;
+
+
+/**
+ * @typedef {{
+ *   uri: string,
+ *   language: string,
+ *   kind: string,
+ *   mime: string,
+ *   codecs: (string|undefined)
+ * }}
+ *
+ * @property {string} uri
+ *   The URI of the text.
+ * @property {string} language
+ *   The language of the text (e.g. 'en').
+ * @property {string} kind
+ *   The kind of text (e.g. 'subtitles').
+ * @property {?string} mime
+ *   The MIME type of the text (e.g. 'text/vtt')
+ * @property {?string} codecs
+ *   The codecs string, if needed to refine the MIME type.
+ * @exportDoc
+ */
+shaka.extern.ExtraText;

package/externs/shaka/text.js

@@ -183,6 +183,15 @@ shaka.extern.TextDisplayer = class {
    * @exportDoc
    */
   setTextVisibility(on) {}
+
+  /**
+   * Set the current language.
+   *
+   * @param {string} language
+   *
+   * @exportDoc
+   */
+  setTextLanguage(language) {}
 };
 
 

package/lib/ads/ad_manager.js

@@ -824,6 +824,9 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
    * @export
    */
   onHLSInterstitialMetadata(basePlayer, baseVideo, interstitial) {
+    if (this.config_ && this.config_.disableHLSInterstitial) {
+      return;
+    }
     if (!this.interstitialAdManager_) {
       this.initInterstitial(/* adContainer= */ null, basePlayer, baseVideo);
     }
@@ -837,6 +840,9 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
    * @export
    */
   onDASHInterstitialMetadata(basePlayer, baseVideo, region) {
+    if (this.config_ && this.config_.disableDASHInterstitial) {
+      return;
+    }
     if (region.schemeIdUri != 'urn:mpeg:dash:event:alternativeMPD:2022') {
       return;
     }

package/lib/ads/ad_utils.js

@@ -82,6 +82,7 @@ shaka.ads.Utils = class {
             uri: adUrl,
             isSkippable: skipOffset != null,
             skipOffset,
+            skipFor: null,
             canJump: false,
             resumeOffset: 0,
             playoutLimit: null,

package/lib/ads/client_side_ad.js

@@ -66,6 +66,14 @@ shaka.ads.ClientSideAd = class {
     return true;
   }
 
+  /**
+   * @override
+   * @export
+   */
+  isUsingAnotherMediaElement() {
+    return true;
+  }
+
   /**
    * @override
    * @export

package/lib/ads/interstitial_ad.js

@@ -16,12 +16,14 @@ shaka.ads.InterstitialAd = class {
    * @param {HTMLMediaElement} video
    * @param {boolean} isSkippable
    * @param {?number} skipOffset
+   * @param {?number} skipFor
    * @param {function()} onSkip
    * @param {number} sequenceLength
    * @param {number} adPosition
+   * @param {boolean} isUsingAnotherMediaElement
    */
-  constructor(video, isSkippable, skipOffset, onSkip,
-      sequenceLength, adPosition) {
+  constructor(video, isSkippable, skipOffset, skipFor, onSkip,
+      sequenceLength, adPosition, isUsingAnotherMediaElement) {
     /** @private {HTMLMediaElement} */
     this.video_ = video;
 
@@ -29,7 +31,10 @@ shaka.ads.InterstitialAd = class {
     this.isSkippable_ = isSkippable;
 
     /** @private {?number} */
-    this.skipOffset_ = skipOffset;
+    this.skipOffset_ = isSkippable ? skipOffset || 0 : skipOffset;
+
+    /** @private {?number} */
+    this.skipFor_ = skipFor;
 
     /** @private {function()} */
     this.onSkip_ = onSkip;
@@ -39,6 +44,9 @@ shaka.ads.InterstitialAd = class {
 
     /** @private {number} */
     this.adPosition_ = adPosition;
+
+    /** @private {boolean} */
+    this.isUsingAnotherMediaElement_ = isUsingAnotherMediaElement;
   }
 
   /**
@@ -57,6 +65,14 @@ shaka.ads.InterstitialAd = class {
     return true;
   }
 
+  /**
+   * @override
+   * @export
+   */
+  isUsingAnotherMediaElement() {
+    return this.isUsingAnotherMediaElement_;
+  }
+
   /**
    * @override
    * @export
@@ -102,6 +118,11 @@ shaka.ads.InterstitialAd = class {
    * @export
    */
   isSkippable() {
+    if (this.isSkippable_ && this.skipFor_ != null) {
+      const position = this.getDuration() - this.getRemainingTime();
+      const maxTime = this.skipOffset_ + this.skipFor_;
+      return position < maxTime;
+    }
     return this.isSkippable_;
   }
 
@@ -110,7 +131,7 @@ shaka.ads.InterstitialAd = class {
    * @export
    */
   getTimeUntilSkippable() {
-    if (this.isSkippable_) {
+    if (this.isSkippable()) {
       const canSkipIn =
           this.getRemainingTime() + this.skipOffset_ - this.getDuration();
       return Math.max(canSkipIn, 0);

package/lib/ads/interstitial_ad_manager.js

@@ -319,6 +319,8 @@ shaka.ads.InterstitialAdManager = class {
       shaka.log.warning('Unsupported MPD alternate', region);
       return;
     }
+
+    /** @type {!shaka.extern.AdInterstitial} */
     const interstitial = {
       id: null,
       startTime: region.startTime,
@@ -326,6 +328,7 @@ shaka.ads.InterstitialAdManager = class {
       uri: alternativeMPDUri,
       isSkippable: false,
       skipOffset: null,
+      skipFor: null,
       canJump: true,
       resumeOffset: isInsert ? 0 : null,
       playoutLimit: null,
@@ -654,7 +657,8 @@ shaka.ads.InterstitialAdManager = class {
 
     const ad = new shaka.ads.InterstitialAd(this.video_,
         interstitial.isSkippable, interstitial.skipOffset,
-        onSkip, sequenceLength, adPosition);
+        interstitial.skipFor, onSkip, sequenceLength, adPosition,
+        !this.usingBaseVideo_);
     if (!this.usingBaseVideo_) {
       ad.setMuted(this.baseVideo_.muted);
       ad.setVolume(this.baseVideo_.volume);
@@ -664,7 +668,8 @@ shaka.ads.InterstitialAdManager = class {
         new shaka.util.FakeEvent(shaka.ads.Utils.AD_STARTED,
             (new Map()).set('ad', ad)));
 
-    if (ad.canSkipNow()) {
+    let prevCanSkipNow = ad.canSkipNow();
+    if (prevCanSkipNow) {
       this.onEvent_(new shaka.util.FakeEvent(
           shaka.ads.Utils.AD_SKIP_STATE_CHANGED));
     }
@@ -675,12 +680,13 @@ shaka.ads.InterstitialAdManager = class {
       if (!duration) {
         return;
       }
-      if (interstitial.isSkippable && interstitial.skipOffset &&
-          ad.canSkipNow() && ad.getRemainingTime() > 0 &&
-          ad.getDuration() > 0) {
+      const currentCanSkipNow = ad.canSkipNow();
+      if (prevCanSkipNow != currentCanSkipNow &&
+          ad.getRemainingTime() > 0 && ad.getDuration() > 0) {
         this.onEvent_(
             new shaka.util.FakeEvent(shaka.ads.Utils.AD_SKIP_STATE_CHANGED));
       }
+      prevCanSkipNow = currentCanSkipNow;
       const currentPercent = 100 * this.video_.currentTime / duration;
       if (currentPercent >= 25 && !eventsSent.has('firstquartile')) {
         updateBaseVideoTime();
@@ -812,6 +818,26 @@ shaka.ads.InterstitialAdManager = class {
       isSkippable = !data.includes('SKIP');
       canJump = !data.includes('JUMP');
     }
+    let skipOffset = isSkippable ? 0 : null;
+    const enableSkipAfter =
+        hlsInterstitial.values.find((v) => v.key == 'X-ENABLE-SKIP-AFTER');
+    if (enableSkipAfter) {
+      const enableSkipAfterString = /** @type {string} */(enableSkipAfter.data);
+      skipOffset = parseFloat(enableSkipAfterString);
+      if (isNaN(skipOffset)) {
+        skipOffset = isSkippable ? 0 : null;
+      }
+    }
+    let skipFor = null;
+    const enableSkipFor =
+        hlsInterstitial.values.find((v) => v.key == 'X-ENABLE-SKIP-FOR');
+    if (enableSkipFor) {
+      const enableSkipForString = /** @type {string} */(enableSkipFor.data);
+      skipFor = parseFloat(enableSkipForString);
+      if (isNaN(skipOffset)) {
+        skipFor = null;
+      }
+    }
     let resumeOffset = null;
     const resume =
         hlsInterstitial.values.find((v) => v.key == 'X-RESUME-OFFSET');
@@ -862,7 +888,8 @@ shaka.ads.InterstitialAdManager = class {
         endTime,
         uri,
         isSkippable,
-        skipOffset: isSkippable ? 0 : null,
+        skipOffset,
+        skipFor,
         canJump,
         resumeOffset,
         playoutLimit,
@@ -886,6 +913,23 @@ shaka.ads.InterstitialAdManager = class {
         const dataAsJson =
         /** @type {!shaka.ads.InterstitialAdManager.AssetsList} */ (
             JSON.parse(data));
+        const skipControl = dataAsJson['SKIP-CONTROL'];
+        if (skipControl) {
+          const enableSkipAfterValue = skipControl['ENABLE-SKIP-AFTER'];
+          if (enableSkipAfterValue instanceof Number) {
+            skipOffset = parseFloat(enableSkipAfterValue);
+            if (isNaN(enableSkipAfterValue)) {
+              skipOffset = isSkippable ? 0 : null;
+            }
+          }
+          const enableSkipForValue = skipControl['X-ENABLE-SKIP-FOR'];
+          if (enableSkipForValue instanceof Number) {
+            skipFor = parseFloat(enableSkipForValue);
+            if (isNaN(enableSkipForValue)) {
+              skipFor = null;
+            }
+          }
+        }
         for (const asset of dataAsJson['ASSETS']) {
           if (asset['URI']) {
             interstitialsAd.push({
@@ -894,7 +938,8 @@ shaka.ads.InterstitialAdManager = class {
               endTime,
               uri: asset['URI'],
               isSkippable,
-              skipOffset: isSkippable ? 0 : null,
+              skipOffset,
+              skipFor,
               canJump,
               resumeOffset,
               playoutLimit,
@@ -983,10 +1028,12 @@ shaka.ads.InterstitialAdManager = class {
 
 /**
  * @typedef {{
- *   ASSETS: !Array.<shaka.ads.InterstitialAdManager.Asset>
+ *   ASSETS: !Array.<shaka.ads.InterstitialAdManager.Asset>,
+ *   SKIP-CONTROL: ?shaka.ads.InterstitialAdManager.SkipControl
  * }}
  *
  * @property {!Array.<shaka.ads.InterstitialAdManager.Asset>} ASSETS
+ * @property {shaka.ads.InterstitialAdManager.SkipControl} SKIP-CONTROL
  */
 shaka.ads.InterstitialAdManager.AssetsList;
 
@@ -999,3 +1046,15 @@ shaka.ads.InterstitialAdManager.AssetsList;
  * @property {string} URI
  */
 shaka.ads.InterstitialAdManager.Asset;
+
+
+/**
+ * @typedef {{
+ *   ENABLE-SKIP-AFTER: number,
+ *   ENABLE-SKIP-FOR: number
+ * }}
+ *
+ * @property {number} ENABLE-SKIP-AFTER
+ * @property {number} ENABLE-SKIP-FOR
+ */
+shaka.ads.InterstitialAdManager.SkipControl;

package/lib/ads/media_tailor_ad.js

@@ -59,6 +59,14 @@ shaka.ads.MediaTailorAd = class {
     return false;
   }
 
+  /**
+   * @override
+   * @export
+   */
+  isUsingAnotherMediaElement() {
+    return false;
+  }
+
   /**
    * @override
    * @export

package/lib/ads/server_side_ad.js

@@ -51,6 +51,14 @@ shaka.ads.ServerSideAd = class {
     return false;
   }
 
+  /**
+   * @override
+   * @export
+   */
+  isUsingAnotherMediaElement() {
+    return false;
+  }
+
   /**
    * @override
    * @export