PR remarks readjustments

video-dev · Jan 24, 2024 · e43fcc9 · e43fcc9
1 parent f507ecd
commit e43fcc9
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/src/remux/mp4-remuxer.ts b/src/remux/mp4-remuxer.ts
@@ -544,12 +544,29 @@ export default class MP4Remuxer implements Remuxer {
             inputSamples[0].dts = firstDTS;
             inputSamples[0].pts = firstPTS;
           } else {
+            let isPTSOrderRetained = true;
             for (let i = 0; i < inputSamples.length; i++) {
-              if (inputSamples[i].dts > firstPTS) {
+              if (inputSamples[i].dts > firstPTS && isPTSOrderRetained) {
                 break;
               }
+
+              const prevPTS = inputSamples[i].pts;
               inputSamples[i].dts -= delta;
               inputSamples[i].pts -= delta;
+
+              // check to see if this sample's PTS order has changed
+              // relative to the next one
+              if (i < inputSamples.length - 1) {
+                const nextSamplePTS = inputSamples[i + 1].pts;
+                const currentSamplePTS = inputSamples[i].pts;
+
+                const currentOrder = Math.sign(
+                  nextSamplePTS - currentSamplePTS,
+                );
+                const prevOrder = Math.sign(nextSamplePTS - prevPTS);
+
+                isPTSOrderRetained = currentOrder == prevOrder;
+              }
             }
           }
           logger.log(
@@ -584,11 +601,6 @@ export default class MP4Remuxer implements Remuxer {
       nbNalu += nbUnits;
       sample.length = sampleLen;
 
-      // ensure sample increasing PTS
-      if (i > 0 && safariWebkitVersion) {
-        sample.pts = Math.max(inputSamples[i - 1].pts + 1, sample.pts);
-      }
-
       // ensure sample monotonic DTS
       if (sample.dts < dtsStep) {
         sample.dts = dtsStep;