hls.js 1.5.10-0.canary.10320 → 1.5.10-0.canary.10326

package/dist/hls.js

@@ -609,7 +609,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.5.10-0.canary.10320");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.10-0.canary.10326");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -6106,13 +6106,16 @@
    * @param maxFragLookUpTolerance - The amount of time that a fragment's start/end can be within in order to be considered contiguous
    * @returns a matching fragment or null
    */
-  function findFragmentByPTS(fragPrevious, fragments, bufferEnd, maxFragLookUpTolerance) {
+  function findFragmentByPTS(fragPrevious, fragments, bufferEnd, maxFragLookUpTolerance, nextFragLookupTolerance) {
     if (bufferEnd === void 0) {
       bufferEnd = 0;
     }
     if (maxFragLookUpTolerance === void 0) {
       maxFragLookUpTolerance = 0;
     }
+    if (nextFragLookupTolerance === void 0) {
+      nextFragLookupTolerance = 0.005;
+    }
     var fragNext = null;
     if (fragPrevious) {
       fragNext = fragments[fragPrevious.sn - fragments[0].sn + 1] || null;
@@ -6125,7 +6128,7 @@
       fragNext = fragments[0];
     }
     // Prefer the next fragment if it's within tolerance
-    if (fragNext && (!fragPrevious || fragPrevious.level === fragNext.level) && fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, fragNext) === 0) {
+    if (fragNext && ((!fragPrevious || fragPrevious.level === fragNext.level) && fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, fragNext) === 0 || fragmentWithinFastStartSwitch(fragNext, fragPrevious, Math.min(nextFragLookupTolerance, maxFragLookUpTolerance)))) {
       return fragNext;
     }
     // We might be seeking past the tolerance so find the best match
@@ -6136,6 +6139,18 @@
     // If no match was found return the next fragment after fragPrevious, or null
     return fragNext;
   }
+  function fragmentWithinFastStartSwitch(fragNext, fragPrevious, nextFragLookupTolerance) {
+    if (fragPrevious && fragPrevious.start === 0 && fragPrevious.level < fragNext.level && (fragPrevious.endPTS || 0) > 0) {
+      var firstDuration = fragPrevious.tagList.reduce(function (duration, tag) {
+        if (tag[0] === 'INF') {
+          duration += parseFloat(tag[1]);
+        }
+        return duration;
+      }, nextFragLookupTolerance);
+      return fragNext.start <= firstDuration;
+    }
+    return false;
+  }
 
   /**
    * The test function used by the findFragmentBySn's BinarySearch to look for the best match to the current buffer conditions.
@@ -10009,7 +10024,7 @@
         if (_this3.state === State.STOPPED || _this3.state === State.ERROR) {
           return;
         }
-        _this3.warn(reason);
+        _this3.warn("Frag error: " + ((reason == null ? void 0 : reason.message) || reason));
         _this3.resetFragmentLoading(frag);
       });
     };
@@ -10691,7 +10706,7 @@
       var fragments = levelDetails.fragments,
         endSN = levelDetails.endSN;
       var fragmentHint = levelDetails.fragmentHint;
-      var tolerance = config.maxFragLookUpTolerance;
+      var maxFragLookUpTolerance = config.maxFragLookUpTolerance;
       var partList = levelDetails.partList;
       var loadingParts = !!(this.loadingParts && partList != null && partList.length && fragmentHint);
       if (loadingParts && fragmentHint && !this.bitrateTest) {
@@ -10701,7 +10716,7 @@
       }
       var frag;
       if (bufferEnd < end) {
-        var lookupTolerance = bufferEnd > end - tolerance ? 0 : tolerance;
+        var lookupTolerance = bufferEnd > end - maxFragLookUpTolerance ? 0 : maxFragLookUpTolerance;
         // Remove the tolerance if it would put the bufferEnd past the actual end of stream
         // Uses buffer and sequence number to calculate switch segment (required if using EXT-X-DISCONTINUITY-SEQUENCE)
         frag = findFragmentByPTS(fragPrevious, fragments, bufferEnd, lookupTolerance);
@@ -13732,7 +13747,7 @@
                 if (stt) {
                   offset += data[offset] + 1;
                 }
-                var parsedPIDs = parsePMT(data, offset, this.typeSupported, isSampleAes);
+                var parsedPIDs = parsePMT(data, offset, this.typeSupported, isSampleAes, this.observer);
 
                 // only update track id if track PID found while parsing PMT
                 // this is to avoid resetting the PID to -1 in case
@@ -13775,14 +13790,7 @@
         }
       }
       if (tsPacketErrors > 0) {
-        var error = new Error("Found " + tsPacketErrors + " TS packet/s that do not start with 0x47");
-        this.observer.emit(Events.ERROR, Events.ERROR, {
-          type: ErrorTypes.MEDIA_ERROR,
-          details: ErrorDetails.FRAG_PARSING_ERROR,
-          fatal: false,
-          error: error,
-          reason: error.message
-        });
+        emitParsingError(this.observer, new Error("Found " + tsPacketErrors + " TS packet/s that do not start with 0x47"));
       }
       videoTrack.pesData = videoData;
       audioTrack.pesData = audioData;
@@ -13944,16 +13952,7 @@
         } else {
           reason = 'No ADTS header found in AAC PES';
         }
-        var error = new Error(reason);
-        logger.warn("parsing error: " + reason);
-        this.observer.emit(Events.ERROR, Events.ERROR, {
-          type: ErrorTypes.MEDIA_ERROR,
-          details: ErrorDetails.FRAG_PARSING_ERROR,
-          fatal: false,
-          levelRetry: recoverable,
-          error: error,
-          reason: reason
-        });
+        emitParsingError(this.observer, new Error(reason), recoverable);
         if (!recoverable) {
           return;
         }
@@ -14055,7 +14054,7 @@
     // skip the PSI header and parse the first PMT entry
     return (data[offset + 10] & 0x1f) << 8 | data[offset + 11];
   }
-  function parsePMT(data, offset, typeSupported, isSampleAes) {
+  function parsePMT(data, offset, typeSupported, isSampleAes, observer) {
     var result = {
       audioPid: -1,
       videoPid: -1,
@@ -14173,7 +14172,8 @@
         case 0xc2: // SAMPLE-AES EC3
         /* falls through */
         case 0x87:
-          throw new Error('Unsupported EC-3 in M2TS found');
+          emitParsingError(observer, new Error('Unsupported EC-3 in M2TS found'));
+          return result;
         case 0x24:
           // ITU-T Rec. H.265 and ISO/IEC 23008-2 (HEVC)
           {
@@ -14191,6 +14191,17 @@
     }
     return result;
   }
+  function emitParsingError(observer, error, levelRetry) {
+    logger.warn("parsing error: " + error.message);
+    observer.emit(Events.ERROR, Events.ERROR, {
+      type: ErrorTypes.MEDIA_ERROR,
+      details: ErrorDetails.FRAG_PARSING_ERROR,
+      fatal: false,
+      levelRetry: levelRetry,
+      error: error,
+      reason: error.message
+    });
+  }
   function logEncryptedSamplesFoundInUnencryptedStream(type) {
     logger.log(type + " with AES-128-CBC encryption found in unencrypted stream");
   }
@@ -16946,7 +16957,7 @@
         case 'init':
           {
             var config = JSON.parse(data.config);
-            self.transmuxer = new Transmuxer(observer, data.typeSupported, config, data.vendor, data.id);
+            self.transmuxer = new Transmuxer(observer, data.typeSupported, config, '', data.id);
             var logger = enableLogs(config.debug, data.id);
             forwardWorkerLogs(logger);
             forwardMessage('init', null);
@@ -17123,10 +17134,6 @@
       this.observer.on(Events.FRAG_DECRYPTED, forwardMessage);
       this.observer.on(Events.ERROR, forwardMessage);
       var m2tsTypeSupported = getM2TSSupportedAudioTypes(config.preferManagedMediaSource);
-
-      // navigator.vendor is not always available in Web Worker
-      // refer to https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope/navigator
-      var vendor = navigator.vendor;
       if (this.useWorker && typeof Worker !== 'undefined') {
         var canCreateWorker = config.workerPath || hasUMDWorker();
         if (canCreateWorker) {
@@ -17138,8 +17145,8 @@
               logger.log("injecting Web Worker for \"" + id + "\"");
               this.workerContext = injectWorker();
             }
-            this.onwmsg = function (ev) {
-              return _this.onWorkerMessage(ev);
+            this.onwmsg = function (event) {
+              return _this.onWorkerMessage(event);
             };
             var worker = this.workerContext.worker;
             worker.addEventListener('message', this.onwmsg);
@@ -17158,7 +17165,7 @@
             worker.postMessage({
               cmd: 'init',
               typeSupported: m2tsTypeSupported,
-              vendor: vendor,
+              vendor: '',
               id: id,
               config: JSON.stringify(config)
             });
@@ -17166,12 +17173,12 @@
             logger.warn("Error setting up \"" + id + "\" Web Worker, fallback to inline", err);
             this.resetWorker();
             this.error = null;
-            this.transmuxer = new Transmuxer(this.observer, m2tsTypeSupported, config, vendor, id);
+            this.transmuxer = new Transmuxer(this.observer, m2tsTypeSupported, config, '', id);
           }
           return;
         }
       }
-      this.transmuxer = new Transmuxer(this.observer, m2tsTypeSupported, config, vendor, id);
+      this.transmuxer = new Transmuxer(this.observer, m2tsTypeSupported, config, '', id);
     }
     var _proto = TransmuxerInterface.prototype;
     _proto.resetWorker = function resetWorker() {
@@ -17317,9 +17324,16 @@
       });
       this.onFlush(chunkMeta);
     };
-    _proto.onWorkerMessage = function onWorkerMessage(ev) {
-      var data = ev.data;
+    _proto.onWorkerMessage = function onWorkerMessage(event) {
+      var data = event.data;
+      if (!(data != null && data.event)) {
+        logger.warn("worker message received with no " + (data ? 'event name' : 'data'));
+        return;
+      }
       var hls = this.hls;
+      if (!this.hls) {
+        return;
+      }
       switch (data.event) {
         case 'init':
           {
@@ -26399,8 +26413,6 @@
       this.config = null;
       this.context = null;
       this.xhrSetup = null;
-      // @ts-ignore
-      this.stats = null;
     };
     _proto.abortInternal = function abortInternal() {
       var loader = this.loader;
@@ -26447,13 +26459,14 @@
       var xhrSetup = this.xhrSetup;
       if (xhrSetup) {
         Promise.resolve().then(function () {
-          if (_this.stats.aborted) return;
+          if (_this.loader !== xhr || _this.stats.aborted) return;
           return xhrSetup(xhr, context.url);
         }).catch(function (error) {
+          if (_this.loader !== xhr || _this.stats.aborted) return;
           xhr.open('GET', context.url, true);
           return xhrSetup(xhr, context.url);
         }).then(function () {
-          if (_this.stats.aborted) return;
+          if (_this.loader !== xhr || _this.stats.aborted) return;
           _this.openAndSendXhr(xhr, context, config);
         }).catch(function (error) {
           // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS
@@ -26570,8 +26583,8 @@
       }
     };
     _proto.loadtimeout = function loadtimeout() {
-      var _this$config;
-      var retryConfig = (_this$config = this.config) == null ? void 0 : _this$config.loadPolicy.timeoutRetry;
+      if (!this.config) return;
+      var retryConfig = this.config.loadPolicy.timeoutRetry;
       var retryCount = this.stats.retry;
       if (shouldRetry(retryConfig, retryCount, true)) {
         this.retry(retryConfig);
@@ -29452,7 +29465,8 @@
           // In the case that AAC and HE-AAC audio codecs are signalled in manifest,
           // force HE-AAC, as it seems that most browsers prefers it.
           // don't force HE-AAC if mono stream, or in Firefox
-          if (audio.metadata.channelCount !== 1 && ua.indexOf('firefox') === -1) {
+          var audioMetadata = audio.metadata;
+          if (audioMetadata && 'channelCount' in audioMetadata && (audioMetadata.channelCount || 1) !== 1 && ua.indexOf('firefox') === -1) {
             audioCodec = 'mp4a.40.5';
           }
         }
@@ -30503,7 +30517,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.10-0.canary.10320";
+        return "1.5.10-0.canary.10326";
       }
     }, {
       key: "Events",