hls.js 1.4.6 → 1.4.8

package/dist/hls.js

@@ -539,7 +539,7 @@
       // 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;
       }
@@ -9642,10 +9642,8 @@
         retryCount = _ref2$retryCount === void 0 ? 0 : _ref2$retryCount,
         retryConfig = _ref2.retryConfig;
       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);
         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");
         errorAction.resolved = true;
@@ -9661,6 +9659,8 @@
         } 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;
       }
@@ -9743,9 +9743,10 @@
       }
     };
     _proto.resetWhenMissingContext = function 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();
     };
     _proto.removeUnbufferedFrags = function removeUnbufferedFrags(start) {
@@ -9821,7 +9822,10 @@
     };
     _proto.recoverWorkerError = function recoverWorkerError(data) {
       if (data.event === 'demuxerWorker') {
+        var _ref3, _this$levelLastLoaded3, _this$fragCurrent3;
+        this.fragmentTracker.removeAllFragments();
         this.resetTransmuxer();
+        this.resetStartWhenNotLoaded((_ref3 = (_this$levelLastLoaded3 = this.levelLastLoaded) != null ? _this$levelLastLoaded3 : (_this$fragCurrent3 = this.fragCurrent) == null ? void 0 : _this$fragCurrent3.level) != null ? _ref3 : 0);
         this.resetLoadingState();
       }
     };
@@ -16157,6 +16161,7 @@
       }
 
       // Avoid buffering if backtracking this fragment
+      var notFirstFragment = frag.sn !== (details == null ? void 0 : details.startSN);
       if (video && remuxResult.independent !== false) {
         if (details) {
           var startPTS = video.startPTS,
@@ -16180,7 +16185,7 @@
               var bufferInfo = this.getMainFwdBufferInfo();
               var targetBufferTime = (bufferInfo ? bufferInfo.end : this.getLoadPosition()) + this.config.maxBufferHole;
               var startTime = video.firstKeyFramePTS ? video.firstKeyFramePTS : startPTS;
-              if (targetBufferTime < startTime - this.config.maxBufferHole) {
+              if (notFirstFragment && targetBufferTime < startTime - this.config.maxBufferHole) {
                 this.backtrack(frag);
                 return;
               }
@@ -16194,7 +16199,7 @@
           }
           this.bufferFragmentData(video, frag, part, chunkMeta);
         }
-      } else if (remuxResult.independent === false) {
+      } else if (notFirstFragment && remuxResult.independent === false) {
         this.backtrack(frag);
         return;
       }
@@ -18030,14 +18035,7 @@
       var startOffset = data.startOffset,
         endOffset = data.endOffset;
       if (startOffset === 0 && endOffset !== Number.POSITIVE_INFINITY) {
-        var currentTrackId = this.currentTrackId,
-          levels = this.levels;
-        if (!levels.length || !levels[currentTrackId] || !levels[currentTrackId].details) {
-          return;
-        }
-        var trackDetails = levels[currentTrackId].details;
-        var targetDuration = trackDetails.targetduration;
-        var endOffsetSubtitles = endOffset - targetDuration;
+        var endOffsetSubtitles = endOffset - 1;
         if (endOffsetSubtitles <= 0) {
           return;
         }
@@ -18231,17 +18229,14 @@
         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
-        var trackDetails = track.details;
-        var targetDuration = trackDetails.targetduration;
         var config = this.config;
         var currentTime = this.getLoadPosition();
-        var bufferedInfo = BufferHelper.bufferedInfo(this.tracksBuffered[this.currentTrackId] || [], currentTime - targetDuration, config.maxBufferHole);
+        var bufferedInfo = BufferHelper.bufferedInfo(this.tracksBuffered[this.currentTrackId] || [], currentTime, config.maxBufferHole);
         var targetBufferTime = bufferedInfo.end,
           bufferLen = bufferedInfo.len;
         var mainBufferInfo = this.getFwdBufferInfo(this.media, PlaylistLevelType.MAIN);
-        var maxBufLen = this.getMaxBufferLength(mainBufferInfo == null ? void 0 : mainBufferInfo.len) + targetDuration;
+        var trackDetails = track.details;
+        var maxBufLen = this.getMaxBufferLength(mainBufferInfo == null ? void 0 : mainBufferInfo.len) + trackDetails.levelTargetDuration;
         if (bufferLen > maxBufLen) {
           return;
         }
@@ -18251,8 +18246,9 @@
         var foundFrag = null;
         var fragPrevious = this.fragPrevious;
         if (targetBufferTime < end) {
-          var maxFragLookUpTolerance = config.maxFragLookUpTolerance;
-          foundFrag = findFragmentByPTS(fragPrevious, fragments, Math.max(fragments[0].start, targetBufferTime), maxFragLookUpTolerance);
+          var tolerance = config.maxFragLookUpTolerance;
+          var 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];
           }
@@ -18263,6 +18259,14 @@
           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
+          var curSNIdx = foundFrag.sn - trackDetails.startSN;
+          var 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);
@@ -21642,7 +21646,7 @@
     // Uint8Array.prototype.reduce is not implemented in IE11
     var vttLines = utf8ArrayToStr(new Uint8Array(vttByteArray)).trim().replace(LINEBREAKS, '\n').split('\n');
     var cues = [];
-    var init90kHz = toMpegTsClockFromTimescale(initPTS.baseTime, initPTS.timescale);
+    var init90kHz = initPTS ? toMpegTsClockFromTimescale(initPTS.baseTime, initPTS.timescale) : 0;
     var cueTime = '00:00.000';
     var timestampMapMPEGTS = 0;
     var timestampMapLOCAL = 0;
@@ -21666,6 +21670,10 @@
         }
       }
       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;
       }
@@ -22156,7 +22164,7 @@
       this.captionsTracks = {};
       this.nonNativeCaptionsTracks = {};
       this.textTracks = [];
-      this.unparsedVttFrags = this.unparsedVttFrags || [];
+      this.unparsedVttFrags = [];
       this.initPTS = [];
       if (this.cea608Parser1 && this.cea608Parser2) {
         this.cea608Parser1.reset();
@@ -22298,24 +22306,9 @@
     _proto.onFragLoaded = function onFragLoaded(event, data) {
       var frag = data.frag,
         payload = data.payload;
-      var initPTS = this.initPTS,
-        unparsedVttFrags = this.unparsedVttFrags;
       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: frag,
-                error: new Error('Missing initial subtitle PTS')
-              });
-            }
-            return;
-          }
           var decryptData = frag.decryptdata;
           // fragment after decryption has a stats object
           var decrypted = ('stats' in data);
@@ -22334,7 +22327,7 @@
             if (trackPlaylistMedia && trackPlaylistMedia.textCodec === IMSC1_CODEC) {
               this._parseIMSC1(frag, payload);
             } else {
-              this._parseVTTs(frag, payload, vttCCs);
+              this._parseVTTs(data);
             }
           }
         } else {
@@ -22365,22 +22358,40 @@
         });
       });
     };
-    _proto._parseVTTs = function _parseVTTs(frag, payload, vttCCs) {
+    _proto._parseVTTs = function _parseVTTs(data) {
       var _frag$initSegment,
         _this5 = this;
+      var frag = data.frag,
+        payload = data.payload;
+      // We need an initial synchronisation PTS. Store fragments as long as none has arrived
+      var initPTS = this.initPTS,
+        unparsedVttFrags = this.unparsedVttFrags;
+      var maxAvCC = initPTS.length - 1;
+      if (!initPTS[frag.cc] && maxAvCC === -1) {
+        unparsedVttFrags.push(data);
+        return;
+      }
       var hls = this.hls;
       // Parse the WebVTT file contents.
       var 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, function (cues) {
+      parseWebVTT(payloadWebVTT, this.initPTS[frag.cc], this.vttCCs, frag.cc, frag.start, function (cues) {
         _this5._appendCues(cues, frag.level);
         hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
           success: true,
           frag: frag
         });
       }, function (error) {
-        _this5._fallbackToIMSC1(frag, payload);
+        var missingInitPTS = error.message === 'Missing initPTS for VTT MPEGTS';
+        if (missingInitPTS) {
+          unparsedVttFrags.push(data);
+        } else {
+          _this5._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,
@@ -22431,10 +22442,6 @@
     _proto.onFragDecrypted = function onFragDecrypted(event, data) {
       var frag = data.frag;
       if (frag.type === PlaylistLevelType.SUBTITLE) {
-        if (!this.initPTS[frag.cc]) {
-          this.unparsedVttFrags.push(data);
-          return;
-        }
         this.onFragLoaded(Events.FRAG_LOADED, data);
       }
     };
@@ -24625,6 +24632,7 @@
       var stats = this.stats;
       stats.loading.first = 0;
       stats.loaded = 0;
+      stats.aborted = false;
       var xhrSetup = this.xhrSetup;
       if (xhrSetup) {
         Promise.resolve().then(function () {
@@ -26255,7 +26263,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.4.6";
+        return "1.4.8";
       }
     }, {
       key: "Events",