hls.js 1.5.9-0.canary.10181 → 1.5.9-0.canary.10182

package/dist/hls.mjs

@@ -512,7 +512,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.9-0.canary.10181"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.9-0.canary.10182"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -11815,20 +11815,6 @@ class BaseVideoParser {
       length: 0
     };
   }
-  getLastNalUnit(samples) {
-    var _VideoSample;
-    let VideoSample = this.VideoSample;
-    let lastUnit;
-    // try to fallback to previous sample if current one is empty
-    if (!VideoSample || VideoSample.units.length === 0) {
-      VideoSample = samples[samples.length - 1];
-    }
-    if ((_VideoSample = VideoSample) != null && _VideoSample.units) {
-      const units = VideoSample.units;
-      lastUnit = units[units.length - 1];
-    }
-    return lastUnit;
-  }
   pushAccessUnit(VideoSample, videoTrack) {
     if (VideoSample.units.length && VideoSample.frame) {
       // if sample does not have PTS/DTS, patch with last sample PTS/DTS
@@ -11851,7 +11837,7 @@ class BaseVideoParser {
       logger.log(VideoSample.pts + '/' + VideoSample.dts + ':' + VideoSample.debug);
     }
   }
-  parseNALu(track, array) {
+  parseNALu(track, array, last) {
     const len = array.byteLength;
     let state = track.naluState || 0;
     const lastState = state;
@@ -11893,6 +11879,10 @@ class BaseVideoParser {
             data: array.subarray(lastUnitStart, overflow),
             type: lastUnitType
           };
+          if (track.lastNalu) {
+            units.push(track.lastNalu);
+            track.lastNalu = null;
+          }
           // logger.log('pushing NALU, type/size:' + unit.type + '/' + unit.data.byteLength);
           units.push(unit);
         } else {
@@ -11900,7 +11890,7 @@ class BaseVideoParser {
           // first check if start code delimiter is overlapping between 2 PES packets,
           // ie it started in last packet (lastState not zero)
           // and ended at the beginning of this PES packet (i <= 4 - lastState)
-          const lastUnit = this.getLastNalUnit(track.samples);
+          const lastUnit = track.lastNalu;
           if (lastUnit) {
             if (lastState && i <= 4 - lastState) {
               // start delimiter overlapping between PES packets
@@ -11917,6 +11907,8 @@ class BaseVideoParser {
               // logger.log('first NALU found with overflow:' + overflow);
               lastUnit.data = appendUint8Array(lastUnit.data, array.subarray(0, overflow));
               lastUnit.state = 0;
+              units.push(lastUnit);
+              track.lastNalu = null;
             }
           }
         }
@@ -11941,15 +11933,21 @@ class BaseVideoParser {
         type: lastUnitType,
         state: state
       };
-      units.push(unit);
-      // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
-    }
-    // no NALu found
-    if (units.length === 0) {
+      if (!last) {
+        track.lastNalu = unit;
+        // logger.log('store NALu to push it on next PES');
+      } else {
+        units.push(unit);
+        // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
+      }
+    } else if (units.length === 0) {
+      // no NALu found
       // append pes.data to previous NAL unit
-      const lastUnit = this.getLastNalUnit(track.samples);
+      const lastUnit = track.lastNalu;
       if (lastUnit) {
         lastUnit.data = appendUint8Array(lastUnit.data, array);
+        units.push(lastUnit);
+        track.lastNalu = null;
       }
     }
     track.naluState = state;
@@ -12101,7 +12099,7 @@ class ExpGolomb {
 
 class AvcVideoParser extends BaseVideoParser {
   parsePES(track, textTrack, pes, last, duration) {
-    const units = this.parseNALu(track, pes.data);
+    const units = this.parseNALu(track, pes.data, last);
     let VideoSample = this.VideoSample;
     let push;
     let spsfound = false;
@@ -12431,7 +12429,7 @@ class HevcVideoParser extends BaseVideoParser {
     this.initVPS = null;
   }
   parsePES(track, textTrack, pes, last, duration) {
-    const units = this.parseNALu(track, pes.data);
+    const units = this.parseNALu(track, pes.data, last);
     let VideoSample = this.VideoSample;
     let push;
     let spsfound = false;
@@ -29012,7 +29010,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.9-0.canary.10181";
+    return "1.5.9-0.canary.10182";
   }
 
   /**