hls.js 1.5.12-0.canary.10352 → 1.5.12-0.canary.10355

package/dist/hls.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.12-0.canary.10352"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.12-0.canary.10355"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -11961,6 +11961,20 @@ 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
@@ -11983,7 +11997,7 @@ class BaseVideoParser {
       logger.log(VideoSample.pts + '/' + VideoSample.dts + ':' + VideoSample.debug);
     }
   }
-  parseNALu(track, array, last) {
+  parseNALu(track, array, endOfSegment) {
     const len = array.byteLength;
     let state = track.naluState || 0;
     const lastState = state;
@@ -12025,10 +12039,6 @@ 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 {
@@ -12036,7 +12046,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 = track.lastNalu;
+          const lastUnit = this.getLastNalUnit(track.samples);
           if (lastUnit) {
             if (lastState && i <= 4 - lastState) {
               // start delimiter overlapping between PES packets
@@ -12053,8 +12063,6 @@ 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;
             }
           }
         }
@@ -12079,21 +12087,15 @@ class BaseVideoParser {
         type: lastUnitType,
         state: state
       };
-      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
+      units.push(unit);
+      // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
+    }
+    // no NALu found
+    if (units.length === 0) {
       // append pes.data to previous NAL unit
-      const lastUnit = track.lastNalu;
+      const lastUnit = this.getLastNalUnit(track.samples);
       if (lastUnit) {
         lastUnit.data = appendUint8Array(lastUnit.data, array);
-        units.push(lastUnit);
-        track.lastNalu = null;
       }
     }
     track.naluState = state;
@@ -12244,8 +12246,8 @@ class ExpGolomb {
 }
 
 class AvcVideoParser extends BaseVideoParser {
-  parsePES(track, textTrack, pes, last, duration) {
-    const units = this.parseNALu(track, pes.data, last);
+  parsePES(track, textTrack, pes, endOfSegment, duration) {
+    const units = this.parseNALu(track, pes.data, endOfSegment);
     let VideoSample = this.VideoSample;
     let push;
     let spsfound = false;
@@ -12375,7 +12377,7 @@ class AvcVideoParser extends BaseVideoParser {
       }
     });
     // if last PES packet, push samples
-    if (last && VideoSample) {
+    if (endOfSegment && VideoSample) {
       this.pushAccessUnit(VideoSample, track);
       this.VideoSample = null;
     }
@@ -12574,8 +12576,8 @@ class HevcVideoParser extends BaseVideoParser {
     super(...args);
     this.initVPS = null;
   }
-  parsePES(track, textTrack, pes, last, duration) {
-    const units = this.parseNALu(track, pes.data, last);
+  parsePES(track, textTrack, pes, endOfSegment, duration) {
+    const units = this.parseNALu(track, pes.data, endOfSegment);
     let VideoSample = this.VideoSample;
     let push;
     let spsfound = false;
@@ -12737,7 +12739,7 @@ class HevcVideoParser extends BaseVideoParser {
       }
     });
     // if last PES packet, push samples
-    if (last && VideoSample) {
+    if (endOfSegment && VideoSample) {
       this.pushAccessUnit(VideoSample, track);
       this.VideoSample = null;
     }
@@ -29169,7 +29171,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.12-0.canary.10352";
+    return "1.5.12-0.canary.10355";
   }
 
   /**