hls.js 1.4.5 → 1.4.7

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.5");
+        exportedLogger.log("Debug logs enabled for \"" + id + "\" in hls.js version " + "1.4.7");
       } catch (e) {
         exportedLogger = fakeLogger;
       }
@@ -5773,14 +5773,17 @@
           var _data$frag, _data$context2;
           // Search for next level to retry
           var nextLevel = -1;
-          var levels = hls.levels;
+          var levels = hls.levels,
+            loadLevel = hls.loadLevel,
+            minAutoLevel = hls.minAutoLevel,
+            maxAutoLevel = hls.maxAutoLevel;
           var fragErrorType = (_data$frag = data.frag) == null ? void 0 : _data$frag.type;
           var _ref = (_data$context2 = data.context) != null ? _data$context2 : {},
             playlistErrorType = _ref.type,
             playlistErrorGroupId = _ref.groupId;
           for (var i = levels.length; i--;) {
-            var candidate = (i + hls.loadLevel) % levels.length;
-            if (candidate !== hls.loadLevel && levels[candidate].loadError === 0) {
+            var candidate = (i + loadLevel) % levels.length;
+            if (candidate !== loadLevel && candidate >= minAutoLevel && candidate <= maxAutoLevel && levels[candidate].loadError === 0) {
               var levelCandidate = levels[candidate];
               // Skip level switch if GAP tag is found in next level at same position
               if (data.details === ErrorDetails.FRAG_GAP && data.frag) {
@@ -9658,6 +9661,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;
       }
@@ -18027,14 +18032,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;
         }
@@ -18228,17 +18226,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;
         }
@@ -18248,8 +18243,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];
           }
@@ -18260,6 +18256,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);
@@ -21639,7 +21643,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;
@@ -21663,6 +21667,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;
       }
@@ -22153,7 +22161,7 @@
       this.captionsTracks = {};
       this.nonNativeCaptionsTracks = {};
       this.textTracks = [];
-      this.unparsedVttFrags = this.unparsedVttFrags || [];
+      this.unparsedVttFrags = [];
       this.initPTS = [];
       if (this.cea608Parser1 && this.cea608Parser2) {
         this.cea608Parser1.reset();
@@ -22295,24 +22303,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);
@@ -22331,7 +22324,7 @@
             if (trackPlaylistMedia && trackPlaylistMedia.textCodec === IMSC1_CODEC) {
               this._parseIMSC1(frag, payload);
             } else {
-              this._parseVTTs(frag, payload, vttCCs);
+              this._parseVTTs(data);
             }
           }
         } else {
@@ -22362,22 +22355,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,
@@ -22428,10 +22439,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);
       }
     };
@@ -24622,6 +24629,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 () {
@@ -26252,7 +26260,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.4.5";
+        return "1.4.7";
       }
     }, {
       key: "Events",