hls.js 1.5.14-0.canary.10431 → 1.5.14-0.canary.10432

package/dist/hls.light.mjs

@@ -420,7 +420,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.14-0.canary.10431"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.14-0.canary.10432"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -12684,6 +12684,10 @@ class BaseStreamController extends TaskLoop {
   }
   onHandlerDestroying() {
     this.stopLoad();
+    if (this.transmuxer) {
+      this.transmuxer.destroy();
+      this.transmuxer = null;
+    }
     super.onHandlerDestroying();
     // @ts-ignore
     this.hls = this.onMediaSeeking = this.onMediaEnded = null;
@@ -13807,10 +13811,8 @@ class BaseStreamController extends TaskLoop {
     return `${this.playlistLabel()} ${frag.level} (frag:[${((_ref = pts ? frag.startPTS : frag.start) != null ? _ref : NaN).toFixed(3)}-${((_ref2 = pts ? frag.endPTS : frag.end) != null ? _ref2 : NaN).toFixed(3)}]`;
   }
   resetTransmuxer() {
-    if (this.transmuxer) {
-      this.transmuxer.destroy();
-      this.transmuxer = null;
-    }
+    var _this$transmuxer2;
+    (_this$transmuxer2 = this.transmuxer) == null ? void 0 : _this$transmuxer2.reset();
   }
   recoverWorkerError(data) {
     if (data.event === 'demuxerWorker') {
@@ -13859,29 +13861,66 @@ function changeTypeSupported() {
   return typeof (sourceBuffer == null ? void 0 : (_sourceBuffer$prototy = sourceBuffer.prototype) == null ? void 0 : _sourceBuffer$prototy.changeType) === 'function';
 }
 
+const version = "1.5.14-0.canary.10432";
+
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
+const workerStore = {};
 function hasUMDWorker() {
   return typeof __HLS_WORKER_BUNDLE__ === 'function';
 }
 function injectWorker() {
+  const workerContext = workerStore[version];
+  if (workerContext) {
+    workerContext.clientCount++;
+    return workerContext;
+  }
   const blob = new self.Blob([`var exports={};var module={exports:exports};function define(f){f()};define.amd=true;(${__HLS_WORKER_BUNDLE__.toString()})(true);`], {
     type: 'text/javascript'
   });
   const objectURL = self.URL.createObjectURL(blob);
   const worker = new self.Worker(objectURL);
-  return {
+  const result = {
     worker,
-    objectURL
+    objectURL,
+    clientCount: 1
   };
+  workerStore[version] = result;
+  return result;
 }
 function loadWorker(path) {
+  const workerContext = workerStore[path];
+  if (workerContext) {
+    workerContext.clientCount++;
+    return workerContext;
+  }
   const scriptURL = new self.URL(path, self.location.href).href;
   const worker = new self.Worker(scriptURL);
-  return {
+  const result = {
     worker,
-    scriptURL
+    scriptURL,
+    clientCount: 1
   };
+  workerStore[path] = result;
+  return result;
+}
+function removeWorkerFromStore(path) {
+  const workerContext = workerStore[path || version];
+  if (workerContext) {
+    const clientCount = workerContext.clientCount--;
+    if (clientCount === 1) {
+      const {
+        worker,
+        objectURL
+      } = workerContext;
+      delete workerStore[path || version];
+      if (objectURL) {
+        // revoke the Object URL that was used to create transmuxer worker, so as not to leak it
+        self.URL.revokeObjectURL(objectURL);
+      }
+      worker.terminate();
+    }
+  }
 }
 
 function dummyTrack(type = '', inputTimeScale = 90000) {
@@ -14558,7 +14597,7 @@ class AACDemuxer extends BaseAudioDemuxer {
   }
 
   // Source for probe info - https://wiki.multimedia.cx/index.php?title=ADTS
-  static probe(data) {
+  static probe(data, logger) {
     if (!data) {
       return false;
     }
@@ -15478,7 +15517,8 @@ class SampleAesDecrypter {
 
 const PACKET_LENGTH = 188;
 class TSDemuxer {
-  constructor(observer, config, typeSupported) {
+  constructor(observer, config, typeSupported, logger) {
+    this.logger = void 0;
     this.observer = void 0;
     this.config = void 0;
     this.typeSupported = void 0;
@@ -15498,9 +15538,10 @@ class TSDemuxer {
     this.observer = observer;
     this.config = config;
     this.typeSupported = typeSupported;
+    this.logger = logger;
     this.videoParser = null;
   }
-  static probe(data) {
+  static probe(data, logger) {
     const syncOffset = TSDemuxer.syncOffset(data);
     if (syncOffset > 0) {
       logger.warn(`MPEG2-TS detected but first sync word found @ offset ${syncOffset}`);
@@ -15662,7 +15703,7 @@ class TSDemuxer {
         switch (pid) {
           case videoPid:
             if (stt) {
-              if (videoData && (pes = parsePES(videoData))) {
+              if (videoData && (pes = parsePES(videoData, this.logger))) {
                 if (this.videoParser === null) {
                   switch (videoTrack.segmentCodec) {
                     case 'avc':
@@ -15686,7 +15727,7 @@ class TSDemuxer {
             break;
           case audioPid:
             if (stt) {
-              if (audioData && (pes = parsePES(audioData))) {
+              if (audioData && (pes = parsePES(audioData, this.logger))) {
                 switch (audioTrack.segmentCodec) {
                   case 'aac':
                     this.parseAACPES(audioTrack, pes);
@@ -15708,7 +15749,7 @@ class TSDemuxer {
             break;
           case id3Pid:
             if (stt) {
-              if (id3Data && (pes = parsePES(id3Data))) {
+              if (id3Data && (pes = parsePES(id3Data, this.logger))) {
                 this.parseID3PES(id3Track, pes);
               }
               id3Data = {
@@ -15726,14 +15767,14 @@ class TSDemuxer {
               offset += data[offset] + 1;
             }
             pmtId = this._pmtId = parsePAT(data, offset);
-            // logger.log('PMT PID:'  + this._pmtId);
+            // this.logger.log('PMT PID:'  + this._pmtId);
             break;
           case pmtId:
             {
               if (stt) {
                 offset += data[offset] + 1;
               }
-              const parsedPIDs = parsePMT(data, offset, this.typeSupported, isSampleAes, this.observer);
+              const parsedPIDs = parsePMT(data, offset, this.typeSupported, isSampleAes, this.observer, this.logger);
 
               // only update track id if track PID found while parsing PMT
               // this is to avoid resetting the PID to -1 in case
@@ -15756,7 +15797,7 @@ class TSDemuxer {
                 id3Track.pid = id3Pid;
               }
               if (unknownPID !== null && !pmtParsed) {
-                logger.warn(`MPEG-TS PMT found at ${start} after unknown PID '${unknownPID}'. Backtracking to sync byte @${syncOffset} to parse all TS packets.`);
+                this.logger.warn(`MPEG-TS PMT found at ${start} after unknown PID '${unknownPID}'. Backtracking to sync byte @${syncOffset} to parse all TS packets.`);
                 unknownPID = null;
                 // we set it to -188, the += 188 in the for loop will reset start to 0
                 start = syncOffset - 188;
@@ -15776,7 +15817,7 @@ class TSDemuxer {
       }
     }
     if (tsPacketErrors > 0) {
-      emitParsingError(this.observer, new Error(`Found ${tsPacketErrors} TS packet/s that do not start with 0x47`));
+      emitParsingError(this.observer, new Error(`Found ${tsPacketErrors} TS packet/s that do not start with 0x47`), undefined, this.logger);
     }
     videoTrack.pesData = videoData;
     audioTrack.pesData = audioData;
@@ -15826,7 +15867,7 @@ class TSDemuxer {
     const id3Data = id3Track.pesData;
     // try to parse last PES packets
     let pes;
-    if (videoData && (pes = parsePES(videoData))) {
+    if (videoData && (pes = parsePES(videoData, this.logger))) {
       if (this.videoParser === null) {
         switch (videoTrack.segmentCodec) {
           case 'avc':
@@ -15842,7 +15883,7 @@ class TSDemuxer {
       // either avcData null or PES truncated, keep it for next frag parsing
       videoTrack.pesData = videoData;
     }
-    if (audioData && (pes = parsePES(audioData))) {
+    if (audioData && (pes = parsePES(audioData, this.logger))) {
       switch (audioTrack.segmentCodec) {
         case 'aac':
           this.parseAACPES(audioTrack, pes);
@@ -15854,13 +15895,13 @@ class TSDemuxer {
       audioTrack.pesData = null;
     } else {
       if (audioData != null && audioData.size) {
-        logger.log('last AAC PES packet truncated,might overlap between fragments');
+        this.logger.log('last AAC PES packet truncated,might overlap between fragments');
       }
 
       // either audioData null or PES truncated, keep it for next frag parsing
       audioTrack.pesData = audioData;
     }
-    if (id3Data && (pes = parsePES(id3Data))) {
+    if (id3Data && (pes = parsePES(id3Data, this.logger))) {
       this.parseID3PES(id3Track, pes);
       id3Track.pesData = null;
     } else {
@@ -15934,7 +15975,7 @@ class TSDemuxer {
       } else {
         reason = 'No ADTS header found in AAC PES';
       }
-      emitParsingError(this.observer, new Error(reason), recoverable);
+      emitParsingError(this.observer, new Error(reason), recoverable, this.logger);
       if (!recoverable) {
         return;
       }
@@ -15949,7 +15990,7 @@ class TSDemuxer {
       const frameDuration = getFrameDuration(track.samplerate);
       pts = aacOverFlow.sample.pts + frameDuration;
     } else {
-      logger.warn('[tsdemuxer]: AAC PES unknown PTS');
+      this.logger.warn('[tsdemuxer]: AAC PES unknown PTS');
       return;
     }
 
@@ -15979,7 +16020,7 @@ class TSDemuxer {
     let offset = 0;
     const pts = pes.pts;
     if (pts === undefined) {
-      logger.warn('[tsdemuxer]: MPEG PES unknown PTS');
+      this.logger.warn('[tsdemuxer]: MPEG PES unknown PTS');
       return;
     }
     while (offset < length) {
@@ -16002,7 +16043,7 @@ class TSDemuxer {
   }
   parseID3PES(id3Track, pes) {
     if (pes.pts === undefined) {
-      logger.warn('[tsdemuxer]: ID3 PES unknown PTS');
+      this.logger.warn('[tsdemuxer]: ID3 PES unknown PTS');
       return;
     }
     const id3Sample = _extends({}, pes, {
@@ -16020,7 +16061,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, observer) {
+function parsePMT(data, offset, typeSupported, isSampleAes, observer, logger) {
   const result = {
     audioPid: -1,
     videoPid: -1,
@@ -16042,7 +16083,7 @@ function parsePMT(data, offset, typeSupported, isSampleAes, observer) {
       case 0xcf:
         // SAMPLE-AES AAC
         if (!isSampleAes) {
-          logEncryptedSamplesFoundInUnencryptedStream('ADTS AAC');
+          logEncryptedSamplesFoundInUnencryptedStream('ADTS AAC', this.logger);
           break;
         }
       /* falls through */
@@ -16064,7 +16105,7 @@ function parsePMT(data, offset, typeSupported, isSampleAes, observer) {
       case 0xdb:
         // SAMPLE-AES AVC
         if (!isSampleAes) {
-          logEncryptedSamplesFoundInUnencryptedStream('H.264');
+          logEncryptedSamplesFoundInUnencryptedStream('H.264', this.logger);
           break;
         }
       /* falls through */
@@ -16092,7 +16133,7 @@ function parsePMT(data, offset, typeSupported, isSampleAes, observer) {
       case 0xc1:
         // SAMPLE-AES AC3
         if (!isSampleAes) {
-          logEncryptedSamplesFoundInUnencryptedStream('AC-3');
+          logEncryptedSamplesFoundInUnencryptedStream('AC-3', this.logger);
           break;
         }
       /* falls through */
@@ -16128,12 +16169,12 @@ function parsePMT(data, offset, typeSupported, isSampleAes, observer) {
       case 0xc2: // SAMPLE-AES EC3
       /* falls through */
       case 0x87:
-        emitParsingError(observer, new Error('Unsupported EC-3 in M2TS found'));
+        emitParsingError(observer, new Error('Unsupported EC-3 in M2TS found'), undefined, this.logger);
         return result;
       case 0x24:
         // ITU-T Rec. H.265 and ISO/IEC 23008-2 (HEVC)
         {
-          emitParsingError(observer, new Error('Unsupported HEVC in M2TS found'));
+          emitParsingError(observer, new Error('Unsupported HEVC in M2TS found'), undefined, this.logger);
           return result;
         }
     }
@@ -16143,7 +16184,7 @@ function parsePMT(data, offset, typeSupported, isSampleAes, observer) {
   }
   return result;
 }
-function emitParsingError(observer, error, levelRetry) {
+function emitParsingError(observer, error, levelRetry, logger) {
   logger.warn(`parsing error: ${error.message}`);
   observer.emit(Events.ERROR, Events.ERROR, {
     type: ErrorTypes.MEDIA_ERROR,
@@ -16154,10 +16195,10 @@ function emitParsingError(observer, error, levelRetry) {
     reason: error.message
   });
 }
-function logEncryptedSamplesFoundInUnencryptedStream(type) {
+function logEncryptedSamplesFoundInUnencryptedStream(type, logger) {
   logger.log(`${type} with AES-128-CBC encryption found in unencrypted stream`);
 }
-function parsePES(stream) {
+function parsePES(stream, logger) {
   let i = 0;
   let frag;
   let pesLen;
@@ -17042,7 +17083,8 @@ const AC3_SAMPLES_PER_FRAME = 1536;
 let chromeVersion = null;
 let safariWebkitVersion = null;
 class MP4Remuxer {
-  constructor(observer, config, typeSupported, vendor = '') {
+  constructor(observer, config, typeSupported, logger) {
+    this.logger = void 0;
     this.observer = void 0;
     this.config = void 0;
     this.typeSupported = void 0;
@@ -17058,6 +17100,7 @@ class MP4Remuxer {
     this.observer = observer;
     this.config = config;
     this.typeSupported = typeSupported;
+    this.logger = logger;
     this.ISGenerated = false;
     if (chromeVersion === null) {
       const userAgent = navigator.userAgent || '';
@@ -17074,16 +17117,16 @@ class MP4Remuxer {
     this.config = this.videoTrackConfig = this._initPTS = this._initDTS = null;
   }
   resetTimeStamp(defaultTimeStamp) {
-    logger.log('[mp4-remuxer]: initPTS & initDTS reset');
+    this.logger.log('[mp4-remuxer]: initPTS & initDTS reset');
     this._initPTS = this._initDTS = defaultTimeStamp;
   }
   resetNextTimestamp() {
-    logger.log('[mp4-remuxer]: reset next timestamp');
+    this.logger.log('[mp4-remuxer]: reset next timestamp');
     this.isVideoContiguous = false;
     this.isAudioContiguous = false;
   }
   resetInitSegment() {
-    logger.log('[mp4-remuxer]: ISGenerated flag reset');
+    this.logger.log('[mp4-remuxer]: ISGenerated flag reset');
     this.ISGenerated = false;
     this.videoTrackConfig = undefined;
   }
@@ -17102,7 +17145,7 @@ class MP4Remuxer {
       }
     }, videoSamples[0].pts);
     if (rolloverDetected) {
-      logger.debug('PTS rollover detected');
+      this.logger.debug('PTS rollover detected');
     }
     return startPTS;
   }
@@ -17146,14 +17189,14 @@ class MP4Remuxer {
         if (!isVideoContiguous && this.config.forceKeyFrameOnDiscontinuity) {
           independent = true;
           if (firstKeyFrameIndex > 0) {
-            logger.warn(`[mp4-remuxer]: Dropped ${firstKeyFrameIndex} out of ${length} video samples due to a missing keyframe`);
+            this.logger.warn(`[mp4-remuxer]: Dropped ${firstKeyFrameIndex} out of ${length} video samples due to a missing keyframe`);
             const startPTS = this.getVideoStartPts(videoTrack.samples);
             videoTrack.samples = videoTrack.samples.slice(firstKeyFrameIndex);
             videoTrack.dropped += firstKeyFrameIndex;
             videoTimeOffset += (videoTrack.samples[0].pts - startPTS) / videoTrack.inputTimeScale;
             firstKeyFramePTS = videoTimeOffset;
           } else if (firstKeyFrameIndex === -1) {
-            logger.warn(`[mp4-remuxer]: No keyframe found out of ${length} video samples`);
+            this.logger.warn(`[mp4-remuxer]: No keyframe found out of ${length} video samples`);
             independent = false;
           }
         }
@@ -17175,7 +17218,7 @@ class MP4Remuxer {
         if (enoughAudioSamples) {
           // if initSegment was generated without audio samples, regenerate it again
           if (!audioTrack.samplerate) {
-            logger.warn('[mp4-remuxer]: regenerate InitSegment as audio detected');
+            this.logger.warn('[mp4-remuxer]: regenerate InitSegment as audio detected');
             initSegment = this.generateIS(audioTrack, videoTrack, timeOffset, accurateTimeOffset);
           }
           audio = this.remuxAudio(audioTrack, audioTimeOffset, this.isAudioContiguous, accurateTimeOffset, hasVideo || enoughVideoSamples || playlistType === PlaylistLevelType.AUDIO ? videoTimeOffset : undefined);
@@ -17183,7 +17226,7 @@ class MP4Remuxer {
             const audioTrackLength = audio ? audio.endPTS - audio.startPTS : 0;
             // if initSegment was generated without video samples, regenerate it again
             if (!videoTrack.inputTimeScale) {
-              logger.warn('[mp4-remuxer]: regenerate InitSegment as video detected');
+              this.logger.warn('[mp4-remuxer]: regenerate InitSegment as video detected');
               initSegment = this.generateIS(audioTrack, videoTrack, timeOffset, accurateTimeOffset);
             }
             video = this.remuxVideo(videoTrack, videoTimeOffset, isVideoContiguous, audioTrackLength);
@@ -17389,9 +17432,9 @@ class MP4Remuxer {
       const foundOverlap = delta < -1;
       if (foundHole || foundOverlap) {
         if (foundHole) {
-          logger.warn(`${(track.segmentCodec || '').toUpperCase()}: ${toMsFromMpegTsClock(delta, true)} ms (${delta}dts) hole between fragments detected at ${timeOffset.toFixed(3)}`);
+          this.logger.warn(`${(track.segmentCodec || '').toUpperCase()}: ${toMsFromMpegTsClock(delta, true)} ms (${delta}dts) hole between fragments detected at ${timeOffset.toFixed(3)}`);
         } else {
-          logger.warn(`${(track.segmentCodec || '').toUpperCase()}: ${toMsFromMpegTsClock(-delta, true)} ms (${delta}dts) overlapping between fragments detected at ${timeOffset.toFixed(3)}`);
+          this.logger.warn(`${(track.segmentCodec || '').toUpperCase()}: ${toMsFromMpegTsClock(-delta, true)} ms (${delta}dts) overlapping between fragments detected at ${timeOffset.toFixed(3)}`);
         }
         if (!foundOverlap || nextAvcDts >= inputSamples[0].pts || chromeVersion) {
           firstDTS = nextAvcDts;
@@ -17420,7 +17463,7 @@ class MP4Remuxer {
               }
             }
           }
-          logger.log(`Video: Initial PTS/DTS adjusted: ${toMsFromMpegTsClock(firstPTS, true)}/${toMsFromMpegTsClock(firstDTS, true)}, delta: ${toMsFromMpegTsClock(delta, true)} ms`);
+          this.logger.log(`Video: Initial PTS/DTS adjusted: ${toMsFromMpegTsClock(firstPTS, true)}/${toMsFromMpegTsClock(firstDTS, true)}, delta: ${toMsFromMpegTsClock(delta, true)} ms`);
         }
       }
     }
@@ -17520,7 +17563,7 @@ class MP4Remuxer {
             } else {
               stretchedLastFrame = true;
             }
-            logger.log(`[mp4-remuxer]: It is approximately ${deltaToFrameEnd / 90} ms to the next segment; using duration ${mp4SampleDuration / 90} ms for the last video frame.`);
+            this.logger.log(`[mp4-remuxer]: It is approximately ${deltaToFrameEnd / 90} ms to the next segment; using duration ${mp4SampleDuration / 90} ms for the last video frame.`);
           } else {
             mp4SampleDuration = lastFrameDuration;
           }
@@ -17548,7 +17591,7 @@ class MP4Remuxer {
         // Fix for "CNN special report, with CC" in test-streams (Safari browser only)
         // Ignore DTS when frame durations are irregular. Safari MSE does not handle this leading to gaps.
         if (maxPtsDelta - minPtsDelta < maxDtsDelta - minDtsDelta && averageSampleDuration / maxDtsDelta < 0.025 && outputSamples[0].cts === 0) {
-          logger.warn('Found irregular gaps in sample duration. Using PTS instead of DTS to determine MP4 sample duration.');
+          this.logger.warn('Found irregular gaps in sample duration. Using PTS instead of DTS to determine MP4 sample duration.');
           let dts = firstDTS;
           for (let i = 0, len = outputSamples.length; i < len; i++) {
             const nextDts = dts + outputSamples[i].duration;
@@ -17673,7 +17716,7 @@ class MP4Remuxer {
         // When remuxing with video, if we're overlapping by more than a duration, drop this sample to stay in sync
         if (delta <= -maxAudioFramesDrift * inputSampleDuration && alignedWithVideo) {
           if (i === 0) {
-            logger.warn(`Audio frame @ ${(pts / inputTimeScale).toFixed(3)}s overlaps nextAudioPts by ${Math.round(1000 * delta / inputTimeScale)} ms.`);
+            this.logger.warn(`Audio frame @ ${(pts / inputTimeScale).toFixed(3)}s overlaps nextAudioPts by ${Math.round(1000 * delta / inputTimeScale)} ms.`);
             this.nextAudioPts = nextAudioPts = nextPts = pts;
           }
         } // eslint-disable-line brace-style
@@ -17695,12 +17738,12 @@ class MP4Remuxer {
           if (i === 0) {
             this.nextAudioPts = nextAudioPts = nextPts;
           }
-          logger.warn(`[mp4-remuxer]: Injecting ${missing} audio frame @ ${(nextPts / inputTimeScale).toFixed(3)}s due to ${Math.round(1000 * delta / inputTimeScale)} ms gap.`);
+          this.logger.warn(`[mp4-remuxer]: Injecting ${missing} audio frame @ ${(nextPts / inputTimeScale).toFixed(3)}s due to ${Math.round(1000 * delta / inputTimeScale)} ms gap.`);
           for (let j = 0; j < missing; j++) {
             const newStamp = Math.max(nextPts, 0);
             let fillFrame = AAC.getSilentFrame(track.parsedCodec || track.manifestCodec || track.codec, track.channelCount);
             if (!fillFrame) {
-              logger.log('[mp4-remuxer]: Unable to get silent frame for given audio codec; duplicating last frame instead.');
+              this.logger.log('[mp4-remuxer]: Unable to get silent frame for given audio codec; duplicating last frame instead.');
               fillFrame = sample.unit.subarray();
             }
             inputSamples.splice(i, 0, {
@@ -17899,7 +17942,8 @@ class Mp4Sample {
 }
 
 class PassThroughRemuxer {
-  constructor() {
+  constructor(observer, config, typeSupported, logger) {
+    this.logger = void 0;
     this.emitInitSegment = false;
     this.audioCodec = void 0;
     this.videoCodec = void 0;
@@ -17907,6 +17951,7 @@ class PassThroughRemuxer {
     this.initPTS = null;
     this.initTracks = void 0;
     this.lastEndTime = null;
+    this.logger = logger;
   }
   destroy() {}
   resetTimeStamp(defaultInitPTS) {
@@ -17964,7 +18009,7 @@ class PassThroughRemuxer {
         id: 'main'
       };
     } else {
-      logger.warn('[passthrough-remuxer.ts]: initSegment does not contain moov or trak boxes.');
+      this.logger.warn('[passthrough-remuxer.ts]: initSegment does not contain moov or trak boxes.');
     }
     this.initTracks = tracks;
   }
@@ -18006,7 +18051,7 @@ class PassThroughRemuxer {
     }
     if (!((_initData2 = initData) != null && _initData2.length)) {
       // We can't remux if the initSegment could not be generated
-      logger.warn('[passthrough-remuxer.ts]: Failed to generate initSegment.');
+      this.logger.warn('[passthrough-remuxer.ts]: Failed to generate initSegment.');
       return result;
     }
     if (this.emitInitSegment) {
@@ -18019,7 +18064,7 @@ class PassThroughRemuxer {
     if (isInvalidInitPts(initPTS, decodeTime, timeOffset, duration) || initSegment.timescale !== initPTS.timescale && accurateTimeOffset) {
       initSegment.initPTS = decodeTime - timeOffset;
       if (initPTS && initPTS.timescale === 1) {
-        logger.warn(`Adjusting initPTS @${timeOffset} from ${initPTS.baseTime / initPTS.timescale} to ${initSegment.initPTS}`);
+        this.logger.warn(`Adjusting initPTS @${timeOffset} from ${initPTS.baseTime / initPTS.timescale} to ${initSegment.initPTS}`);
       }
       this.initPTS = initPTS = {
         baseTime: initSegment.initPTS,
@@ -18032,7 +18077,7 @@ class PassThroughRemuxer {
     if (duration > 0) {
       this.lastEndTime = endTime;
     } else {
-      logger.warn('Duration parsed from mp4 should be greater than zero');
+      this.logger.warn('Duration parsed from mp4 should be greater than zero');
       this.resetNextTimestamp();
     }
     const hasAudio = !!initData.audio;
@@ -18090,12 +18135,12 @@ function getParsedTrackCodec(track, type) {
       return getCodecCompatibleName(parsedCodec, preferManagedMediaSource);
     }
     const result = 'mp4a.40.5';
-    logger.info(`Parsed audio codec "${parsedCodec}" or audio object type not handled. Using "${result}"`);
+    this.logger.info(`Parsed audio codec "${parsedCodec}" or audio object type not handled. Using "${result}"`);
     return result;
   }
   // Provide defaults based on codec type
   // This allows for some playback of some fmp4 playlists without CODECS defined in manifest
-  logger.warn(`Unhandled video codec "${parsedCodec}"`);
+  this.logger.warn(`Unhandled video codec "${parsedCodec}"`);
   if (parsedCodec === 'hvc1' || parsedCodec === 'hev1') {
     return 'hvc1.1.6.L120.90';
   }
@@ -18105,16 +18150,12 @@ function getParsedTrackCodec(track, type) {
   return 'avc1.42e01e';
 }
 
-/** returns `undefined` is `self` is missing, e.g. in node */
-const optionalSelf = typeof self !== 'undefined' ? self : undefined;
-
 let now;
 // performance.now() not available on WebWorker, at least on Safari Desktop
 try {
   now = self.performance.now.bind(self.performance);
 } catch (err) {
-  logger.debug('Unable to use Performance API on this environment');
-  now = optionalSelf == null ? void 0 : optionalSelf.Date.now;
+  now = Date.now;
 }
 const muxConfig = [{
   demux: MP4Demuxer,
@@ -18130,8 +18171,9 @@ const muxConfig = [{
   remux: MP4Remuxer
 }];
 class Transmuxer {
-  constructor(observer, typeSupported, config, vendor, id) {
-    this.async = false;
+  constructor(observer, typeSupported, config, vendor, id, logger) {
+    this.asyncResult = false;
+    this.logger = void 0;
     this.observer = void 0;
     this.typeSupported = void 0;
     this.config = void 0;
@@ -18149,6 +18191,7 @@ class Transmuxer {
     this.config = config;
     this.vendor = vendor;
     this.id = id;
+    this.logger = logger;
   }
   configure(transmuxConfig) {
     this.transmuxConfig = transmuxConfig;
@@ -18203,6 +18246,7 @@ class Transmuxer {
         }
         uintData = new Uint8Array(decryptedData);
       } else {
+        this.asyncResult = true;
         this.decryptionPromise = decrypter.webCryptoDecrypt(uintData, keyData.key.buffer, keyData.iv.buffer, aesMode).then(decryptedData => {
           // Calling push here is important; if flush() is called while this is still resolving, this ensures that
           // the decrypted data has been transmuxed
@@ -18217,7 +18261,7 @@ class Transmuxer {
     if (resetMuxers) {
       const error = this.configureTransmuxer(uintData);
       if (error) {
-        logger.warn(`[transmuxer] ${error.message}`);
+        this.logger.warn(`[transmuxer] ${error.message}`);
         this.observer.emit(Events.ERROR, Events.ERROR, {
           type: ErrorTypes.MEDIA_ERROR,
           details: ErrorDetails.FRAG_PARSING_ERROR,
@@ -18239,6 +18283,7 @@ class Transmuxer {
       this.resetContiguity();
     }
     const result = this.transmux(uintData, keyData, timeOffset, accurateTimeOffset, chunkMeta);
+    this.asyncResult = isPromise(result);
     const currentState = this.currentTransmuxState;
     currentState.contiguous = true;
     currentState.discontinuity = false;
@@ -18257,6 +18302,7 @@ class Transmuxer {
       decryptionPromise
     } = this;
     if (decryptionPromise) {
+      this.asyncResult = true;
       // Upon resolution, the decryption promise calls push() and returns its TransmuxerResult up the stack. Therefore
       // only flushing is required for async decryption
       return decryptionPromise.then(() => {
@@ -18284,10 +18330,15 @@ class Transmuxer {
     if (!demuxer || !remuxer) {
       // If probing failed, then Hls.js has been given content its not able to handle
       stats.executeEnd = now();
-      return [emptyResult(chunkMeta)];
+      const emptyResults = [emptyResult(chunkMeta)];
+      if (this.asyncResult) {
+        return Promise.resolve(emptyResults);
+      }
+      return emptyResults;
     }
     const demuxResultOrPromise = demuxer.flush(timeOffset);
     if (isPromise(demuxResultOrPromise)) {
+      this.asyncResult = true;
       // Decrypt final SAMPLE-AES samples
       return demuxResultOrPromise.then(demuxResult => {
         this.flushRemux(transmuxResults, demuxResult, chunkMeta);
@@ -18295,6 +18346,9 @@ class Transmuxer {
       });
     }
     this.flushRemux(transmuxResults, demuxResultOrPromise, chunkMeta);
+    if (this.asyncResult) {
+      return Promise.resolve(transmuxResults);
+    }
     return transmuxResults;
   }
   flushRemux(transmuxResults, demuxResult, chunkMeta) {
@@ -18308,7 +18362,7 @@ class Transmuxer {
       accurateTimeOffset,
       timeOffset
     } = this.currentTransmuxState;
-    logger.log(`[transmuxer.ts]: Flushed fragment ${chunkMeta.sn}${chunkMeta.part > -1 ? ' p: ' + chunkMeta.part : ''} of level ${chunkMeta.level}`);
+    this.logger.log(`[transmuxer.ts]: Flushed ${this.id} sn: ${chunkMeta.sn}${chunkMeta.part > -1 ? ' p: ' + chunkMeta.part : ''} of ${this.id === PlaylistLevelType.MAIN ? 'level' : 'track'} ${chunkMeta.level}`);
     const remuxResult = this.remuxer.remux(audioTrack, videoTrack, id3Track, textTrack, timeOffset, accurateTimeOffset, true, this.id);
     transmuxResults.push({
       remuxResult,
@@ -18401,7 +18455,7 @@ class Transmuxer {
     let mux;
     for (let i = 0, len = muxConfig.length; i < len; i++) {
       var _muxConfig$i$demux;
-      if ((_muxConfig$i$demux = muxConfig[i].demux) != null && _muxConfig$i$demux.probe(data)) {
+      if ((_muxConfig$i$demux = muxConfig[i].demux) != null && _muxConfig$i$demux.probe(data, this.logger)) {
         mux = muxConfig[i];
         break;
       }
@@ -18415,10 +18469,10 @@ class Transmuxer {
     const Remuxer = mux.remux;
     const Demuxer = mux.demux;
     if (!remuxer || !(remuxer instanceof Remuxer)) {
-      this.remuxer = new Remuxer(observer, config, typeSupported, vendor);
+      this.remuxer = new Remuxer(observer, config, typeSupported, this.logger);
     }
     if (!demuxer || !(demuxer instanceof Demuxer)) {
-      this.demuxer = new Demuxer(observer, config, typeSupported);
+      this.demuxer = new Demuxer(observer, config, typeSupported, this.logger);
       this.probe = Demuxer.probe;
     }
   }
@@ -18823,31 +18877,96 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
+let transmuxerInstanceCount = 0;
 class TransmuxerInterface {
-  constructor(hls, id, onTransmuxComplete, onFlush) {
+  constructor(_hls, id, onTransmuxComplete, onFlush) {
     this.error = null;
     this.hls = void 0;
     this.id = void 0;
+    this.instanceNo = transmuxerInstanceCount++;
     this.observer = void 0;
     this.frag = null;
     this.part = null;
     this.useWorker = void 0;
     this.workerContext = null;
-    this.onwmsg = void 0;
     this.transmuxer = null;
     this.onTransmuxComplete = void 0;
     this.onFlush = void 0;
-    const config = hls.config;
-    this.hls = hls;
+    this.onWorkerMessage = event => {
+      const data = event.data;
+      const hls = this.hls;
+      if (!hls || !(data != null && data.event) || data.instanceNo !== this.instanceNo) {
+        return;
+      }
+      switch (data.event) {
+        case 'init':
+          {
+            var _this$workerContext;
+            const objectURL = (_this$workerContext = this.workerContext) == null ? void 0 : _this$workerContext.objectURL;
+            if (objectURL) {
+              // revoke the Object URL that was used to create transmuxer worker, so as not to leak it
+              self.URL.revokeObjectURL(objectURL);
+            }
+            break;
+          }
+        case 'transmuxComplete':
+          {
+            this.handleTransmuxComplete(data.data);
+            break;
+          }
+        case 'flush':
+          {
+            this.onFlush(data.data);
+            break;
+          }
+
+        // pass logs from the worker thread to the main logger
+        case 'workerLog':
+          {
+            if (hls.logger[data.data.logType]) {
+              hls.logger[data.data.logType](data.data.message);
+            }
+            break;
+          }
+        default:
+          {
+            data.data = data.data || {};
+            data.data.frag = this.frag;
+            data.data.part = this.part;
+            data.data.id = this.id;
+            hls.trigger(data.event, data.data);
+            break;
+          }
+      }
+    };
+    this.onWorkerError = event => {
+      if (!this.hls) {
+        return;
+      }
+      const error = new Error(`${event.message}  (${event.filename}:${event.lineno})`);
+      this.hls.config.enableWorker = false;
+      this.hls.logger.warn(`Error in "${this.id}" Web Worker, fallback to inline`);
+      this.hls.trigger(Events.ERROR, {
+        type: ErrorTypes.OTHER_ERROR,
+        details: ErrorDetails.INTERNAL_EXCEPTION,
+        fatal: false,
+        event: 'demuxerWorker',
+        error
+      });
+    };
+    const config = _hls.config;
+    this.hls = _hls;
     this.id = id;
     this.useWorker = !!config.enableWorker;
     this.onTransmuxComplete = onTransmuxComplete;
     this.onFlush = onFlush;
     const forwardMessage = (ev, data) => {
       data = data || {};
-      data.frag = this.frag;
-      data.id = this.id;
+      data.frag = this.frag || undefined;
       if (ev === Events.ERROR) {
+        data = data;
+        data.parent = this.id;
+        data.part = this.part;
         this.error = data.error;
       }
       this.hls.trigger(ev, data);
@@ -18859,6 +18978,7 @@ class TransmuxerInterface {
     this.observer.on(Events.ERROR, forwardMessage);
     const m2tsTypeSupported = getM2TSSupportedAudioTypes(config.preferManagedMediaSource);
     if (this.useWorker && typeof Worker !== 'undefined') {
+      const logger = this.hls.logger;
       const canCreateWorker = config.workerPath || hasUMDWorker();
       if (canCreateWorker) {
         try {
@@ -18869,61 +18989,63 @@ class TransmuxerInterface {
             logger.log(`injecting Web Worker for "${id}"`);
             this.workerContext = injectWorker();
           }
-          this.onwmsg = event => this.onWorkerMessage(event);
           const {
             worker
           } = this.workerContext;
-          worker.addEventListener('message', this.onwmsg);
-          worker.onerror = event => {
-            const error = new Error(`${event.message}  (${event.filename}:${event.lineno})`);
-            config.enableWorker = false;
-            logger.warn(`Error in "${id}" Web Worker, fallback to inline`);
-            this.hls.trigger(Events.ERROR, {
-              type: ErrorTypes.OTHER_ERROR,
-              details: ErrorDetails.INTERNAL_EXCEPTION,
-              fatal: false,
-              event: 'demuxerWorker',
-              error
-            });
-          };
+          worker.addEventListener('message', this.onWorkerMessage);
+          worker.addEventListener('error', this.onWorkerError);
           worker.postMessage({
+            instanceNo: this.instanceNo,
             cmd: 'init',
             typeSupported: m2tsTypeSupported,
-            vendor: '',
-            id: id,
+            id,
             config: JSON.stringify(config)
           });
         } catch (err) {
           logger.warn(`Error setting up "${id}" Web Worker, fallback to inline`, err);
-          this.resetWorker();
+          this.terminateWorker();
           this.error = null;
-          this.transmuxer = new Transmuxer(this.observer, m2tsTypeSupported, config, '', id);
+          this.transmuxer = new Transmuxer(this.observer, m2tsTypeSupported, config, '', id, _hls.logger);
         }
         return;
       }
     }
-    this.transmuxer = new Transmuxer(this.observer, m2tsTypeSupported, config, '', id);
+    this.transmuxer = new Transmuxer(this.observer, m2tsTypeSupported, config, '', id, _hls.logger);
   }
-  resetWorker() {
+  reset() {
+    this.frag = null;
+    this.part = null;
+    if (this.workerContext) {
+      const instanceNo = this.instanceNo;
+      this.instanceNo = transmuxerInstanceCount++;
+      const config = this.hls.config;
+      const m2tsTypeSupported = getM2TSSupportedAudioTypes(config.preferManagedMediaSource);
+      this.workerContext.worker.postMessage({
+        instanceNo: this.instanceNo,
+        cmd: 'reset',
+        resetNo: instanceNo,
+        typeSupported: m2tsTypeSupported,
+        id: this.id,
+        config: JSON.stringify(config)
+      });
+    }
+  }
+  terminateWorker() {
     if (this.workerContext) {
       const {
-        worker,
-        objectURL
+        worker
       } = this.workerContext;
-      if (objectURL) {
-        // revoke the Object URL that was used to create transmuxer worker, so as not to leak it
-        self.URL.revokeObjectURL(objectURL);
-      }
-      worker.removeEventListener('message', this.onwmsg);
-      worker.onerror = null;
-      worker.terminate();
       this.workerContext = null;
+      worker.removeEventListener('message', this.onWorkerMessage);
+      worker.removeEventListener('error', this.onWorkerError);
+      removeWorkerFromStore(this.hls.config.workerPath);
     }
   }
   destroy() {
     if (this.workerContext) {
-      this.resetWorker();
-      this.onwmsg = undefined;
+      this.terminateWorker();
+      // @ts-ignore
+      this.onWorkerMessage = this.onWorkerError = null;
     } else {
       const transmuxer = this.transmuxer;
       if (transmuxer) {
@@ -18936,6 +19058,7 @@ class TransmuxerInterface {
       observer.removeAllListeners();
     }
     this.frag = null;
+    this.part = null;
     // @ts-ignore
     this.observer = null;
     // @ts-ignore
@@ -18945,6 +19068,7 @@ class TransmuxerInterface {
     var _frag$initSegment, _lastFrag$initSegment;
     chunkMeta.transmuxing.start = self.performance.now();
     const {
+      instanceNo,
       transmuxer
     } = this;
     const timeOffset = part ? part.start : frag.start;
@@ -18967,7 +19091,7 @@ class TransmuxerInterface {
     const initSegmentChange = !(lastFrag && ((_frag$initSegment = frag.initSegment) == null ? void 0 : _frag$initSegment.url) === ((_lastFrag$initSegment = lastFrag.initSegment) == null ? void 0 : _lastFrag$initSegment.url));
     const state = new TransmuxState(discontinuity, contiguous, accurateTimeOffset, trackSwitch, timeOffset, initSegmentChange);
     if (!contiguous || discontinuity || initSegmentChange) {
-      logger.log(`[transmuxer-interface, ${frag.type}]: Starting new transmux session for sn: ${chunkMeta.sn} p: ${chunkMeta.part} level: ${chunkMeta.level} id: ${chunkMeta.id}
+      this.hls.logger.log(`[transmuxer-interface, ${frag.type}]: Starting new transmux session for sn: ${chunkMeta.sn} p: ${chunkMeta.part} level: ${chunkMeta.level} id: ${chunkMeta.id}
         discontinuity: ${discontinuity}
         trackSwitch: ${trackSwitch}
         contiguous: ${contiguous}
@@ -18984,6 +19108,7 @@ class TransmuxerInterface {
     if (this.workerContext) {
       // post fragment payload as transferable objects for ArrayBuffer (no copy)
       this.workerContext.worker.postMessage({
+        instanceNo,
         cmd: 'demux',
         data,
         decryptdata,
@@ -18993,14 +19118,12 @@ class TransmuxerInterface {
     } else if (transmuxer) {
       const transmuxResult = transmuxer.push(data, decryptdata, chunkMeta, state);
       if (isPromise(transmuxResult)) {
-        transmuxer.async = true;
         transmuxResult.then(data => {
           this.handleTransmuxComplete(data);
         }).catch(error => {
           this.transmuxerError(error, chunkMeta, 'transmuxer-interface push error');
         });
       } else {
-        transmuxer.async = false;
         this.handleTransmuxComplete(transmuxResult);
       }
     }
@@ -19008,20 +19131,18 @@ class TransmuxerInterface {
   flush(chunkMeta) {
     chunkMeta.transmuxing.start = self.performance.now();
     const {
+      instanceNo,
       transmuxer
     } = this;
     if (this.workerContext) {
       this.workerContext.worker.postMessage({
+        instanceNo,
         cmd: 'flush',
         chunkMeta
       });
     } else if (transmuxer) {
-      let transmuxResult = transmuxer.flush(chunkMeta);
-      const asyncFlush = isPromise(transmuxResult);
-      if (asyncFlush || transmuxer.async) {
-        if (!isPromise(transmuxResult)) {
-          transmuxResult = Promise.resolve(transmuxResult);
-        }
+      const transmuxResult = transmuxer.flush(chunkMeta);
+      if (isPromise(transmuxResult)) {
         transmuxResult.then(data => {
           this.handleFlushResult(data, chunkMeta);
         }).catch(error => {
@@ -19042,6 +19163,7 @@ class TransmuxerInterface {
       details: ErrorDetails.FRAG_PARSING_ERROR,
       chunkMeta,
       frag: this.frag || undefined,
+      part: this.part || undefined,
       fatal: false,
       error,
       err: error,
@@ -19054,60 +19176,14 @@ class TransmuxerInterface {
     });
     this.onFlush(chunkMeta);
   }
-  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':
-        {
-          var _this$workerContext;
-          const objectURL = (_this$workerContext = this.workerContext) == null ? void 0 : _this$workerContext.objectURL;
-          if (objectURL) {
-            // revoke the Object URL that was used to create transmuxer worker, so as not to leak it
-            self.URL.revokeObjectURL(objectURL);
-          }
-          break;
-        }
-      case 'transmuxComplete':
-        {
-          this.handleTransmuxComplete(data.data);
-          break;
-        }
-      case 'flush':
-        {
-          this.onFlush(data.data);
-          break;
-        }
-
-      // pass logs from the worker thread to the main logger
-      case 'workerLog':
-        if (logger[data.data.logType]) {
-          logger[data.data.logType](data.data.message);
-        }
-        break;
-      default:
-        {
-          data.data = data.data || {};
-          data.data.frag = this.frag;
-          data.data.id = this.id;
-          hls.trigger(data.event, data.data);
-          break;
-        }
-    }
-  }
   configureTransmuxer(config) {
     const {
+      instanceNo,
       transmuxer
     } = this;
     if (this.workerContext) {
       this.workerContext.worker.postMessage({
+        instanceNo,
         cmd: 'configure',
         config
       });
@@ -20636,7 +20712,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.14-0.canary.10431";
+    return version;
   }
 
   /**