Avoid RangeError in AAC PES overflow handling

Followup to #3926
video-dev · Jun 1, 2021 · 6a9e0bd · 6a9e0bd
1 parent 1b535e5
commit 6a9e0bd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/demux/tsdemuxer.ts b/src/demux/tsdemuxer.ts
@@ -941,17 +941,17 @@ class TSDemuxer implements Demuxer {
     const data = pes.data;
     if (aacOverFlow) {
       this.aacOverFlow = null;
-      const frameMissingBytes = aacOverFlow.missing;
-      const frameOverflowBytes =
-        aacOverFlow.sample.unit.byteLength - frameMissingBytes;
+      const sampleLength = aacOverFlow.sample.unit.byteLength;
+      const frameMissingBytes = Math.min(aacOverFlow.missing, sampleLength);
+      const frameOverflowBytes = sampleLength - frameMissingBytes;
       aacOverFlow.sample.unit.set(
         data.subarray(0, frameMissingBytes),
         frameOverflowBytes
       );
       track.samples.push(aacOverFlow.sample);
 
       // logger.log(`AAC: append overflowing ${frameOverflowBytes} bytes to beginning of new PES`);
-      startOffset = frameMissingBytes;
+      startOffset = aacOverFlow.missing;
     }
     // look for ADTS header (0xFFFx)
     let offset: number;