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

package/dist/hls.d.mts

@@ -376,6 +376,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     private updateLevelTiming;
     private playlistLabel;
     private fragInfo;
+    private treatAsGap;
     protected resetTransmuxer(): void;
     protected recoverWorkerError(data: ErrorData): void;
     set state(nextState: string);

package/dist/hls.d.ts

@@ -376,6 +376,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     private updateLevelTiming;
     private playlistLabel;
     private fragInfo;
+    private treatAsGap;
     protected resetTransmuxer(): void;
     protected recoverWorkerError(data: ErrorData): void;
     set state(nextState: string);

package/dist/hls.js

@@ -1057,7 +1057,7 @@
       // 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();
@@ -4321,6 +4321,10 @@
       }
     }]);
   }();
+  function isMediaFragment(frag) {
+    return frag.sn !== 'initSegment';
+  }
+
   /**
    * Object representing parsed data from an HLS Segment. Found in {@link hls.js#LevelDetails.fragments}.
    */
@@ -4541,7 +4545,7 @@
     }, {
       key: "ref",
       get: function get() {
-        if (this.sn === 'initSegment') {
+        if (!isMediaFragment(this)) {
           return null;
         }
         if (!this._ref) {
@@ -9196,7 +9200,7 @@
     _proto.fragBufferedComplete = function fragBufferedComplete(frag, part) {
       var 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) {
           var el = frag.elementaryStreams;
@@ -9270,7 +9274,7 @@
         this.keyLoader.loadClear(frag, details.encryptedFragments);
       }
       var fragPrevious = this.fragPrevious;
-      if (frag.sn !== 'initSegment' && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
+      if (isMediaFragment(frag) && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
         var 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);
@@ -9278,7 +9282,7 @@
         }
       }
       targetBufferTime = Math.max(frag.start, targetBufferTime || 0);
-      if (this.loadingParts && frag.sn !== 'initSegment') {
+      if (this.loadingParts && isMediaFragment(frag)) {
         var partList = details.partList;
         if (partList && progressCallback) {
           if (targetBufferTime > frag.end && details.fragmentHint) {
@@ -9321,7 +9325,7 @@
           }
         }
       }
-      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) {
@@ -9863,7 +9867,7 @@
       return pos;
     };
     _proto.handleFragLoadAborted = function 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);
       }
@@ -9898,10 +9902,18 @@
       var errorAction = data.errorAction;
       var _ref2 = errorAction || {},
         action = _ref2.action,
+        flags = _ref2.flags,
         _ref2$retryCount = _ref2.retryCount,
         retryCount = _ref2$retryCount === void 0 ? 0 : _ref2$retryCount,
         retryConfig = _ref2.retryConfig;
-      if (errorAction && action === NetworkErrorAction.RetryRequest && retryConfig) {
+      var couldRetry = !!errorAction && !!retryConfig;
+      var retry = couldRetry && action === NetworkErrorAction.RetryRequest;
+      var 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);
         var 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");
@@ -9919,7 +9931,7 @@
           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;
@@ -10055,10 +10067,7 @@
         var 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, {
@@ -10092,6 +10101,14 @@
       }
       return this.playlistLabel() + " " + frag.level + " (" + (part ? 'part' : 'frag') + ":[" + ((_ref3 = pts && !part ? frag.startPTS : (part || frag).start) != null ? _ref3 : NaN).toFixed(3) + "-" + ((_ref4 = pts && !part ? frag.endPTS : (part || frag).end) != null ? _ref4 : NaN).toFixed(3) + "]" + (part && frag.type === 'main' ? 'INDEPENDENT=' + (part.independent ? 'YES' : 'NO') : '');
     };
+    _proto.treatAsGap = function treatAsGap(frag, level) {
+      if (level) {
+        level.fragmentError++;
+      }
+      frag.gap = true;
+      this.fragmentTracker.removeFragment(frag);
+      this.fragmentTracker.fragBuffered(frag, true);
+    };
     _proto.resetTransmuxer = function resetTransmuxer() {
       var _this$transmuxer2;
       (_this$transmuxer2 = this.transmuxer) == null ? void 0 : _this$transmuxer2.reset();
@@ -16222,7 +16239,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10765";
+  var 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
@@ -16915,7 +16932,7 @@
 
       // Request audio segments up to one fragment ahead of main stream-controller
       var 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)) {
         var mainFrag = mainFragLoading;
         if (frag.start > mainFrag.end) {
           // Get buffered frag at target position from tracker (loaded out of sequence)
@@ -17117,7 +17134,7 @@
       }
     };
     _proto.onFragLoading = function 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();
@@ -17136,7 +17153,7 @@
         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;
         var track = this.switchingTrack;
         if (track) {
@@ -17334,7 +17351,7 @@
       // 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);
@@ -25510,7 +25527,7 @@
     _proto.onSubtitleFragProcessed = function onSubtitleFragProcessed(event, data) {
       var frag = data.frag,
         success = data.success;
-      if (frag.sn !== 'initSegment') {
+      if (isMediaFragment(frag)) {
         this.fragPrevious = frag;
       }
       this.state = State.IDLE;
@@ -25779,7 +25796,7 @@
           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
           var curSNIdx = foundFrag.sn - trackDetails.startSN;
           var prevFrag = fragments[curSNIdx - 1];
@@ -25794,7 +25811,7 @@
       }
     };
     _proto.loadFragment = function loadFragment(frag, level, targetBufferTime) {
-      if (frag.sn === 'initSegment') {
+      if (!isMediaFragment(frag)) {
         this._loadInitSegment(frag, level);
       } else {
         _BaseStreamController.prototype.loadFragment.call(this, frag, level, targetBufferTime);
@@ -32156,7 +32173,7 @@
       var targetBufferTime = this.backtrackFragment ? this.backtrackFragment.start : bufferInfo.end;
       var 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;
         var backtrackSn = ((_this$backtrackFragme = this.backtrackFragment) != null ? _this$backtrackFragme : frag).sn;
         var fragIdx = backtrackSn - levelDetails.startSN;
@@ -32193,7 +32210,7 @@
       // Check if fragment is not loaded
       var 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");
@@ -32603,7 +32620,7 @@
         }
         var 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);
@@ -34198,6 +34215,10 @@
         return;
       }
       this.logger.log("attachMedia");
+      if (this._media) {
+        this.logger.warn("media must be detached before attaching");
+        this.detachMedia();
+      }
       var attachMediaSource = 'media' in data;
       var media = attachMediaSource ? data.media : data;
       var attachingData = attachMediaSource ? data : {

package/dist/hls.js.d.ts

@@ -376,6 +376,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     private updateLevelTiming;
     private playlistLabel;
     private fragInfo;
+    private treatAsGap;
     protected resetTransmuxer(): void;
     protected recoverWorkerError(data: ErrorData): void;
     set state(nextState: string);