hls.js 1.6.0-beta.1.0.canary.10743 → 1.6.0-beta.1.0.canary.10746

package/dist/hls.light.js

@@ -1025,7 +1025,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.10743");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10746");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -3167,17 +3167,21 @@
     AUDIOVIDEO: "audiovideo"
   };
   var BaseSegment = /*#__PURE__*/function () {
-    function BaseSegment(baseurl) {
-      var _this$elementaryStrea;
+    function BaseSegment(base) {
       this._byteRange = null;
       this._url = null;
+      this._stats = null;
+      this._streams = null;
       // baseurl is the URL to the playlist
-      this.baseurl = void 0;
+      this.base = void 0;
       // relurl is the portion of the URL that comes from inside the playlist.
       this.relurl = void 0;
-      // Holds the types of data this fragment supports
-      this.elementaryStreams = (_this$elementaryStrea = {}, _this$elementaryStrea[ElementaryStreamTypes.AUDIO] = null, _this$elementaryStrea[ElementaryStreamTypes.VIDEO] = null, _this$elementaryStrea[ElementaryStreamTypes.AUDIOVIDEO] = null, _this$elementaryStrea);
-      this.baseurl = baseurl;
+      if (typeof base === 'string') {
+        base = {
+          url: base
+        };
+      }
+      this.base = base;
     }
 
     // setByteRange converts a EXT-X-BYTERANGE attribute into a two element array
@@ -3199,9 +3203,14 @@
       elementaryStreams[ElementaryStreamTypes.AUDIOVIDEO] = null;
     };
     return _createClass(BaseSegment, [{
+      key: "baseurl",
+      get: function get() {
+        return this.base.url;
+      }
+    }, {
       key: "byteRange",
       get: function get() {
-        if (!this._byteRange) {
+        if (this._byteRange === null) {
           return [];
         }
         return this._byteRange;
@@ -3216,6 +3225,39 @@
       get: function get() {
         return this.byteRange[1];
       }
+    }, {
+      key: "elementaryStreams",
+      get: function get() {
+        if (this._streams === null) {
+          var _this$_streams;
+          this._streams = (_this$_streams = {}, _this$_streams[ElementaryStreamTypes.AUDIO] = null, _this$_streams[ElementaryStreamTypes.VIDEO] = null, _this$_streams[ElementaryStreamTypes.AUDIOVIDEO] = null, _this$_streams);
+        }
+        return this._streams;
+      },
+      set: function set(value) {
+        this._streams = value;
+      }
+    }, {
+      key: "hasStats",
+      get: function get() {
+        return this._stats !== null;
+      }
+    }, {
+      key: "hasStreams",
+      get: function get() {
+        return this._streams !== null;
+      }
+    }, {
+      key: "stats",
+      get: function get() {
+        if (this._stats === null) {
+          this._stats = new LoadStats();
+        }
+        return this._stats;
+      },
+      set: function set(value) {
+        this._stats = value;
+      }
     }, {
       key: "url",
       get: function get() {
@@ -3235,12 +3277,13 @@
    * Object representing parsed data from an HLS Segment. Found in {@link hls.js#LevelDetails.fragments}.
    */
   var Fragment = /*#__PURE__*/function (_BaseSegment2) {
-    function Fragment(type, baseurl) {
+    function Fragment(type, base) {
       var _this;
-      _this = _BaseSegment2.call(this, baseurl) || this;
+      _this = _BaseSegment2.call(this, base) || this;
       _this._decryptdata = null;
+      _this._programDateTime = null;
+      _this._ref = null;
       _this.rawProgramDateTime = null;
-      _this.programDateTime = null;
       _this.tagList = [];
       // EXTINF has to be present for a m3u8 to be considered valid
       _this.duration = 0;
@@ -3278,8 +3321,6 @@
       _this.maxStartPTS = void 0;
       // The minimum ending Presentation Time Stamp (audio/video PTS) of the fragment. Set after transmux complete.
       _this.minEndPTS = void 0;
-      // Load/parse timing information
-      _this.stats = new LoadStats();
       // Init Segment bytes (unset for media segments)
       _this.data = void 0;
       // A flag indicating whether the segment was downloaded in order to test bitrate, and was not buffered
@@ -3299,6 +3340,21 @@
     }
     _inheritsLoose(Fragment, _BaseSegment2);
     var _proto2 = Fragment.prototype;
+    _proto2.addStart = function addStart(value) {
+      this.setStart(this.start + value);
+    };
+    _proto2.setStart = function setStart(value) {
+      this.start = value;
+      if (this._ref) {
+        this._ref.start = value;
+      }
+    };
+    _proto2.setDuration = function setDuration(value) {
+      this.duration = value;
+      if (this._ref) {
+        this._ref.duration = value;
+      }
+    };
     _proto2.setKeyFormat = function setKeyFormat(keyFormat) {
       if (this.levelkeys) {
         var key = this.levelkeys[keyFormat];
@@ -3364,9 +3420,6 @@
         if (this.programDateTime === null) {
           return null;
         }
-        if (!isFiniteNumber(this.programDateTime)) {
-          return null;
-        }
         var duration = !isFiniteNumber(this.duration) ? 0 : this.duration;
         return this.programDateTime + duration * 1000;
       }
@@ -3388,6 +3441,38 @@
         }
         return false;
       }
+    }, {
+      key: "programDateTime",
+      get: function get() {
+        if (this._programDateTime === null && this.rawProgramDateTime) {
+          this.programDateTime = Date.parse(this.rawProgramDateTime);
+        }
+        return this._programDateTime;
+      },
+      set: function set(value) {
+        if (!isFiniteNumber(value)) {
+          this._programDateTime = this.rawProgramDateTime = null;
+          return;
+        }
+        this._programDateTime = value;
+      }
+    }, {
+      key: "ref",
+      get: function get() {
+        if (this.sn === 'initSegment') {
+          return null;
+        }
+        if (!this._ref) {
+          this._ref = {
+            base: this.base,
+            start: this.start,
+            duration: this.duration,
+            sn: this.sn,
+            programDateTime: this.programDateTime
+          };
+        }
+        return this._ref;
+      }
     }]);
   }(BaseSegment);
 
@@ -3395,9 +3480,9 @@
    * Object representing parsed data from an HLS Partial Segment. Found in {@link hls.js#LevelDetails.partList}.
    */
   var Part = /*#__PURE__*/function (_BaseSegment3) {
-    function Part(partAttrs, frag, baseurl, index, previous) {
+    function Part(partAttrs, frag, base, index, previous) {
       var _this2;
-      _this2 = _BaseSegment3.call(this, baseurl) || this;
+      _this2 = _BaseSegment3.call(this, base) || this;
       _this2.fragOffset = 0;
       _this2.duration = 0;
       _this2.gap = false;
@@ -3405,7 +3490,6 @@
       _this2.relurl = void 0;
       _this2.fragment = void 0;
       _this2.index = void 0;
-      _this2.stats = new LoadStats();
       _this2.duration = partAttrs.decimalFloatingPoint('DURATION');
       _this2.gap = partAttrs.bool('GAP');
       _this2.independent = partAttrs.bool('INDEPENDENT');
@@ -7055,13 +7139,9 @@
   // duration (#EXTINF:<duration>,<title>), group 1 => duration, group 2 => title
   /(?!#) *(\S[^\r\n]*)/.source,
   // segment URI, group 3 => the URI (note newline is not eaten)
-  /#EXT-X-BYTERANGE:*(.+)/.source,
-  // next segment's byterange, group 4 => range spec (x@y)
-  /#EXT-X-PROGRAM-DATE-TIME:(.+)/.source,
-  // next segment's program date/time group 5 => the datetime spec
   /#.*/.source // All other non-segment oriented tags will match with all groups empty
   ].join('|'), 'g');
-  var LEVEL_PLAYLIST_REGEX_SLOW = new RegExp([/#(EXTM3U)/.source, /#EXT-X-(DATERANGE|DEFINE|KEY|MAP|PART|PART-INF|PLAYLIST-TYPE|PRELOAD-HINT|RENDITION-REPORT|SERVER-CONTROL|SKIP|START):(.+)/.source, /#EXT-X-(BITRATE|DISCONTINUITY-SEQUENCE|MEDIA-SEQUENCE|TARGETDURATION|VERSION): *(\d+)/.source, /#EXT-X-(DISCONTINUITY|ENDLIST|GAP|INDEPENDENT-SEGMENTS)/.source, /(#)([^:]*):(.*)/.source, /(#)(.*)(?:.*)\r?\n?/.source].join('|'));
+  var LEVEL_PLAYLIST_REGEX_SLOW = new RegExp([/#(EXTM3U)/.source, /#EXT-X-(PROGRAM-DATE-TIME|BYTERANGE|DATERANGE|DEFINE|KEY|MAP|PART|PART-INF|PLAYLIST-TYPE|PRELOAD-HINT|RENDITION-REPORT|SERVER-CONTROL|SKIP|START):(.+)/.source, /#EXT-X-(BITRATE|DISCONTINUITY-SEQUENCE|MEDIA-SEQUENCE|TARGETDURATION|VERSION): *(\d+)/.source, /#EXT-X-(DISCONTINUITY|ENDLIST|GAP|INDEPENDENT-SEGMENTS)/.source, /(#)([^:]*):(.*)/.source, /(#)(.*)(?:.*)\r?\n?/.source].join('|'));
   var M3U8Parser = /*#__PURE__*/function () {
     function M3U8Parser() {}
     M3U8Parser.findGroup = function findGroup(groups, mediaGroupId) {
@@ -7251,6 +7331,9 @@
       return results;
     };
     M3U8Parser.parseLevelPlaylist = function parseLevelPlaylist(string, baseurl, id, type, levelUrlId, multivariantVariableList) {
+      var base = {
+        url: baseurl
+      };
       var level = new LevelDetails(baseurl);
       var fragments = level.fragments;
       var programDateTimes = [];
@@ -7261,7 +7344,7 @@
       var totalduration = 0;
       var discontinuityCounter = 0;
       var prevFrag = null;
-      var frag = new Fragment(type, baseurl);
+      var frag = new Fragment(type, base);
       var result;
       var i;
       var levelkeys;
@@ -7274,7 +7357,7 @@
       while ((result = LEVEL_PLAYLIST_REGEX_FAST.exec(string)) !== null) {
         if (createNextFrag) {
           createNextFrag = false;
-          frag = new Fragment(type, baseurl);
+          frag = new Fragment(type, base);
           // setup the next fragment for part loading
           frag.playlistOffset = totalduration;
           frag.start = totalduration;
@@ -7283,8 +7366,10 @@
           frag.level = id;
           if (currentInitSegment) {
             frag.initSegment = currentInitSegment;
-            frag.rawProgramDateTime = currentInitSegment.rawProgramDateTime;
-            currentInitSegment.rawProgramDateTime = null;
+            if (currentInitSegment.rawProgramDateTime) {
+              frag.rawProgramDateTime = currentInitSegment.rawProgramDateTime;
+              currentInitSegment.rawProgramDateTime = null;
+            }
             if (nextByteRange) {
               frag.setByteRange(nextByteRange);
               nextByteRange = null;
@@ -7321,22 +7406,6 @@
             currentPart = 0;
             createNextFrag = true;
           }
-        } else if (result[4]) {
-          // X-BYTERANGE
-          var data = (' ' + result[4]).slice(1);
-          if (prevFrag) {
-            frag.setByteRange(data, prevFrag);
-          } else {
-            frag.setByteRange(data);
-          }
-        } else if (result[5]) {
-          // PROGRAM-DATE-TIME
-          // avoid sliced strings    https://github.com/video-dev/hls.js/issues/939
-          frag.rawProgramDateTime = (' ' + result[5]).slice(1);
-          frag.tagList.push(['PROGRAM-DATE-TIME', frag.rawProgramDateTime]);
-          if (firstPdtIndex === -1) {
-            firstPdtIndex = fragments.length;
-          }
         } else {
           result = result[0].match(LEVEL_PLAYLIST_REGEX_SLOW);
           if (!result) {
@@ -7344,7 +7413,7 @@
             continue;
           }
           for (i = 1; i < result.length; i++) {
-            if (typeof result[i] !== 'undefined') {
+            if (result[i] !== undefined) {
               break;
             }
           }
@@ -7352,8 +7421,23 @@
           // avoid sliced strings    https://github.com/video-dev/hls.js/issues/939
           var tag = (' ' + result[i]).slice(1);
           var value1 = (' ' + result[i + 1]).slice(1);
-          var value2 = result[i + 2] ? (' ' + result[i + 2]).slice(1) : '';
+          var value2 = result[i + 2] ? (' ' + result[i + 2]).slice(1) : null;
           switch (tag) {
+            case 'BYTERANGE':
+              if (prevFrag) {
+                frag.setByteRange(value1, prevFrag);
+              } else {
+                frag.setByteRange(value1);
+              }
+              break;
+            case 'PROGRAM-DATE-TIME':
+              // avoid sliced strings    https://github.com/video-dev/hls.js/issues/939
+              frag.rawProgramDateTime = value1;
+              frag.tagList.push(['PROGRAM-DATE-TIME', value1]);
+              if (firstPdtIndex === -1) {
+                firstPdtIndex = fragments.length;
+              }
+              break;
             case 'PLAYLIST-TYPE':
               level.type = value1.toUpperCase();
               break;
@@ -7460,7 +7544,7 @@
                   // Initial segment tag is after segment duration tag.
                   //   #EXTINF: 6.0
                   //   #EXT-X-MAP:URI="init.mp4
-                  var init = new Fragment(type, baseurl);
+                  var init = new Fragment(type, base);
                   setInitSegment(init, mapAttrs, id, levelkeys);
                   currentInitSegment = init;
                   frag.initSegment = currentInitSegment;
@@ -7509,7 +7593,7 @@
                 var previousFragmentPart = currentPart > 0 ? partList[partList.length - 1] : undefined;
                 var index = currentPart++;
                 var partAttrs = new AttrList(value1, level);
-                var part = new Part(partAttrs, frag, baseurl, index, previousFragmentPart);
+                var part = new Part(partAttrs, frag, base, index, previousFragmentPart);
                 partList.push(part);
                 frag.duration += part.duration;
                 break;
@@ -7601,11 +7685,11 @@
     for (var i = dateRangeIds.length; i--;) {
       var dateRange = details.dateRanges[dateRangeIds[i]];
       var startDateTime = dateRange.startDate.getTime();
-      dateRange.tagAnchor = lastProgramDateTime;
+      dateRange.tagAnchor = lastProgramDateTime.ref;
       for (var j = programDateTimeCount; j--;) {
         var fragIndex = findFragmentWithStartDate(details, startDateTime, programDateTimes, j, playlistEnd);
         if (fragIndex !== -1) {
-          dateRange.tagAnchor = details.fragments[fragIndex];
+          dateRange.tagAnchor = details.fragments[fragIndex].ref;
           break;
         }
       }
@@ -7614,25 +7698,27 @@
   function findFragmentWithStartDate(details, startDateTime, programDateTimes, index, endTime) {
     var pdtFragment = programDateTimes[index];
     if (pdtFragment) {
-      var _programDateTimes;
       // find matching range between PDT tags
-      var durationBetweenPdt = (((_programDateTimes = programDateTimes[index + 1]) == null ? void 0 : _programDateTimes.start) || endTime) - pdtFragment.start;
       var pdtStart = pdtFragment.programDateTime;
-      if ((startDateTime >= pdtStart || index === 0) && startDateTime <= pdtStart + durationBetweenPdt * 1000) {
-        // map to fragment with date-time range
-        var startIndex = programDateTimes[index].sn - details.startSN;
-        var fragments = details.fragments;
-        if (fragments.length > programDateTimes.length) {
-          var endSegment = programDateTimes[index + 1] || fragments[fragments.length - 1];
-          var endIndex = endSegment.sn - details.startSN;
-          for (var i = endIndex; i > startIndex; i--) {
-            var fragStartDateTime = fragments[i].programDateTime;
-            if (startDateTime >= fragStartDateTime && startDateTime < fragStartDateTime + fragments[i].duration * 1000) {
-              return i;
+      if (startDateTime >= pdtStart || index === 0) {
+        var _programDateTimes;
+        var durationBetweenPdt = (((_programDateTimes = programDateTimes[index + 1]) == null ? void 0 : _programDateTimes.start) || endTime) - pdtFragment.start;
+        if (startDateTime <= pdtStart + durationBetweenPdt * 1000) {
+          // map to fragment with date-time range
+          var startIndex = programDateTimes[index].sn - details.startSN;
+          var fragments = details.fragments;
+          if (fragments.length > programDateTimes.length) {
+            var endSegment = programDateTimes[index + 1] || fragments[fragments.length - 1];
+            var endIndex = endSegment.sn - details.startSN;
+            for (var i = endIndex; i > startIndex; i--) {
+              var fragStartDateTime = fragments[i].programDateTime;
+              if (startDateTime >= fragStartDateTime && startDateTime < fragStartDateTime + fragments[i].duration * 1000) {
+                return i;
+              }
             }
           }
+          return startIndex;
         }
-        return startIndex;
       }
     }
     return -1;
@@ -7703,12 +7789,6 @@
   }
   function assignProgramDateTime(frag, prevFrag, programDateTimes) {
     if (frag.rawProgramDateTime) {
-      frag.programDateTime = Date.parse(frag.rawProgramDateTime);
-      if (!isFiniteNumber(frag.programDateTime)) {
-        frag.programDateTime = null;
-        frag.rawProgramDateTime = null;
-        return;
-      }
       programDateTimes.push(frag);
     } else if (prevFrag != null && prevFrag.programDateTime) {
       frag.programDateTime = prevFrag.endProgramDateTime;
@@ -7752,19 +7832,19 @@
         frag = fragTo;
       }
       if (frag.duration !== duration) {
-        frag.duration = duration;
+        frag.setDuration(duration);
       }
       // we dont know startPTS[toIdx]
     } else if (fragTo.sn > fragFrom.sn) {
       var contiguous = fragFrom.cc === fragTo.cc;
       // TODO: With part-loading end/durations we need to confirm the whole fragment is loaded before using (or setting) minEndPTS
       if (contiguous && fragFrom.minEndPTS) {
-        fragTo.start = fragFrom.start + (fragFrom.minEndPTS - fragFrom.start);
+        fragTo.setStart(fragFrom.start + (fragFrom.minEndPTS - fragFrom.start));
       } else {
-        fragTo.start = fragFrom.start + fragFrom.duration;
+        fragTo.setStart(fragFrom.start + fragFrom.duration);
       }
     } else {
-      fragTo.start = Math.max(fragFrom.start - fragTo.duration, 0);
+      fragTo.setStart(Math.max(fragFrom.start - fragTo.duration, 0));
     }
   }
   function updateFragPTSDTS(details, frag, startPTS, endPTS, startDTS, endDTS) {
@@ -7795,9 +7875,9 @@
     }
     var drift = startPTS - frag.start;
     if (frag.start !== 0) {
-      frag.start = startPTS;
+      frag.setStart(startPTS);
     }
-    frag.duration = endPTS - frag.start;
+    frag.setDuration(endPTS - frag.start);
     frag.startPTS = startPTS;
     frag.maxStartPTS = maxStartPTS;
     frag.startDTS = startDTS;
@@ -7860,13 +7940,13 @@
         ccOffset = oldFrag.cc - newFrag.cc;
       }
       if (isFiniteNumber(oldFrag.startPTS) && isFiniteNumber(oldFrag.endPTS)) {
-        newFrag.start = newFrag.startPTS = oldFrag.startPTS;
+        newFrag.setStart(newFrag.startPTS = oldFrag.startPTS);
         newFrag.startDTS = oldFrag.startDTS;
         newFrag.maxStartPTS = oldFrag.maxStartPTS;
         newFrag.endPTS = oldFrag.endPTS;
         newFrag.endDTS = oldFrag.endDTS;
         newFrag.minEndPTS = oldFrag.minEndPTS;
-        newFrag.duration = oldFrag.endPTS - oldFrag.startPTS;
+        newFrag.setDuration(oldFrag.endPTS - oldFrag.startPTS);
         if (newFrag.duration) {
           PTSFrag = newFrag;
         }
@@ -7874,9 +7954,13 @@
         // PTS is known when any segment has startPTS and endPTS
         newDetails.PTSKnown = newDetails.alignedSliding = true;
       }
-      newFrag.elementaryStreams = oldFrag.elementaryStreams;
+      if (oldFrag.hasStreams) {
+        newFrag.elementaryStreams = oldFrag.elementaryStreams;
+      }
       newFrag.loader = oldFrag.loader;
-      newFrag.stats = oldFrag.stats;
+      if (oldFrag.hasStats) {
+        newFrag.stats = oldFrag.stats;
+      }
       if (oldFrag.initSegment) {
         newFrag.initSegment = oldFrag.initSegment;
         currentInitSegment = oldFrag.initSegment;
@@ -8047,14 +8131,14 @@
     }
     addSliding(newDetails, sliding);
   }
-  function addSliding(details, start) {
-    if (start) {
+  function addSliding(details, sliding) {
+    if (sliding) {
       var fragments = details.fragments;
       for (var i = details.skippedSegments; i < fragments.length; i++) {
-        fragments[i].start += start;
+        fragments[i].addStart(sliding);
       }
       if (details.fragmentHint) {
-        details.fragmentHint.start += start;
+        details.fragmentHint.addStart(sliding);
       }
     }
   }
@@ -16080,11 +16164,12 @@
     }, {
       key: "maxLatency",
       get: function get() {
+        var _this$hls;
         var config = this.config;
         if (config.liveMaxLatencyDuration !== undefined) {
           return config.liveMaxLatencyDuration;
         }
-        var levelDetails = this.hls.latestLevelDetails;
+        var levelDetails = (_this$hls = this.hls) == null ? void 0 : _this$hls.latestLevelDetails;
         return levelDetails ? config.liveMaxLatencyDurationCount * levelDetails.targetduration : 0;
       }
     }, {
@@ -19554,7 +19639,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10743";
+  var version = "1.6.0-beta.1.0.canary.10746";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js