From 7ea3566342f86f9322667b031cb47b9a37eae5f3 Mon Sep 17 00:00:00 2001
From: Rob Walch <rob@jwplayer.com>
Date: Mon, 17 Feb 2020 15:50:50 -0500
Subject: [PATCH] Fix issue in TS Demuxer that skipped AAC frames at the end of
 PES packets Fixes #2528

---
 src/demux/tsdemuxer.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/demux/tsdemuxer.js b/src/demux/tsdemuxer.js
index f133f457be5..7786ea4e8e8 100644
--- a/src/demux/tsdemuxer.js
+++ b/src/demux/tsdemuxer.js
@@ -1036,15 +1036,21 @@ class TSDemuxer {
 
     // scan for aac samples
     while (offset < len) {
-      if (ADTS.isHeader(data, offset) && (offset + 5) < len) {
-        let frame = ADTS.appendFrame(track, data, offset, pts, frameIndex);
-        if (frame) {
-          // logger.log(`${Math.round(frame.sample.pts)} : AAC`);
-          offset += frame.length;
-          stamp = frame.sample.pts;
-          frameIndex++;
+      if (ADTS.isHeader(data, offset)) {
+        if ((offset + 5) < len) {
+          const frame = ADTS.appendFrame(track, data, offset, pts, frameIndex);
+          if (frame) {
+            offset += frame.length;
+            stamp = frame.sample.pts;
+            frameIndex++;
+          } else {
+            // We are at an ADTS header, but could not extract a complete frame
+            // Remaining data will be added to aacOverFlow
+            break;
+          }
         } else {
-          // logger.log('Unable to parse AAC frame');
+          // We are at an ADTS header, but do not have enough data for a frame
+          // Remaining data will be added to aacOverFlow
           break;
         }
       } else {