fix(Transmuxer): Fix init segment between discontinuities (#7042)

shaka-project · Jul 16, 2024 · 6850f68 · 6850f68
1 parent d1435c7
commit 6850f68
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git a/lib/transmuxer/aac_transmuxer.js b/lib/transmuxer/aac_transmuxer.js
@@ -33,7 +33,7 @@ shaka.transmuxer.AacTransmuxer = class {
     /** @private {number} */
     this.frameIndex_ = 0;
 
-    /** @private {!Map.<number, !Uint8Array>} */
+    /** @private {!Map.<string, !Uint8Array>} */
     this.initSegments = new Map();
   }
 
@@ -208,11 +208,12 @@ shaka.transmuxer.AacTransmuxer = class {
     };
     const mp4Generator = new shaka.util.Mp4Generator([streamInfo]);
     let initSegment;
-    if (!this.initSegments.has(stream.id)) {
+    const initSegmentKey = stream.id + '_' + reference.discontinuitySequence;
+    if (!this.initSegments.has(initSegmentKey)) {
       initSegment = mp4Generator.initSegment();
-      this.initSegments.set(stream.id, initSegment);
+      this.initSegments.set(initSegmentKey, initSegment);
     } else {
-      initSegment = this.initSegments.get(stream.id);
+      initSegment = this.initSegments.get(initSegmentKey);
     }
     const segmentData = mp4Generator.segmentData();
 

diff --git a/lib/transmuxer/ac3_transmuxer.js b/lib/transmuxer/ac3_transmuxer.js
@@ -32,7 +32,7 @@ shaka.transmuxer.Ac3Transmuxer = class {
     /** @private {number} */
     this.frameIndex_ = 0;
 
-    /** @private {!Map.<number, !Uint8Array>} */
+    /** @private {!Map.<string, !Uint8Array>} */
     this.initSegments = new Map();
   }
 
@@ -196,11 +196,12 @@ shaka.transmuxer.Ac3Transmuxer = class {
     };
     const mp4Generator = new shaka.util.Mp4Generator([streamInfo]);
     let initSegment;
-    if (!this.initSegments.has(stream.id)) {
+    const initSegmentKey = stream.id + '_' + reference.discontinuitySequence;
+    if (!this.initSegments.has(initSegmentKey)) {
       initSegment = mp4Generator.initSegment();
-      this.initSegments.set(stream.id, initSegment);
+      this.initSegments.set(initSegmentKey, initSegment);
     } else {
-      initSegment = this.initSegments.get(stream.id);
+      initSegment = this.initSegments.get(initSegmentKey);
     }
     const segmentData = mp4Generator.segmentData();
 

diff --git a/lib/transmuxer/ec3_transmuxer.js b/lib/transmuxer/ec3_transmuxer.js
@@ -32,7 +32,7 @@ shaka.transmuxer.Ec3Transmuxer = class {
     /** @private {number} */
     this.frameIndex_ = 0;
 
-    /** @private {!Map.<number, !Uint8Array>} */
+    /** @private {!Map.<string, !Uint8Array>} */
     this.initSegments = new Map();
   }
 
@@ -196,11 +196,12 @@ shaka.transmuxer.Ec3Transmuxer = class {
     };
     const mp4Generator = new shaka.util.Mp4Generator([streamInfo]);
     let initSegment;
-    if (!this.initSegments.has(stream.id)) {
+    const initSegmentKey = stream.id + '_' + reference.discontinuitySequence;
+    if (!this.initSegments.has(initSegmentKey)) {
       initSegment = mp4Generator.initSegment();
-      this.initSegments.set(stream.id, initSegment);
+      this.initSegments.set(initSegmentKey, initSegment);
     } else {
-      initSegment = this.initSegments.get(stream.id);
+      initSegment = this.initSegments.get(initSegmentKey);
     }
     const segmentData = mp4Generator.segmentData();
 

diff --git a/lib/transmuxer/mp3_transmuxer.js b/lib/transmuxer/mp3_transmuxer.js
@@ -32,7 +32,7 @@ shaka.transmuxer.Mp3Transmuxer = class {
     /** @private {number} */
     this.frameIndex_ = 0;
 
-    /** @private {!Map.<number, !Uint8Array>} */
+    /** @private {!Map.<string, !Uint8Array>} */
     this.initSegments = new Map();
   }
 
@@ -189,11 +189,12 @@ shaka.transmuxer.Mp3Transmuxer = class {
     };
     const mp4Generator = new shaka.util.Mp4Generator([streamInfo]);
     let initSegment;
-    if (!this.initSegments.has(stream.id)) {
+    const initSegmentKey = stream.id + '_' + reference.discontinuitySequence;
+    if (!this.initSegments.has(initSegmentKey)) {
       initSegment = mp4Generator.initSegment();
-      this.initSegments.set(stream.id, initSegment);
+      this.initSegments.set(initSegmentKey, initSegment);
     } else {
-      initSegment = this.initSegments.get(stream.id);
+      initSegment = this.initSegments.get(initSegmentKey);
     }
     const segmentData = mp4Generator.segmentData();
 

diff --git a/lib/transmuxer/ts_transmuxer.js b/lib/transmuxer/ts_transmuxer.js
@@ -44,7 +44,7 @@ shaka.transmuxer.TsTransmuxer = class {
     /** @private {number} */
     this.frameIndex_ = 0;
 
-    /** @private {!Map.<number, !Uint8Array>} */
+    /** @private {!Map.<string, !Uint8Array>} */
     this.initSegments = new Map();
 
     /** @private {?shaka.util.TsParser} */
@@ -286,11 +286,12 @@ shaka.transmuxer.TsTransmuxer = class {
 
     const mp4Generator = new shaka.util.Mp4Generator(streamInfos);
     let initSegment;
-    if (!this.initSegments.has(stream.id)) {
+    const initSegmentKey = stream.id + '_' + reference.discontinuitySequence;
+    if (!this.initSegments.has(initSegmentKey)) {
       initSegment = mp4Generator.initSegment();
-      this.initSegments.set(stream.id, initSegment);
+      this.initSegments.set(initSegmentKey, initSegment);
     } else {
-      initSegment = this.initSegments.get(stream.id);
+      initSegment = this.initSegments.get(initSegmentKey);
     }
     const segmentData = mp4Generator.segmentData();