hls.js 1.4.6 → 1.4.8

package/dist/hls.mjs

@@ -402,7 +402,7 @@ function enableLogs(debugConfig, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      exportedLogger.log(`Debug logs enabled for "${id}" in hls.js version ${"1.4.6"}`);
+      exportedLogger.log(`Debug logs enabled for "${id}" in hls.js version ${"1.4.8"}`);
     } catch (e) {
       exportedLogger = fakeLogger;
     }
@@ -9320,10 +9320,8 @@ class BaseStreamController extends TaskLoop {
       retryConfig
     } = errorAction || {};
     if (errorAction && action === NetworkErrorAction.RetryRequest && retryConfig) {
-      if (!this.loadedmetadata) {
-        this.startFragRequested = false;
-        this.nextLoadPosition = this.startPosition;
-      }
+      var _this$levelLastLoaded;
+      this.resetStartWhenNotLoaded((_this$levelLastLoaded = this.levelLastLoaded) != null ? _this$levelLastLoaded : frag.level);
       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`);
       errorAction.resolved = true;
@@ -9339,6 +9337,8 @@ class BaseStreamController extends TaskLoop {
       } else {
         logger.warn(`${data.details} reached or exceeded max retry (${retryCount})`);
       }
+    } else if ((errorAction == null ? void 0 : errorAction.action) === NetworkErrorAction.SendAlternateToPenaltyBox) {
+      this.state = State.WAITING_LEVEL;
     } else {
       this.state = State.ERROR;
     }
@@ -9421,9 +9421,10 @@ class BaseStreamController extends TaskLoop {
     }
   }
   resetWhenMissingContext(chunkMeta) {
+    var _this$levelLastLoaded2;
     this.warn(`The loading context changed while buffering fragment ${chunkMeta.sn} of level ${chunkMeta.level}. This chunk will not be buffered.`);
     this.removeUnbufferedFrags();
-    this.resetStartWhenNotLoaded(chunkMeta.level);
+    this.resetStartWhenNotLoaded((_this$levelLastLoaded2 = this.levelLastLoaded) != null ? _this$levelLastLoaded2 : chunkMeta.level);
     this.resetLoadingState();
   }
   removeUnbufferedFrags(start = 0) {
@@ -9495,7 +9496,10 @@ class BaseStreamController extends TaskLoop {
   }
   recoverWorkerError(data) {
     if (data.event === 'demuxerWorker') {
+      var _ref, _this$levelLastLoaded3, _this$fragCurrent3;
+      this.fragmentTracker.removeAllFragments();
       this.resetTransmuxer();
+      this.resetStartWhenNotLoaded((_ref = (_this$levelLastLoaded3 = this.levelLastLoaded) != null ? _this$levelLastLoaded3 : (_this$fragCurrent3 = this.fragCurrent) == null ? void 0 : _this$fragCurrent3.level) != null ? _ref : 0);
       this.resetLoadingState();
     }
   }
@@ -15695,6 +15699,7 @@ class StreamController extends BaseStreamController {
     }
 
     // Avoid buffering if backtracking this fragment
+    const notFirstFragment = frag.sn !== (details == null ? void 0 : details.startSN);
     if (video && remuxResult.independent !== false) {
       if (details) {
         const {
@@ -15720,7 +15725,7 @@ class StreamController extends BaseStreamController {
             const bufferInfo = this.getMainFwdBufferInfo();
             const targetBufferTime = (bufferInfo ? bufferInfo.end : this.getLoadPosition()) + this.config.maxBufferHole;
             const startTime = video.firstKeyFramePTS ? video.firstKeyFramePTS : startPTS;
-            if (targetBufferTime < startTime - this.config.maxBufferHole) {
+            if (notFirstFragment && targetBufferTime < startTime - this.config.maxBufferHole) {
               this.backtrack(frag);
               return;
             }
@@ -15734,7 +15739,7 @@ class StreamController extends BaseStreamController {
         }
         this.bufferFragmentData(video, frag, part, chunkMeta);
       }
-    } else if (remuxResult.independent === false) {
+    } else if (notFirstFragment && remuxResult.independent === false) {
       this.backtrack(frag);
       return;
     }
@@ -17605,16 +17610,7 @@ class SubtitleStreamController extends BaseStreamController {
       endOffset
     } = data;
     if (startOffset === 0 && endOffset !== Number.POSITIVE_INFINITY) {
-      const {
-        currentTrackId,
-        levels
-      } = this;
-      if (!levels.length || !levels[currentTrackId] || !levels[currentTrackId].details) {
-        return;
-      }
-      const trackDetails = levels[currentTrackId].details;
-      const targetDuration = trackDetails.targetduration;
-      const endOffsetSubtitles = endOffset - targetDuration;
+      const endOffsetSubtitles = endOffset - 1;
       if (endOffsetSubtitles <= 0) {
         return;
       }
@@ -17810,21 +17806,18 @@ class SubtitleStreamController extends BaseStreamController {
       if (!levels.length || !track || !track.details) {
         return;
       }
-
-      // Expand range of subs loaded by one target-duration in either direction to make up for misaligned playlists
-      const trackDetails = track.details;
-      const targetDuration = trackDetails.targetduration;
       const {
         config
       } = this;
       const currentTime = this.getLoadPosition();
-      const bufferedInfo = BufferHelper.bufferedInfo(this.tracksBuffered[this.currentTrackId] || [], currentTime - targetDuration, config.maxBufferHole);
+      const bufferedInfo = BufferHelper.bufferedInfo(this.tracksBuffered[this.currentTrackId] || [], currentTime, config.maxBufferHole);
       const {
         end: targetBufferTime,
         len: bufferLen
       } = bufferedInfo;
       const mainBufferInfo = this.getFwdBufferInfo(this.media, PlaylistLevelType.MAIN);
-      const maxBufLen = this.getMaxBufferLength(mainBufferInfo == null ? void 0 : mainBufferInfo.len) + targetDuration;
+      const trackDetails = track.details;
+      const maxBufLen = this.getMaxBufferLength(mainBufferInfo == null ? void 0 : mainBufferInfo.len) + trackDetails.levelTargetDuration;
       if (bufferLen > maxBufLen) {
         return;
       }
@@ -17834,10 +17827,9 @@ class SubtitleStreamController extends BaseStreamController {
       let foundFrag = null;
       const fragPrevious = this.fragPrevious;
       if (targetBufferTime < end) {
-        const {
-          maxFragLookUpTolerance
-        } = config;
-        foundFrag = findFragmentByPTS(fragPrevious, fragments, Math.max(fragments[0].start, targetBufferTime), maxFragLookUpTolerance);
+        const tolerance = config.maxFragLookUpTolerance;
+        const lookupTolerance = targetBufferTime > end - tolerance ? 0 : tolerance;
+        foundFrag = findFragmentByPTS(fragPrevious, fragments, Math.max(fragments[0].start, targetBufferTime), lookupTolerance);
         if (!foundFrag && fragPrevious && fragPrevious.start < fragments[0].start) {
           foundFrag = fragments[0];
         }
@@ -17848,6 +17840,14 @@ class SubtitleStreamController extends BaseStreamController {
         return;
       }
       foundFrag = this.mapToInitFragWhenRequired(foundFrag);
+      if (foundFrag.sn !== 'initSegment') {
+        // 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];
+        if (prevFrag && prevFrag.cc === foundFrag.cc && this.fragmentTracker.getState(prevFrag) === FragmentState.NOT_LOADED) {
+          foundFrag = prevFrag;
+        }
+      }
       if (this.fragmentTracker.getState(foundFrag) === FragmentState.NOT_LOADED) {
         // only load if fragment is not loaded
         this.loadFragment(foundFrag, track, targetBufferTime);
@@ -21191,7 +21191,7 @@ function parseWebVTT(vttByteArray, initPTS, vttCCs, cc, timeOffset, callBack, er
   // Uint8Array.prototype.reduce is not implemented in IE11
   const vttLines = utf8ArrayToStr(new Uint8Array(vttByteArray)).trim().replace(LINEBREAKS, '\n').split('\n');
   const cues = [];
-  const init90kHz = toMpegTsClockFromTimescale(initPTS.baseTime, initPTS.timescale);
+  const init90kHz = initPTS ? toMpegTsClockFromTimescale(initPTS.baseTime, initPTS.timescale) : 0;
   let cueTime = '00:00.000';
   let timestampMapMPEGTS = 0;
   let timestampMapLOCAL = 0;
@@ -21215,6 +21215,10 @@ function parseWebVTT(vttByteArray, initPTS, vttCCs, cc, timeOffset, callBack, er
       }
     }
     if (webVttMpegTsMapOffset) {
+      if (!initPTS) {
+        parsingError = new Error('Missing initPTS for VTT MPEGTS');
+        return;
+      }
       // If we have MPEGTS, offset = presentation time + discontinuity offset
       cueOffset = webVttMpegTsMapOffset - vttCCs.presentationOffset;
     }
@@ -21710,7 +21714,7 @@ class TimelineController {
     this.captionsTracks = {};
     this.nonNativeCaptionsTracks = {};
     this.textTracks = [];
-    this.unparsedVttFrags = this.unparsedVttFrags || [];
+    this.unparsedVttFrags = [];
     this.initPTS = [];
     if (this.cea608Parser1 && this.cea608Parser2) {
       this.cea608Parser1.reset();
@@ -21854,26 +21858,9 @@ class TimelineController {
       frag,
       payload
     } = data;
-    const {
-      initPTS,
-      unparsedVttFrags
-    } = this;
     if (frag.type === PlaylistLevelType.SUBTITLE) {
       // If fragment is subtitle type, parse as WebVTT.
       if (payload.byteLength) {
-        // We need an initial synchronisation PTS. Store fragments as long as none has arrived.
-        if (!initPTS[frag.cc]) {
-          unparsedVttFrags.push(data);
-          if (initPTS.length) {
-            // finish unsuccessfully, otherwise the subtitle-stream-controller could be blocked from loading new frags.
-            this.hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
-              success: false,
-              frag,
-              error: new Error('Missing initial subtitle PTS')
-            });
-          }
-          return;
-        }
         const decryptData = frag.decryptdata;
         // fragment after decryption has a stats object
         const decrypted = ('stats' in data);
@@ -21892,7 +21879,7 @@ class TimelineController {
           if (trackPlaylistMedia && trackPlaylistMedia.textCodec === IMSC1_CODEC) {
             this._parseIMSC1(frag, payload);
           } else {
-            this._parseVTTs(frag, payload, vttCCs);
+            this._parseVTTs(data);
           }
         }
       } else {
@@ -21922,21 +21909,43 @@ class TimelineController {
       });
     });
   }
-  _parseVTTs(frag, payload, vttCCs) {
+  _parseVTTs(data) {
     var _frag$initSegment;
+    const {
+      frag,
+      payload
+    } = data;
+    // We need an initial synchronisation PTS. Store fragments as long as none has arrived
+    const {
+      initPTS,
+      unparsedVttFrags
+    } = this;
+    const maxAvCC = initPTS.length - 1;
+    if (!initPTS[frag.cc] && maxAvCC === -1) {
+      unparsedVttFrags.push(data);
+      return;
+    }
     const hls = this.hls;
     // Parse the WebVTT file contents.
     const payloadWebVTT = (_frag$initSegment = frag.initSegment) != null && _frag$initSegment.data ? appendUint8Array(frag.initSegment.data, new Uint8Array(payload)) : payload;
-    parseWebVTT(payloadWebVTT, this.initPTS[frag.cc], vttCCs, frag.cc, frag.start, cues => {
+    parseWebVTT(payloadWebVTT, this.initPTS[frag.cc], this.vttCCs, frag.cc, frag.start, cues => {
       this._appendCues(cues, frag.level);
       hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
         success: true,
         frag: frag
       });
     }, error => {
-      this._fallbackToIMSC1(frag, payload);
+      const missingInitPTS = error.message === 'Missing initPTS for VTT MPEGTS';
+      if (missingInitPTS) {
+        unparsedVttFrags.push(data);
+      } else {
+        this._fallbackToIMSC1(frag, payload);
+      }
       // Something went wrong while parsing. Trigger event with success false.
       logger.log(`Failed to parse VTT cue: ${error}`);
+      if (missingInitPTS && maxAvCC > frag.cc) {
+        return;
+      }
       hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
         success: false,
         frag: frag,
@@ -21986,10 +21995,6 @@ class TimelineController {
       frag
     } = data;
     if (frag.type === PlaylistLevelType.SUBTITLE) {
-      if (!this.initPTS[frag.cc]) {
-        this.unparsedVttFrags.push(data);
-        return;
-      }
       this.onFragLoaded(Events.FRAG_LOADED, data);
     }
   }
@@ -24122,6 +24127,7 @@ class XhrLoader {
     const stats = this.stats;
     stats.loading.first = 0;
     stats.loaded = 0;
+    stats.aborted = false;
     const xhrSetup = this.xhrSetup;
     if (xhrSetup) {
       Promise.resolve().then(() => {
@@ -24993,7 +24999,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.4.6";
+    return "1.4.8";
   }
 
   /**