From b9bfdd804e9336ae194ee0ba768e18defa8dac5f Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@users.noreply.github.com>
Date: Tue, 7 Apr 2020 09:23:16 -0700
Subject: [PATCH] fix: Do not trim audio output when keepOriginalTimestamps is
 set (#329)

Co-authored-by: Garrett Singer <gesinger@gmail.com>
---
 lib/mp4/transmuxer.js   |  9 +++++----
 test/transmuxer.test.js | 13 ++++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/mp4/transmuxer.js b/lib/mp4/transmuxer.js
index aa62ea2b..398ef667 100644
--- a/lib/mp4/transmuxer.js
+++ b/lib/mp4/transmuxer.js
@@ -1010,10 +1010,11 @@ Transmuxer = function(options) {
           pipeline.videoSegmentStream = new VideoSegmentStream(videoTrack, options);
 
           pipeline.videoSegmentStream.on('timelineStartInfo', function(timelineStartInfo) {
-          // When video emits timelineStartInfo data after a flush, we forward that
-          // info to the AudioSegmentStream, if it exists, because video timeline
-          // data takes precedence.
-            if (audioTrack) {
+            // When video emits timelineStartInfo data after a flush, we forward that
+            // info to the AudioSegmentStream, if it exists, because video timeline
+            // data takes precedence.  Do not do this if keepOriginalTimestamps is set,
+            // because this is a particularly subtle form of timestamp alteration.
+            if (audioTrack && !options.keepOriginalTimestamps) {
               audioTrack.timelineStartInfo = timelineStartInfo;
               // On the first segment we trim AAC frames that exist before the
               // very earliest DTS we have seen in video because Chrome will
diff --git a/test/transmuxer.test.js b/test/transmuxer.test.js
index 3d8504d3..9ac2d48c 100644
--- a/test/transmuxer.test.js
+++ b/test/transmuxer.test.js
@@ -3486,8 +3486,9 @@ QUnit.test('adjusts caption and ID3 times when configured to adjust timestamps',
 
   QUnit.test('Audio frames trimmed before video, ' + name, function() {
     var
-    segments = [],
+      segments = [],
       earliestDts = 15000,
+      baseTime = test.options.baseMediaDecodeTime || test.baseMediaSetter || 0,
       transmuxer = createTransmuxer();
 
     transmuxer.on('data', function(segment) {
@@ -3506,7 +3507,7 @@ QUnit.test('adjusts caption and ID3 times when configured to adjust timestamps',
 
     transmuxer.push(packetize(audioPes([
       0x19, 0x47
-    ], true, earliestDts - (test.options.baseMediaDecodeTime || test.baseMediaSetter || 0) - 1)));
+    ], true, earliestDts - baseTime - 1)));
     transmuxer.push(packetize(videoPes([
       0x09, 0x01 // access_unit_delimiter_rbsp
     ], true, earliestDts)));
@@ -3529,7 +3530,13 @@ QUnit.test('adjusts caption and ID3 times when configured to adjust timestamps',
     QUnit.equal(segments.length, 1, 'generated a combined segment');
     // The audio frame is 10 bytes. The full data is 305 bytes without anything
     // trimmed. If the audio frame was trimmed this will be 295 bytes.
-    QUnit.equal(segments[0].data.length, 295, 'trimmed audio frame');
+// Note that if the baseMediaDecodeTime is set via options or the setter, frames may still
+// be removed, even if keepOriginalTimestamps is true.
+if (test.options.keepOriginalTimestamps && !baseTime) {
+      QUnit.equal(segments[0].data.length, 305, 'trimmed audio frame');
+    } else {
+      QUnit.equal(segments[0].data.length, 295, 'trimmed audio frame');
+    }
   });
 });