hls.js 1.6.0-beta.3.0.canary.10980 → 1.6.0-beta.3.0.canary.10982

package/src/controller/interstitials-controller.ts

@@ -31,6 +31,7 @@ import { Logger } from '../utils/logger';
 import { isCompatibleTrackChange } from '../utils/mediasource-helper';
 import { getBasicSelectionOption } from '../utils/rendition-helper';
 import { stringify } from '../utils/safe-json-stringify';
+import type { InterstitialPlayer } from './interstitial-player';
 import type { HlsConfig } from '../config';
 import type Hls from '../hls';
 import type { LevelDetails } from '../loader/level-details';
@@ -55,18 +56,16 @@ import type { MediaPlaylist, MediaSelection } from '../types/media-playlist';
 
 export interface InterstitialsManager {
   events: InterstitialEvent[];
-  playerQueue: HlsAssetPlayer[];
   schedule: InterstitialScheduleItem[];
-  bufferingPlayer: HlsAssetPlayer | null;
+  interstitialPlayer: InterstitialPlayer | null;
+  playerQueue: HlsAssetPlayer[];
   bufferingAsset: InterstitialAssetItem | null;
   bufferingItem: InterstitialScheduleItem | null;
   bufferingIndex: number;
   playingAsset: InterstitialAssetItem | null;
   playingItem: InterstitialScheduleItem | null;
   playingIndex: number;
-  waitingIndex: number;
   primary: PlayheadTimes;
-  playout: PlayheadTimes;
   integrated: PlayheadTimes;
   skip: () => void;
 }
@@ -76,7 +75,6 @@ export type PlayheadTimes = {
   currentTime: number;
   duration: number;
   seekableStart: number;
-  seekTo: (time: number) => void;
 };
 
 function playWithCatch(media: HTMLMediaElement | null) {
@@ -122,7 +120,9 @@ export default class InterstitialsController
   private playingItem: InterstitialScheduleItem | null = null;
   private bufferingItem: InterstitialScheduleItem | null = null;
   private waitingItem: InterstitialScheduleEventItem | null = null;
+  private endedItem: InterstitialScheduleItem | null = null;
   private playingAsset: InterstitialAssetItem | null = null;
+  private endedAsset: InterstitialAssetItem | null = null;
   private bufferingAsset: InterstitialAssetItem | null = null;
   private shouldPlay: boolean = false;
 
@@ -259,7 +259,7 @@ export default class InterstitialsController
     event: Events.MEDIA_ATTACHED,
     data: MediaAttachedData,
   ) {
-    const playingItem = this.playingItem;
+    const playingItem = this.effectivePlayingItem;
     const detachedMedia = this.detachedData;
     this.detachedData = null;
     if (playingItem === null) {
@@ -276,7 +276,9 @@ export default class InterstitialsController
     this.playingItem =
       this.bufferingItem =
       this.waitingItem =
+      this.endedItem =
       this.playingAsset =
+      this.endedAsset =
       this.bufferingAsset =
         null;
   }
@@ -298,11 +300,13 @@ export default class InterstitialsController
     if (this.detachedData) {
       const player = this.getBufferingPlayer();
       if (player) {
-        this.playingAsset = null;
-        this.bufferingAsset = null;
-        this.bufferingItem = null;
-        this.waitingItem = null;
-        this.detachedData = null;
+        this.playingAsset =
+          this.endedAsset =
+          this.bufferingAsset =
+          this.bufferingItem =
+          this.waitingItem =
+          this.detachedData =
+            null;
         player.detachMedia();
       }
       this.shouldPlay = false;
@@ -311,12 +315,11 @@ export default class InterstitialsController
 
   public get interstitialsManager(): InterstitialsManager | null {
     if (!this.manager) {
-      if (!this.hls || !this.schedule.events) {
+      if (!this.hls) {
         return null;
       }
       const c = this;
       const effectiveBufferingItem = () => c.bufferingItem || c.waitingItem;
-      const effectivePlayingItem = () => c.playingItem || c.waitingItem;
       const getAssetPlayer = (asset: InterstitialAssetItem | null) =>
         asset ? c.getAssetPlayer(asset.identifier) : asset;
       const getMappedTime = (
@@ -375,7 +378,7 @@ export default class InterstitialsController
         if (value === Number.MAX_VALUE) {
           return getMappedDuration('primary');
         }
-        return value;
+        return Math.max(value, 0);
       };
       const getMappedDuration = (timelineType: TimelineType): number => {
         if (c.primaryDetails?.live) {
@@ -385,12 +388,12 @@ export default class InterstitialsController
         return c.schedule.durations[timelineType];
       };
       const seekTo = (time: number, timelineType: TimelineType) => {
-        const item = effectivePlayingItem();
+        const item = c.effectivePlayingItem;
         if (item?.event?.restrictions.skip) {
           return;
         }
         c.log(`seek to ${time} "${timelineType}"`);
-        const playingItem = effectivePlayingItem();
+        const playingItem = c.effectivePlayingItem;
         const targetIndex = c.schedule.findItemIndexAtTime(time, timelineType);
         const targetItem = c.schedule.items?.[targetIndex];
         const playingInterstitial = playingItem?.event;
@@ -399,7 +402,7 @@ export default class InterstitialsController
         if (playingItem && (appendInPlace || seekInItem)) {
           // seek in asset player or primary media (appendInPlace)
           const assetPlayer = getAssetPlayer(c.playingAsset);
-          const media = assetPlayer?.media || c.hls.media;
+          const media = assetPlayer?.media || c.primaryMedia;
           if (media) {
             const currentTime =
               timelineType === 'primary'
@@ -481,6 +484,68 @@ export default class InterstitialsController
           }
         }
       };
+      const getActiveInterstitial = () => {
+        const playingItem = c.effectivePlayingItem;
+        if (c.isInterstitial(playingItem)) {
+          return playingItem;
+        }
+        const bufferingItem = effectiveBufferingItem();
+        if (c.isInterstitial(bufferingItem)) {
+          return bufferingItem;
+        }
+        return null;
+      };
+      const interstitialPlayer: InterstitialPlayer = {
+        get currentTime() {
+          const interstitialItem = getActiveInterstitial();
+          const playingItem = c.effectivePlayingItem;
+          if (playingItem && playingItem === interstitialItem) {
+            return (
+              getMappedTime(
+                playingItem,
+                'playout',
+                c.effectivePlayingAsset,
+                'timelinePos',
+                'currentTime',
+              ) - playingItem.playout.start
+            );
+          }
+          return 0;
+        },
+        set currentTime(time: number) {
+          const interstitialItem = getActiveInterstitial();
+          const playingItem = c.effectivePlayingItem;
+          if (playingItem && playingItem === interstitialItem) {
+            seekTo(time + playingItem.playout.start, 'playout');
+          }
+        },
+        get duration() {
+          const interstitialItem = getActiveInterstitial();
+          if (interstitialItem) {
+            return (
+              interstitialItem.playout.end - interstitialItem.playout.start
+            );
+          }
+          return 0;
+        },
+        get assetPlayers() {
+          const assetList = getActiveInterstitial()?.event.assetList;
+          if (assetList) {
+            return assetList.map((asset) => c.getAssetPlayer(asset.identifier));
+          }
+          return [];
+        },
+        get playingIndex() {
+          const interstitial = getActiveInterstitial()?.event;
+          if (interstitial && c.effectivePlayingAsset) {
+            return interstitial.findAssetIndex(c.effectivePlayingAsset);
+          }
+          return -1;
+        },
+        get scheduleItem() {
+          return getActiveInterstitial();
+        },
+      };
       this.manager = {
         get events() {
           return c.schedule?.events?.slice(0) || [];
@@ -488,80 +553,56 @@ export default class InterstitialsController
         get schedule() {
           return c.schedule?.items?.slice(0) || [];
         },
+        get interstitialPlayer() {
+          if (getActiveInterstitial()) {
+            return interstitialPlayer;
+          }
+          return null;
+        },
         get playerQueue() {
           return c.playerQueue.slice(0);
         },
-        get bufferingPlayer() {
-          return c.getBufferingPlayer();
-        },
         get bufferingAsset() {
           return c.bufferingAsset;
         },
         get bufferingItem() {
-          return c.bufferingItem;
-        },
-        get playingAsset() {
-          return c.playingAsset;
-        },
-        get playingItem() {
-          return c.playingItem;
+          return effectiveBufferingItem();
         },
         get bufferingIndex() {
           const item = effectiveBufferingItem();
           return c.findItemIndex(item);
         },
+        get playingAsset() {
+          return c.effectivePlayingAsset;
+        },
+        get playingItem() {
+          return c.effectivePlayingItem;
+        },
         get playingIndex() {
-          const item = effectivePlayingItem();
+          const item = c.effectivePlayingItem;
           return c.findItemIndex(item);
         },
-        get waitingIndex() {
-          return c.findItemIndex(c.waitingItem);
-        },
         primary: {
           get bufferedEnd() {
             return getBufferedEnd();
           },
           get currentTime() {
             const timelinePos = c.timelinePos;
+            const playingItem = c.effectivePlayingItem;
+            if (playingItem?.event?.appendInPlace) {
+              return playingItem.start;
+            }
             return timelinePos > 0 ? timelinePos : 0;
           },
+          set currentTime(time: number) {
+            seekTo(time, 'primary');
+          },
           get duration() {
             return getMappedDuration('primary');
           },
           get seekableStart() {
             return c.primaryDetails?.fragmentStart || 0;
           },
-          seekTo: (time) => seekTo(time, 'primary'),
-        },
-        playout: {
-          get bufferedEnd() {
-            return getMappedTime(
-              effectiveBufferingItem(),
-              'playout',
-              c.bufferingAsset,
-              'bufferedPos',
-              'bufferedEnd',
-            );
-          },
-          get currentTime() {
-            return getMappedTime(
-              effectivePlayingItem(),
-              'playout',
-              c.playingAsset,
-              'timelinePos',
-              'currentTime',
-            );
-          },
-          get duration() {
-            return getMappedDuration('playout');
-          },
-          get seekableStart() {
-            return findMappedTime(
-              c.primaryDetails?.fragmentStart || 0,
-              'playout',
-            );
-          },
-          seekTo: (time) => seekTo(time, 'playout'),
         },
         integrated: {
           get bufferedEnd() {
@@ -575,13 +616,16 @@ export default class InterstitialsController
           },
           get currentTime() {
             return getMappedTime(
-              effectivePlayingItem(),
+              c.effectivePlayingItem,
               'integrated',
-              c.playingAsset,
+              c.effectivePlayingAsset,
               'timelinePos',
               'currentTime',
             );
           },
+          set currentTime(time: number) {
+            seekTo(time, 'integrated');
+          },
           get duration() {
             return getMappedDuration('integrated');
           },
@@ -591,10 +635,9 @@ export default class InterstitialsController
               'integrated',
             );
           },
-          seekTo: (time) => seekTo(time, 'integrated'),
         },
         skip: () => {
-          const item = effectivePlayingItem();
+          const item = c.effectivePlayingItem;
           const event = item?.event;
           if (event && !event.restrictions.skip) {
             const index = c.findItemIndex(item);
@@ -612,6 +655,14 @@ export default class InterstitialsController
   }
 
   // Schedule getters
+  private get effectivePlayingItem(): InterstitialScheduleItem | null {
+    return this.waitingItem || this.playingItem || this.endedItem;
+  }
+
+  private get effectivePlayingAsset(): InterstitialAssetItem | null {
+    return this.playingAsset || this.endedAsset;
+  }
+
   private get playingLastItem(): boolean {
     const playingItem = this.playingItem;
     const items = this.schedule?.items;
@@ -623,7 +674,7 @@ export default class InterstitialsController
   }
 
   private get playbackStarted(): boolean {
-    return this.playingItem !== null;
+    return this.effectivePlayingItem !== null;
   }
 
   // Media getters and event callbacks
@@ -828,6 +879,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
       if (this.playingLastItem && this.isInterstitial(playingItem)) {
         const restartAsset = playingItem.event.assetList[0];
         if (restartAsset) {
+          this.endedItem = this.playingItem;
           this.playingItem = null;
           this.setScheduleToAssetAtTime(currentTime, restartAsset);
         }
@@ -899,7 +951,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
     }
     // Start stepping through schedule when playback begins for the first time and we have a pre-roll
     const timelinePos = this.timelinePos;
-    const waitingItem = this.waitingItem;
+    const effectivePlayingItem = this.effectivePlayingItem;
     if (timelinePos === -1) {
       const startPosition = this.hls.startPosition;
       this.timelinePos = startPosition;
@@ -912,8 +964,8 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
         const index = schedule.findItemIndexAtTime(start);
         this.setSchedulePosition(index);
       }
-    } else if (waitingItem && !this.playingItem) {
-      const index = schedule.findItemIndex(waitingItem);
+    } else if (effectivePlayingItem && !this.playingItem) {
+      const index = schedule.findItemIndex(effectivePlayingItem);
       this.setSchedulePosition(index);
     }
   }
@@ -986,11 +1038,12 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
           (assetListIndex !== undefined &&
             assetId !== interstitial.assetList?.[assetListIndex].identifier))
       ) {
-        this.playingAsset = null;
         const assetListIndex = interstitial.findAssetIndex(playingAsset);
         this.log(
           `INTERSTITIAL_ASSET_ENDED ${assetListIndex + 1}/${interstitial.assetList.length} ${eventAssetToString(playingAsset)}`,
         );
+        this.endedAsset = playingAsset;
+        this.playingAsset = null;
         this.hls.trigger(Events.INTERSTITIAL_ASSET_ENDED, {
           asset: playingAsset,
           assetListIndex,
@@ -1003,9 +1056,9 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
         if (player.media && !this.detachedData) {
           player.detachMedia();
         }
-        this.clearAssetPlayer(assetId, scheduledItem);
       }
       if (!this.eventItemsMatch(currentItem, scheduledItem)) {
+        this.endedItem = currentItem;
         this.playingItem = null;
         this.log(
           `INTERSTITIAL_ENDED ${interstitial} ${segmentToString(currentItem)}`,
@@ -1085,7 +1138,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
       const waitingItem = this.waitingItem;
       this.setBufferingItem(scheduledItem);
       let player = this.preloadAssets(interstitial, assetListIndex);
-      if (!this.eventItemsMatch(scheduledItem, currentItem || waitingItem)) {
+      if (!this.eventItemsMatch(scheduledItem, waitingItem || currentItem)) {
         this.waitingItem = scheduledItem;
         this.log(
           `INTERSTITIAL_STARTED ${segmentToString(scheduledItem)} ${interstitial.appendInPlace ? 'append in place' : ''}`,
@@ -1113,7 +1166,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
         return;
       }
       // Update schedule and asset list position now that it can start
-      this.waitingItem = null;
+      this.waitingItem = this.endedItem = null;
       this.playingItem = scheduledItem;
 
       // If asset-list is empty or missing asset index, advance to next item
@@ -1173,6 +1226,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
     } else if (playedLastItem && this.isInterstitial(currentItem)) {
       // Maintain playingItem state at end of schedule (setSchedulePosition(-1) called to end program)
       // this allows onSeeking handler to update schedule position
+      this.endedItem = null;
       this.playingItem = currentItem;
       if (!currentItem.event.appendInPlace) {
         // Media must be re-attached to resume primary schedule if not sharing source
@@ -1199,8 +1253,8 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
     fromItem: InterstitialScheduleItem | null,
   ) {
     this.playingItem = scheduledItem;
-    this.playingAsset = null;
-    this.waitingItem = null;
+    this.playingAsset = this.endedAsset = null;
+    this.waitingItem = this.endedItem = null;
 
     this.bufferedToItem(scheduledItem);
 
@@ -1345,7 +1399,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
     this.mediaSelection = currentSelection;
     this.schedule.parseInterstitialDateRanges(currentSelection);
 
-    if (!this.playingItem && this.schedule.items) {
+    if (!this.effectivePlayingItem && this.schedule.items) {
       this.checkStart();
     }
   }
@@ -1420,7 +1474,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
     event: Events.BUFFER_FLUSHED,
     data: BufferFlushedData,
   ) {
-    const { playingItem } = this;
+    const playingItem = this.playingItem;
     if (
       playingItem &&
       !this.itemsMatch(playingItem, this.bufferingItem) &&
@@ -1519,7 +1573,12 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
       const updatedPlayingItem = this.updateItem(playingItem, this.timelinePos);
       if (this.itemsMatch(playingItem, updatedPlayingItem)) {
         this.playingItem = updatedPlayingItem;
+        this.waitingItem = this.endedItem = null;
       }
+    } else {
+      // Clear waitingItem if it has been removed from the schedule
+      this.waitingItem = this.updateItem(this.waitingItem);
+      this.endedItem = this.updateItem(this.endedItem);
     }
     // Do not replace Interstitial bufferingItem without a match - used for transfering media element or source
     const bufferingItem = this.bufferingItem;
@@ -1536,8 +1595,6 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
         this.clearInterstitial(bufferingItem.event, null);
       }
     }
-    // Clear waitingItem if it has been removed from the schedule
-    this.waitingItem = this.updateItem(this.waitingItem);
 
     removedInterstitials.forEach((interstitial) => {
       interstitial.assetList.forEach((asset) => {
@@ -1727,7 +1784,12 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
       if (!this.playbackDisabled) {
         if (isInterstitial) {
           // primary fragment loading will exit early in base-stream-controller while `bufferingItem` is set to an Interstitial block
-          this.playerQueue.forEach((player) => player.resumeBuffering());
+          item.event.assetList.forEach((asset) => {
+            const player = this.getAssetPlayer(asset.identifier);
+            if (player) {
+              player.resumeBuffering();
+            }
+          });
         } else {
           this.hls.resumeBuffering();
           this.playerQueue.forEach((player) => player.pauseBuffering());
@@ -1815,7 +1877,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
       );
       const timelineStart = interstitial.timelineStart;
       if (interstitial.appendInPlace) {
-        this.flushFrontBuffer(timelineStart);
+        this.flushFrontBuffer(timelineStart + 0.25);
       }
       const uri = interstitial.assetUrl;
       if (uri) {
@@ -2181,6 +2243,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
     const assetListLength = interstitial.assetList.length;
 
     const playingAsset = this.playingAsset;
+    this.endedAsset = null;
     this.playingAsset = assetItem;
     if (!playingAsset || playingAsset.identifier !== assetId) {
       if (playingAsset) {
@@ -2194,7 +2257,6 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
       this.log(
         `INTERSTITIAL_ASSET_STARTED ${assetListIndex + 1}/${assetListLength} ${player}`,
       );
-      // player.resumeBuffering();
       this.hls.trigger(Events.INTERSTITIAL_ASSET_STARTED, {
         asset: assetItem,
         assetListIndex,
@@ -2317,7 +2379,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
   private primaryFallback(interstitial: InterstitialEvent) {
     // Fallback to Primary by on current or future events by updating schedule to skip errored interstitials/assets
     const flushStart = interstitial.timelineStart;
-    const playingItem = this.playingItem || this.waitingItem;
+    const playingItem = this.effectivePlayingItem;
     // Update schedule now that interstitial/assets are flagged with `error` for fallback
     this.updateSchedule();
     if (playingItem) {

package/src/controller/stream-controller.ts

@@ -160,7 +160,7 @@ export default class StreamController
         // hls.nextLoadLevel remains until it is set to a new value or until a new frag is successfully loaded
         hls.nextLoadLevel = startLevel;
         this.level = hls.loadLevel;
-        this._hasEnoughToStart = false;
+        this._hasEnoughToStart = !!skipSeekToStartPosition;
       }
       // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime
       if (
@@ -975,7 +975,7 @@ export default class StreamController
     if (!media) {
       return;
     }
-    if (!this._hasEnoughToStart && media.buffered.length) {
+    if (!this._hasEnoughToStart && BufferHelper.getBuffered(media).length) {
       this._hasEnoughToStart = true;
       this.seekToStartPos();
     }
@@ -1015,13 +1015,15 @@ export default class StreamController
           this.state = State.IDLE;
         }
         break;
+      case ErrorDetails.BUFFER_ADD_CODEC_ERROR:
       case ErrorDetails.BUFFER_APPEND_ERROR:
-      case ErrorDetails.BUFFER_FULL_ERROR:
-        if (!data.parent || data.parent !== 'main') {
+        if (data.parent !== 'main') {
           return;
         }
-        if (data.details === ErrorDetails.BUFFER_APPEND_ERROR) {
-          this.resetLoadingState();
+        this.resetLoadingState();
+        break;
+      case ErrorDetails.BUFFER_FULL_ERROR:
+        if (data.parent !== 'main') {
           return;
         }
         if (this.reduceLengthAndFlushBuffer(data)) {
@@ -1416,7 +1418,7 @@ export default class StreamController
         );
       }
       audio.levelCodec = audioCodec;
-      audio.id = 'main';
+      audio.id = PlaylistLevelType.MAIN;
       this.log(
         `Init audio buffer, container:${
           audio.container
@@ -1428,7 +1430,7 @@ export default class StreamController
     }
     if (video) {
       video.levelCodec = currentLevel.videoCodec;
-      video.id = 'main';
+      video.id = PlaylistLevelType.MAIN;
       const parsedVideoCodec = video.codec;
       if (parsedVideoCodec?.length === 4) {
         // Make up for passthrough-remuxer not being able to parse full codec
@@ -1490,10 +1492,12 @@ export default class StreamController
   }
 
   public getMainFwdBufferInfo(): BufferInfo | null {
-    return this.getFwdBufferInfo(
-      this.mediaBuffer ? this.mediaBuffer : this.media,
-      PlaylistLevelType.MAIN,
-    );
+    // Observe video SourceBuffer (this.mediaBuffer) only when alt-audio is used, otherwise observe combined media buffer
+    const bufferOutput =
+      this.mediaBuffer && this.altAudio === AlternateAudio.SWITCHED
+        ? this.mediaBuffer
+        : this.media;
+    return this.getFwdBufferInfo(bufferOutput, PlaylistLevelType.MAIN);
   }
 
   public get maxBufferLength(): number {

package/src/define-plugin.d.ts

@@ -9,7 +9,7 @@ declare const __USE_CONTENT_STEERING__: boolean;
 declare const __USE_VARIABLE_SUBSTITUTION__: boolean;
 declare const __USE_M2TS_ADVANCED_CODECS__: boolean;
 declare const __USE_MEDIA_CAPABILITIES__: boolean;
-declare const __USE_INTERSTITALS__: boolean;
+declare const __USE_INTERSTITIALS__: boolean;
 
 // __IN_WORKER__ is provided from a closure call around the final UMD bundle.
 declare const __IN_WORKER__: boolean;

package/src/hls.ts

@@ -1324,7 +1324,10 @@ export type {
   ErrorActionFlags,
   IErrorAction,
 } from './controller/error-controller';
-export type { HlsAssetPlayer } from './controller/interstitial-player';
+export type {
+  HlsAssetPlayer,
+  InterstitialPlayer,
+} from './controller/interstitial-player';
 export type { PlayheadTimes } from './controller/interstitials-controller';
 export type {
   InterstitialScheduleDurations,

package/src/loader/interstitial-event.ts

@@ -38,8 +38,8 @@ export type InterstitialAssetItem = {
   parentIdentifier: InterstitialId;
   identifier: InterstitialAssetId;
   duration: number | null;
-  startOffset: number;
-  timelineStart: number;
+  startOffset: number; // asset start offset from start of interstitial event
+  timelineStart: number; // asset start on media element timeline
   uri: string;
   error?: Error;
 };

package/src/utils/codecs.ts

@@ -1,4 +1,9 @@
 import { getMediaSource } from './mediasource-helper';
+import { isHEVC } from './mp4-tools';
+
+export const userAgentHevcSupportIsInaccurate = () => {
+  return /\(Windows.+Firefox\//i.test(navigator.userAgent);
+};
 
 // from http://mp4ra.org/codecs.html
 // values indicate codec selection preference (lower is higher priority)
@@ -121,8 +126,12 @@ export function videoCodecPreferenceValue(
 }
 
 export function codecsSetSelectionPreferenceValue(codecSet: string): number {
+  const limitedHevcSupport = userAgentHevcSupportIsInaccurate();
   return codecSet.split(',').reduce((num, fourCC) => {
-    const preferenceValue = sampleEntryCodesISO.video[fourCC];
+    const lowerPriority = limitedHevcSupport && isHEVC(fourCC);
+    const preferenceValue = lowerPriority
+      ? 9
+      : sampleEntryCodesISO.video[fourCC];
     if (preferenceValue) {
       return (preferenceValue * 2 + num) / (num ? 3 : 2);
     }
@@ -272,3 +281,7 @@ export function getM2TSSupportedAudioTypes(
       : false,
   };
 }
+
+export function getCodecsForMimeType(mimeType: string): string {
+  return mimeType.replace(/^.+codecs=["']?([^"']+).*$/, '$1');
+}