hls.js 1.6.0-beta.1.0.canary.10765 → 1.6.0-beta.1.0.canary.10767

package/dist/hls.mjs

@@ -400,7 +400,7 @@ function enableLogs(debugConfig, context, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10765"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10767"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -3729,6 +3729,10 @@ class BaseSegment {
     elementaryStreams[ElementaryStreamTypes.AUDIOVIDEO] = null;
   }
 }
+function isMediaFragment(frag) {
+  return frag.sn !== 'initSegment';
+}
+
 /**
  * Object representing parsed data from an HLS Segment. Found in {@link hls.js#LevelDetails.fragments}.
  */
@@ -3882,7 +3886,7 @@ class Fragment extends BaseSegment {
     this._programDateTime = value;
   }
   get ref() {
-    if (this.sn === 'initSegment') {
+    if (!isMediaFragment(this)) {
       return null;
     }
     if (!this._ref) {
@@ -8466,7 +8470,7 @@ class BaseStreamController extends TaskLoop {
   fragBufferedComplete(frag, part) {
     const media = this.mediaBuffer ? this.mediaBuffer : this.media;
     this.log(`Buffered ${frag.type} sn: ${frag.sn}${part ? ' part: ' + part.index : ''} of ${this.fragInfo(frag, false, part)} > buffer:${media ? TimeRanges.toString(BufferHelper.getBuffered(media)) : '(detached)'})`);
-    if (frag.sn !== 'initSegment') {
+    if (isMediaFragment(frag)) {
       var _this$levels;
       if (frag.type !== PlaylistLevelType.SUBTITLE) {
         const el = frag.elementaryStreams;
@@ -8535,7 +8539,7 @@ class BaseStreamController extends TaskLoop {
       this.keyLoader.loadClear(frag, details.encryptedFragments);
     }
     const fragPrevious = this.fragPrevious;
-    if (frag.sn !== 'initSegment' && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
+    if (isMediaFragment(frag) && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
       const shouldLoadParts = this.shouldLoadParts(level.details, frag.end);
       if (shouldLoadParts !== this.loadingParts) {
         this.log(`LL-Part loading ${shouldLoadParts ? 'ON' : 'OFF'} loading sn ${fragPrevious == null ? void 0 : fragPrevious.sn}->${frag.sn}`);
@@ -8543,7 +8547,7 @@ class BaseStreamController extends TaskLoop {
       }
     }
     targetBufferTime = Math.max(frag.start, targetBufferTime || 0);
-    if (this.loadingParts && frag.sn !== 'initSegment') {
+    if (this.loadingParts && isMediaFragment(frag)) {
       const partList = details.partList;
       if (partList && progressCallback) {
         if (targetBufferTime > frag.end && details.fragmentHint) {
@@ -8582,7 +8586,7 @@ class BaseStreamController extends TaskLoop {
         }
       }
     }
-    if (frag.sn !== 'initSegment' && this.loadingParts) {
+    if (isMediaFragment(frag) && this.loadingParts) {
       this.log(`LL-Part loading OFF after next part miss @${targetBufferTime.toFixed(2)}`);
       this.loadingParts = false;
     } else if (!frag.url) {
@@ -9141,7 +9145,7 @@ class BaseStreamController extends TaskLoop {
     return pos;
   }
   handleFragLoadAborted(frag, part) {
-    if (this.transmuxer && frag.sn !== 'initSegment' && frag.stats.aborted) {
+    if (this.transmuxer && isMediaFragment(frag) && frag.stats.aborted) {
       this.warn(`Fragment ${frag.sn}${part ? ' part ' + part.index : ''} of level ${frag.level} was aborted`);
       this.resetFragmentLoading(frag);
     }
@@ -9176,10 +9180,18 @@ class BaseStreamController extends TaskLoop {
     const errorAction = data.errorAction;
     const {
       action,
+      flags,
       retryCount = 0,
       retryConfig
     } = errorAction || {};
-    if (errorAction && action === NetworkErrorAction.RetryRequest && retryConfig) {
+    const couldRetry = !!errorAction && !!retryConfig;
+    const retry = couldRetry && action === NetworkErrorAction.RetryRequest;
+    const noAlternate = couldRetry && !errorAction.resolved && flags === ErrorActionFlags.MoveAllAlternatesMatchingHost;
+    if (!retry && noAlternate && isMediaFragment(frag) && !frag.endList) {
+      this.resetFragmentErrors(filterType);
+      this.treatAsGap(frag);
+      errorAction.resolved = true;
+    } else if ((retry || noAlternate) && retryCount < retryConfig.maxNumRetry) {
       this.resetStartWhenNotLoaded(this.levelLastLoaded);
       const delay = getRetryDelay(retryConfig, retryCount);
       this.warn(`Fragment ${frag.sn} of ${filterType} ${frag.level} errored with ${data.details}, retrying loading ${retryCount + 1}/${retryConfig.maxNumRetry} in ${delay}ms`);
@@ -9197,7 +9209,7 @@ class BaseStreamController extends TaskLoop {
         this.warn(`${data.details} reached or exceeded max retry (${retryCount})`);
         return;
       }
-    } else if ((errorAction == null ? void 0 : errorAction.action) === NetworkErrorAction.SendAlternateToPenaltyBox) {
+    } else if (action === NetworkErrorAction.SendAlternateToPenaltyBox) {
       this.state = State.WAITING_LEVEL;
     } else {
       this.state = State.ERROR;
@@ -9329,10 +9341,7 @@ class BaseStreamController extends TaskLoop {
       const error = new Error(`Found no media in fragment ${frag.sn} of level ${frag.level} resetting transmuxer to fallback to playlist timing`);
       if (level.fragmentError === 0) {
         // Mark and track the odd empty segment as a gap to avoid reloading
-        level.fragmentError++;
-        frag.gap = true;
-        this.fragmentTracker.removeFragment(frag);
-        this.fragmentTracker.fragBuffered(frag, true);
+        this.treatAsGap(frag, level);
       }
       this.warn(error.message);
       this.hls.trigger(Events.ERROR, {
@@ -9363,6 +9372,14 @@ class BaseStreamController extends TaskLoop {
     var _ref, _ref2;
     return `${this.playlistLabel()} ${frag.level} (${part ? 'part' : 'frag'}:[${((_ref = pts && !part ? frag.startPTS : (part || frag).start) != null ? _ref : NaN).toFixed(3)}-${((_ref2 = pts && !part ? frag.endPTS : (part || frag).end) != null ? _ref2 : NaN).toFixed(3)}]${part && frag.type === 'main' ? 'INDEPENDENT=' + (part.independent ? 'YES' : 'NO') : ''}`;
   }
+  treatAsGap(frag, level) {
+    if (level) {
+      level.fragmentError++;
+    }
+    frag.gap = true;
+    this.fragmentTracker.removeFragment(frag);
+    this.fragmentTracker.fragBuffered(frag, true);
+  }
   resetTransmuxer() {
     var _this$transmuxer2;
     (_this$transmuxer2 = this.transmuxer) == null ? void 0 : _this$transmuxer2.reset();
@@ -9774,7 +9791,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10765";
+const version = "1.6.0-beta.1.0.canary.10767";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -16337,7 +16354,7 @@ class AudioStreamController extends BaseStreamController {
 
     // Request audio segments up to one fragment ahead of main stream-controller
     const mainFragLoading = (_this$mainFragLoading = this.mainFragLoading) == null ? void 0 : _this$mainFragLoading.frag;
-    if (this.startFragRequested && mainFragLoading && mainFragLoading.sn !== 'initSegment' && frag.sn !== 'initSegment' && !frag.endList && (!trackDetails.live || !this.loadingParts && targetBufferTime < this.hls.liveSyncPosition)) {
+    if (this.startFragRequested && mainFragLoading && isMediaFragment(mainFragLoading) && isMediaFragment(frag) && !frag.endList && (!trackDetails.live || !this.loadingParts && targetBufferTime < this.hls.liveSyncPosition)) {
       let mainFrag = mainFragLoading;
       if (frag.start > mainFrag.end) {
         // Get buffered frag at target position from tracker (loaded out of sequence)
@@ -16549,7 +16566,7 @@ class AudioStreamController extends BaseStreamController {
     }
   }
   onFragLoading(event, data) {
-    if (data.frag.type === PlaylistLevelType.MAIN && data.frag.sn !== 'initSegment') {
+    if (data.frag.type === PlaylistLevelType.MAIN && isMediaFragment(data.frag)) {
       this.mainFragLoading = data;
       if (this.state === State.IDLE) {
         this.tick();
@@ -16570,7 +16587,7 @@ class AudioStreamController extends BaseStreamController {
       this.warn(`Fragment ${frag.sn}${part ? ' p: ' + part.index : ''} of level ${frag.level} finished buffering, but was aborted. state: ${this.state}, audioSwitch: ${this.switchingTrack ? this.switchingTrack.name : 'false'}`);
       return;
     }
-    if (frag.sn !== 'initSegment') {
+    if (isMediaFragment(frag)) {
       this.fragPrevious = frag;
       const track = this.switchingTrack;
       if (track) {
@@ -16782,7 +16799,7 @@ class AudioStreamController extends BaseStreamController {
     // we force a frag loading in audio switch as fragment tracker might not have evicted previous frags in case of quick audio switch
     if (this.switchingTrack || fragState === FragmentState.NOT_LOADED || fragState === FragmentState.PARTIAL) {
       var _track$details2;
-      if (frag.sn === 'initSegment') {
+      if (!isMediaFragment(frag)) {
         this._loadInitSegment(frag, track);
       } else if ((_track$details2 = track.details) != null && _track$details2.live && !this.initPTS[frag.cc]) {
         this.log(`Waiting for video PTS in continuity counter ${frag.cc} of live stream before loading audio fragment ${frag.sn} of level ${this.trackId}`);
@@ -25267,7 +25284,7 @@ class SubtitleStreamController extends BaseStreamController {
       frag,
       success
     } = data;
-    if (frag.sn !== 'initSegment') {
+    if (isMediaFragment(frag)) {
       this.fragPrevious = frag;
     }
     this.state = State.IDLE;
@@ -25544,7 +25561,7 @@ class SubtitleStreamController extends BaseStreamController {
         return;
       }
       foundFrag = this.mapToInitFragWhenRequired(foundFrag);
-      if (foundFrag.sn !== 'initSegment') {
+      if (isMediaFragment(foundFrag)) {
         // Load earlier fragment in same discontinuity to make up for misaligned playlists and cues that extend beyond end of segment
         const curSNIdx = foundFrag.sn - trackDetails.startSN;
         const prevFrag = fragments[curSNIdx - 1];
@@ -25559,7 +25576,7 @@ class SubtitleStreamController extends BaseStreamController {
     }
   }
   loadFragment(frag, level, targetBufferTime) {
-    if (frag.sn === 'initSegment') {
+    if (!isMediaFragment(frag)) {
       this._loadInitSegment(frag, level);
     } else {
       super.loadFragment(frag, level, targetBufferTime);
@@ -31254,7 +31271,7 @@ class StreamController extends BaseStreamController {
     const targetBufferTime = this.backtrackFragment ? this.backtrackFragment.start : bufferInfo.end;
     let frag = this.getNextFragment(targetBufferTime, levelDetails);
     // Avoid backtracking by loading an earlier segment in streams with segments that do not start with a key frame (flagged by `couldBacktrack`)
-    if (this.couldBacktrack && !this.fragPrevious && frag && frag.sn !== 'initSegment' && this.fragmentTracker.getState(frag) !== FragmentState.OK) {
+    if (this.couldBacktrack && !this.fragPrevious && frag && isMediaFragment(frag) && this.fragmentTracker.getState(frag) !== FragmentState.OK) {
       var _this$backtrackFragme;
       const backtrackSn = ((_this$backtrackFragme = this.backtrackFragment) != null ? _this$backtrackFragme : frag).sn;
       const fragIdx = backtrackSn - levelDetails.startSN;
@@ -31291,7 +31308,7 @@ class StreamController extends BaseStreamController {
     // Check if fragment is not loaded
     const fragState = this.fragmentTracker.getState(frag);
     if (fragState === FragmentState.NOT_LOADED || fragState === FragmentState.PARTIAL) {
-      if (frag.sn === 'initSegment') {
+      if (!isMediaFragment(frag)) {
         this._loadInitSegment(frag, level);
       } else if (this.bitrateTest) {
         this.log(`Fragment ${frag.sn} of level ${frag.level} is being downloaded to test bitrate and will not be buffered`);
@@ -31717,7 +31734,7 @@ class StreamController extends BaseStreamController {
       }
       const stats = part ? part.stats : frag.stats;
       this.fragLastKbps = Math.round(8 * stats.total / (stats.buffering.end - stats.loading.first));
-      if (frag.sn !== 'initSegment') {
+      if (isMediaFragment(frag)) {
         this.fragPrevious = frag;
       }
       this.fragBufferedComplete(frag, part);
@@ -33343,6 +33360,10 @@ class Hls {
       return;
     }
     this.logger.log(`attachMedia`);
+    if (this._media) {
+      this.logger.warn(`media must be detached before attaching`);
+      this.detachMedia();
+    }
     const attachMediaSource = 'media' in data;
     const media = attachMediaSource ? data.media : data;
     const attachingData = attachMediaSource ? data : {