fix: Fix transmuxer when some PES has the same pts and dts value (#5985)

Fixes #5913
shaka-project · Dec 5, 2023 · 165feac · 165feac
1 parent 26e572f
commit 165feac
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/lib/util/ts_parser.js b/lib/util/ts_parser.js
@@ -614,9 +614,11 @@ shaka.util.TsParser = class {
       let sort = false;
       for (const audioData of this.audioData_) {
         const pes = this.parsePES_(audioData);
-        if (pes && pes.pts != null && pes.dts != null) {
-          if (this.audioPes_.length &&
-              pes.dts < (this.audioPes_[this.audioPes_.length - 1].dts || 0)) {
+        let previousPes = this.audioPes_.length ?
+            this.audioPes_[this.audioPes_.length - 1] : null;
+        if (pes && pes.pts != null && pes.dts != null && (!previousPes ||
+            (previousPes.pts != pes.pts && previousPes.dts != pes.dts))) {
+          if (this.audioPes_.length && pes.dts < (previousPes.dts || 0)) {
             sort = true;
           }
           this.audioPes_.push(pes);
@@ -625,7 +627,7 @@ shaka.util.TsParser = class {
           if (!data) {
             continue;
           }
-          const previousPes = this.audioPes_.pop();
+          previousPes = this.audioPes_.pop();
           previousPes.data =
               shaka.util.Uint8ArrayUtils.concat(previousPes.data, data);
           this.audioPes_.push(previousPes);
@@ -654,9 +656,11 @@ shaka.util.TsParser = class {
       let sort = false;
       for (const videoData of this.videoData_) {
         const pes = this.parsePES_(videoData);
-        if (pes && pes.pts != null && pes.dts != null) {
-          if (this.videoPes_.length &&
-              pes.dts < (this.videoPes_[this.videoPes_.length - 1].dts || 0)) {
+        let previousPes = this.videoPes_.length ?
+            this.videoPes_[this.videoPes_.length - 1] : null;
+        if (pes && pes.pts != null && pes.dts != null && (!previousPes ||
+            (previousPes.pts != pes.pts && previousPes.dts != pes.dts))) {
+          if (this.videoPes_.length && pes.dts < (previousPes.dts || 0)) {
             sort = true;
           }
           this.videoPes_.push(pes);
@@ -665,7 +669,7 @@ shaka.util.TsParser = class {
           if (!data) {
             continue;
           }
-          const previousPes = this.videoPes_.pop();
+          previousPes = this.videoPes_.pop();
           previousPes.data =
               shaka.util.Uint8ArrayUtils.concat(previousPes.data, data);
           this.videoPes_.push(previousPes);