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

package/dist/hls.mjs

@@ -501,7 +501,7 @@ function enableLogs(debugConfig, context, id) {
     // 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();
@@ -5851,7 +5851,7 @@ function findFragmentByPDT(fragments, PDTValue, maxFragLookUpTolerance) {
  * @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 = 0, maxFragLookUpTolerance = 0) {
+function findFragmentByPTS(fragPrevious, fragments, bufferEnd = 0, maxFragLookUpTolerance = 0, nextFragLookupTolerance = 0.005) {
   let fragNext = null;
   if (fragPrevious) {
     fragNext = fragments[fragPrevious.sn - fragments[0].sn + 1] || null;
@@ -5864,7 +5864,7 @@ function findFragmentByPTS(fragPrevious, fragments, bufferEnd = 0, maxFragLookUp
     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
@@ -5875,6 +5875,18 @@ function findFragmentByPTS(fragPrevious, fragments, bufferEnd = 0, maxFragLookUp
   // 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) {
+    const firstDuration = fragPrevious.tagList.reduce((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.
@@ -9668,7 +9680,7 @@ class BaseStreamController extends TaskLoop {
       if (this.state === State.STOPPED || this.state === State.ERROR) {
         return;
       }
-      this.warn(reason);
+      this.warn(`Frag error: ${(reason == null ? void 0 : reason.message) || reason}`);
       this.resetFragmentLoading(frag);
     });
   }
@@ -10365,7 +10377,9 @@ class BaseStreamController extends TaskLoop {
     const {
       fragmentHint
     } = levelDetails;
-    const tolerance = config.maxFragLookUpTolerance;
+    const {
+      maxFragLookUpTolerance
+    } = config;
     const partList = levelDetails.partList;
     const loadingParts = !!(this.loadingParts && partList != null && partList.length && fragmentHint);
     if (loadingParts && fragmentHint && !this.bitrateTest) {
@@ -10375,7 +10389,7 @@ class BaseStreamController extends TaskLoop {
     }
     let frag;
     if (bufferEnd < end) {
-      const lookupTolerance = bufferEnd > end - tolerance ? 0 : tolerance;
+      const 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);
@@ -13374,7 +13388,7 @@ class TSDemuxer {
               if (stt) {
                 offset += data[offset] + 1;
               }
-              const parsedPIDs = parsePMT(data, offset, this.typeSupported, isSampleAes);
+              const 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
@@ -13417,14 +13431,7 @@ class TSDemuxer {
       }
     }
     if (tsPacketErrors > 0) {
-      const 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,
-        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;
@@ -13592,16 +13599,7 @@ class TSDemuxer {
       } else {
         reason = 'No ADTS header found in AAC PES';
       }
-      const 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,
-        reason
-      });
+      emitParsingError(this.observer, new Error(reason), recoverable);
       if (!recoverable) {
         return;
       }
@@ -13702,7 +13700,7 @@ function parsePAT(data, offset) {
   // 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) {
   const result = {
     audioPid: -1,
     videoPid: -1,
@@ -13820,7 +13818,8 @@ function parsePMT(data, offset, typeSupported, isSampleAes) {
       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)
         {
@@ -13838,6 +13837,17 @@ function parsePMT(data, offset, typeSupported, isSampleAes) {
   }
   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,
+    error,
+    reason: error.message
+  });
+}
 function logEncryptedSamplesFoundInUnencryptedStream(type) {
   logger.log(`${type} with AES-128-CBC encryption found in unencrypted stream`);
 }
@@ -16584,10 +16594,6 @@ class TransmuxerInterface {
     this.observer.on(Events.FRAG_DECRYPTED, forwardMessage);
     this.observer.on(Events.ERROR, forwardMessage);
     const 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
-    const vendor = navigator.vendor;
     if (this.useWorker && typeof Worker !== 'undefined') {
       const canCreateWorker = config.workerPath || hasUMDWorker();
       if (canCreateWorker) {
@@ -16599,7 +16605,7 @@ class TransmuxerInterface {
             logger.log(`injecting Web Worker for "${id}"`);
             this.workerContext = injectWorker();
           }
-          this.onwmsg = ev => this.onWorkerMessage(ev);
+          this.onwmsg = event => this.onWorkerMessage(event);
           const {
             worker
           } = this.workerContext;
@@ -16619,7 +16625,7 @@ class TransmuxerInterface {
           worker.postMessage({
             cmd: 'init',
             typeSupported: m2tsTypeSupported,
-            vendor: vendor,
+            vendor: '',
             id: id,
             config: JSON.stringify(config)
           });
@@ -16627,12 +16633,12 @@ class TransmuxerInterface {
           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);
   }
   resetWorker() {
     if (this.workerContext) {
@@ -16784,9 +16790,16 @@ class TransmuxerInterface {
     });
     this.onFlush(chunkMeta);
   }
-  onWorkerMessage(ev) {
-    const data = ev.data;
+  onWorkerMessage(event) {
+    const data = event.data;
+    if (!(data != null && data.event)) {
+      logger.warn(`worker message received with no ${data ? 'event name' : 'data'}`);
+      return;
+    }
     const hls = this.hls;
+    if (!this.hls) {
+      return;
+    }
     switch (data.event) {
       case 'init':
         {
@@ -25765,8 +25778,6 @@ class XhrLoader {
     this.config = null;
     this.context = null;
     this.xhrSetup = null;
-    // @ts-ignore
-    this.stats = null;
   }
   abortInternal() {
     const loader = this.loader;
@@ -25814,13 +25825,14 @@ class XhrLoader {
     const xhrSetup = this.xhrSetup;
     if (xhrSetup) {
       Promise.resolve().then(() => {
-        if (this.stats.aborted) return;
+        if (this.loader !== xhr || this.stats.aborted) return;
         return xhrSetup(xhr, context.url);
       }).catch(error => {
+        if (this.loader !== xhr || this.stats.aborted) return;
         xhr.open('GET', context.url, true);
         return xhrSetup(xhr, context.url);
       }).then(() => {
-        if (this.stats.aborted) return;
+        if (this.loader !== xhr || this.stats.aborted) return;
         this.openAndSendXhr(xhr, context, config);
       }).catch(error => {
         // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS
@@ -25940,8 +25952,8 @@ class XhrLoader {
     }
   }
   loadtimeout() {
-    var _this$config;
-    const retryConfig = (_this$config = this.config) == null ? void 0 : _this$config.loadPolicy.timeoutRetry;
+    if (!this.config) return;
+    const retryConfig = this.config.loadPolicy.timeoutRetry;
     const retryCount = this.stats.retry;
     if (shouldRetry(retryConfig, retryCount, true)) {
       this.retry(retryConfig);
@@ -28843,7 +28855,8 @@ class StreamController extends BaseStreamController {
         // 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) {
+        const audioMetadata = audio.metadata;
+        if (audioMetadata && 'channelCount' in audioMetadata && (audioMetadata.channelCount || 1) !== 1 && ua.indexOf('firefox') === -1) {
           audioCodec = 'mp4a.40.5';
         }
       }
@@ -29006,7 +29019,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.10-0.canary.10320";
+    return "1.5.10-0.canary.10326";
   }
 
   /**