hls.js 1.5.14-0.canary.10520 → 1.5.14-0.canary.10524

package/package.json

@@ -130,5 +130,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "3.67.1"
   },
-  "version": "1.5.14-0.canary.10520"
+  "version": "1.5.14-0.canary.10524"
 }

package/src/demux/audio/base-audio-demuxer.ts

@@ -174,7 +174,11 @@ class BaseAudioDemuxer implements Demuxer {
     };
   }
 
-  destroy() {}
+  destroy() {
+    this.cachedData = null;
+    // @ts-ignore
+    this._audioTrack = this._id3Track = undefined;
+  }
 }
 
 /**

package/src/demux/mp4demuxer.ts

@@ -194,7 +194,16 @@ class MP4Demuxer implements Demuxer {
     );
   }
 
-  destroy() {}
+  destroy() {
+    // @ts-ignore
+    this.config = null;
+    this.remainderData = null;
+    this.videoTrack =
+      this.audioTrack =
+      this.id3Track =
+      this.txtTrack =
+        undefined;
+  }
 }
 
 export default MP4Demuxer;

package/src/demux/tsdemuxer.ts

@@ -63,7 +63,6 @@ class TSDemuxer implements Demuxer {
   private pmtParsed: boolean = false;
   private audioCodec?: string;
   private videoCodec?: string;
-  private _duration: number = 0;
   private _pmtId: number = -1;
 
   private _videoTrack?: DemuxedVideoTrack;
@@ -182,6 +181,7 @@ class TSDemuxer implements Demuxer {
     this._pmtId = -1;
 
     this._videoTrack = TSDemuxer.createTrack('video') as DemuxedVideoTrack;
+    this._videoTrack.duration = trackDuration;
     this._audioTrack = TSDemuxer.createTrack(
       'audio',
       trackDuration,
@@ -195,7 +195,6 @@ class TSDemuxer implements Demuxer {
     this.remainderData = null;
     this.audioCodec = audioCodec;
     this.videoCodec = videoCodec;
-    this._duration = trackDuration;
   }
 
   public resetTimeStamp() {}
@@ -305,13 +304,7 @@ class TSDemuxer implements Demuxer {
                   }
                 }
                 if (this.videoParser !== null) {
-                  this.videoParser.parsePES(
-                    videoTrack,
-                    textTrack,
-                    pes,
-                    false,
-                    this._duration,
-                  );
+                  this.videoParser.parsePES(videoTrack, textTrack, pes, false);
                 }
               }
 
@@ -502,7 +495,6 @@ class TSDemuxer implements Demuxer {
           textTrack as DemuxedUserdataTrack,
           pes,
           true,
-          this._duration,
         );
         videoTrack.pesData = null;
       }
@@ -590,7 +582,21 @@ class TSDemuxer implements Demuxer {
   }
 
   public destroy() {
-    this._duration = 0;
+    if (this.observer) {
+      this.observer.removeAllListeners();
+    }
+    // @ts-ignore
+    this.config = this.logger = this.observer = null;
+    this.aacOverFlow =
+      this.videoParser =
+      this.remainderData =
+      this.sampleAes =
+        null;
+    this._videoTrack =
+      this._audioTrack =
+      this._id3Track =
+      this._txtTrack =
+        undefined;
   }
 
   private parseAACPES(track: DemuxedAudioTrack, pes: PES) {

package/src/demux/video/avc-video-parser.ts

@@ -15,10 +15,8 @@ class AvcVideoParser extends BaseVideoParser {
     textTrack: DemuxedUserdataTrack,
     pes: PES,
     endOfSegment: boolean,
-    duration: number,
   ) {
     const units = this.parseNALu(track, pes.data, endOfSegment);
-    const debug = false;
     let VideoSample = this.VideoSample;
     let push: boolean;
     let spsfound = false;
@@ -33,7 +31,6 @@ class AvcVideoParser extends BaseVideoParser {
         false,
         pes.pts,
         pes.dts,
-        '',
       );
     }
 
@@ -76,14 +73,8 @@ class AvcVideoParser extends BaseVideoParser {
               true,
               pes.pts,
               pes.dts,
-              '',
             );
           }
-
-          if (debug) {
-            VideoSample.debug += 'NDR ';
-          }
-
           VideoSample.frame = true;
           VideoSample.key = iskey;
 
@@ -103,23 +94,15 @@ class AvcVideoParser extends BaseVideoParser {
               true,
               pes.pts,
               pes.dts,
-              '',
             );
           }
 
-          if (debug) {
-            VideoSample.debug += 'IDR ';
-          }
-
           VideoSample.key = true;
           VideoSample.frame = true;
           break;
         // SEI
         case 6: {
           push = true;
-          if (debug && VideoSample) {
-            VideoSample.debug += 'SEI ';
-          }
           parseSEIMessageFromNALu(
             unit.data,
             1,
@@ -132,9 +115,6 @@ class AvcVideoParser extends BaseVideoParser {
         case 7: {
           push = true;
           spsfound = true;
-          if (debug && VideoSample) {
-            VideoSample.debug += 'SPS ';
-          }
           const sps = unit.data;
           const config = this.readSPS(sps);
           if (
@@ -148,7 +128,6 @@ class AvcVideoParser extends BaseVideoParser {
             track.height = config.height;
             track.pixelRatio = config.pixelRatio;
             track.sps = [sps];
-            track.duration = duration;
             const codecarray = sps.subarray(1, 4);
             let codecstring = 'avc1.';
             for (let i = 0; i < 3; i++) {
@@ -166,9 +145,6 @@ class AvcVideoParser extends BaseVideoParser {
         // PPS
         case 8:
           push = true;
-          if (debug && VideoSample) {
-            VideoSample.debug += 'PPS ';
-          }
 
           track.pps = [unit.data];
 
@@ -177,16 +153,17 @@ class AvcVideoParser extends BaseVideoParser {
         case 9:
           push = true;
           track.audFound = true;
-          if (VideoSample) {
+          if (VideoSample?.frame) {
             this.pushAccessUnit(VideoSample, track);
+            VideoSample = null;
+          }
+          if (!VideoSample) {
+            VideoSample = this.VideoSample = this.createVideoSample(
+              false,
+              pes.pts,
+              pes.dts,
+            );
           }
-
-          VideoSample = this.VideoSample = this.createVideoSample(
-            false,
-            pes.pts,
-            pes.dts,
-            debug ? 'AUD ' : '',
-          );
           break;
         // Filler Data
         case 12:
@@ -194,9 +171,6 @@ class AvcVideoParser extends BaseVideoParser {
           break;
         default:
           push = false;
-          if (VideoSample) {
-            VideoSample.debug += 'unknown NAL ' + unit.type + ' ';
-          }
 
           break;
       }

package/src/demux/video/base-video-parser.ts

@@ -6,7 +6,6 @@ import type {
   VideoSampleUnit,
 } from '../../types/demuxer';
 import type { PES } from '../tsdemuxer';
-import { logger } from '../../utils/logger';
 import { appendUint8Array } from '../../utils/mp4-tools';
 
 abstract class BaseVideoParser {
@@ -16,7 +15,6 @@ abstract class BaseVideoParser {
     key: boolean,
     pts: number | undefined,
     dts: number | undefined,
-    debug: string,
   ): ParsedVideoSample {
     return {
       key,
@@ -24,7 +22,6 @@ abstract class BaseVideoParser {
       pts,
       dts,
       units: [],
-      debug,
       length: 0,
     };
   }
@@ -66,11 +63,6 @@ abstract class BaseVideoParser {
       }
       videoTrack.samples.push(VideoSample as VideoSample);
     }
-    if (VideoSample.debug.length) {
-      logger.log(
-        VideoSample.pts + '/' + VideoSample.dts + ':' + VideoSample.debug,
-      );
-    }
   }
 
   abstract parsePES(
@@ -78,7 +70,6 @@ abstract class BaseVideoParser {
     textTrack: DemuxedUserdataTrack,
     pes: PES,
     last: boolean,
-    duration: number,
   );
 
   protected abstract getNALuType(data: Uint8Array, offset: number): number;

package/src/demux/video/hevc-video-parser.ts

@@ -17,10 +17,8 @@ class HevcVideoParser extends BaseVideoParser {
     textTrack: DemuxedUserdataTrack,
     pes: PES,
     endOfSegment: boolean,
-    duration: number,
   ) {
     const units = this.parseNALu(track, pes.data, endOfSegment);
-    const debug = false;
     let VideoSample = this.VideoSample;
     let push: boolean;
     let spsfound = false;
@@ -35,7 +33,6 @@ class HevcVideoParser extends BaseVideoParser {
         false,
         pes.pts,
         pes.dts,
-        '',
       );
     }
 
@@ -57,12 +54,8 @@ class HevcVideoParser extends BaseVideoParser {
               false,
               pes.pts,
               pes.dts,
-              '',
             );
           }
-          if (debug) {
-            VideoSample.debug += 'NDR ';
-          }
           VideoSample.frame = true;
           push = true;
           break;
@@ -86,14 +79,9 @@ class HevcVideoParser extends BaseVideoParser {
               true,
               pes.pts,
               pes.dts,
-              '',
             );
           }
 
-          if (debug) {
-            VideoSample.debug += 'RAP ';
-          }
-
           VideoSample.key = true;
           VideoSample.frame = true;
           break;
@@ -113,13 +101,9 @@ class HevcVideoParser extends BaseVideoParser {
               true,
               pes.pts,
               pes.dts,
-              '',
             );
           }
 
-          if (debug) {
-            VideoSample.debug += 'IDR ';
-          }
           VideoSample.key = true;
           VideoSample.frame = true;
           break;
@@ -127,9 +111,6 @@ class HevcVideoParser extends BaseVideoParser {
         // SEI
         case 39:
           push = true;
-          if (debug && VideoSample) {
-            VideoSample.debug += 'SEI ';
-          }
           parseSEIMessageFromNALu(
             unit.data,
             2, // NALu header size
@@ -141,9 +122,6 @@ class HevcVideoParser extends BaseVideoParser {
         // VPS
         case 32:
           push = true;
-          if (debug && VideoSample) {
-            VideoSample.debug += 'VPS ';
-          }
           if (!track.vps) {
             const config = this.readVPS(unit.data);
             track.params = { ...config };
@@ -156,9 +134,6 @@ class HevcVideoParser extends BaseVideoParser {
         case 33:
           push = true;
           spsfound = true;
-          if (debug && VideoSample) {
-            VideoSample.debug += 'SPS ';
-          }
           if (typeof track.params === 'object') {
             if (
               track.vps !== undefined &&
@@ -174,7 +149,6 @@ class HevcVideoParser extends BaseVideoParser {
               track.width = config.width;
               track.height = config.height;
               track.pixelRatio = config.pixelRatio;
-              track.duration = duration;
               track.codec = config.codecString;
               track.sps = [];
               for (const prop in config.params) {
@@ -190,7 +164,6 @@ class HevcVideoParser extends BaseVideoParser {
               true,
               pes.pts,
               pes.dts,
-              '',
             );
           }
           VideoSample.key = true;
@@ -199,9 +172,6 @@ class HevcVideoParser extends BaseVideoParser {
         // PPS
         case 34:
           push = true;
-          if (debug && VideoSample) {
-            VideoSample.debug += 'PPS ';
-          }
           if (typeof track.params === 'object') {
             if (!track.pps) {
               track.pps = [];
@@ -220,22 +190,21 @@ class HevcVideoParser extends BaseVideoParser {
         case 35:
           push = true;
           track.audFound = true;
-          if (VideoSample) {
+          if (VideoSample?.frame) {
             this.pushAccessUnit(VideoSample, track);
+            VideoSample = null;
+          }
+          if (!VideoSample) {
+            VideoSample = this.VideoSample = this.createVideoSample(
+              false,
+              pes.pts,
+              pes.dts,
+            );
           }
-          VideoSample = this.VideoSample = this.createVideoSample(
-            false,
-            pes.pts,
-            pes.dts,
-            debug ? 'AUD ' : '',
-          );
           break;
 
         default:
           push = false;
-          if (VideoSample) {
-            VideoSample.debug += 'unknown or irrelevant NAL ' + unit.type + ' ';
-          }
           break;
       }
       if (VideoSample && push) {

package/src/types/demuxer.ts

@@ -125,7 +125,6 @@ export interface VideoSample {
   key: boolean;
   frame: boolean;
   units: VideoSampleUnit[];
-  debug: string;
   length: number;
 }