From df18f10fca1b0ad643d9ee8dc02cc5bdbd22bab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Velad=20Galv=C3=A1n?= <ladvan91@hotmail.com>
Date: Tue, 13 Jun 2023 18:55:57 +0200
Subject: [PATCH] fix: Fix implementation of AAC and MP3 transmuxers (#5296)

---
 lib/transmuxer/aac_transmuxer.js |  2 +-
 lib/transmuxer/mp3_transmuxer.js | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/transmuxer/aac_transmuxer.js b/lib/transmuxer/aac_transmuxer.js
index 9bca37a64d..5e11e77145 100644
--- a/lib/transmuxer/aac_transmuxer.js
+++ b/lib/transmuxer/aac_transmuxer.js
@@ -43,7 +43,7 @@ shaka.transmuxer.AacTransmuxer = class {
    * @export
    */
   destroy() {
-    // Nothing
+    this.initSegments.clear();
   }
 
 
diff --git a/lib/transmuxer/mp3_transmuxer.js b/lib/transmuxer/mp3_transmuxer.js
index 3323348e0f..4771876f8d 100644
--- a/lib/transmuxer/mp3_transmuxer.js
+++ b/lib/transmuxer/mp3_transmuxer.js
@@ -32,8 +32,8 @@ shaka.transmuxer.Mp3Transmuxer = class {
     /** @private {number} */
     this.frameIndex_ = 0;
 
-    /** @private {?Uint8Array} */
-    this.initSegment = null;
+    /** @private {!Map.<number, !Uint8Array>} */
+    this.initSegments = new Map();
   }
 
 
@@ -42,7 +42,7 @@ shaka.transmuxer.Mp3Transmuxer = class {
    * @export
    */
   destroy() {
-    // Nothing
+    this.initSegments.clear();
   }
 
 
@@ -179,13 +179,17 @@ shaka.transmuxer.Mp3Transmuxer = class {
       stream: stream,
     };
     const mp4Generator = new shaka.util.Mp4Generator(streamInfo);
-    if (!this.initSegment) {
-      this.initSegment = mp4Generator.initSegment();
+    let initSegment;
+    if (!this.initSegments.has(stream.id)) {
+      initSegment = mp4Generator.initSegment();
+      this.initSegments.set(stream.id, initSegment);
+    } else {
+      initSegment = this.initSegments.get(stream.id);
     }
     const segmentData = mp4Generator.segmentData();
 
     this.frameIndex_++;
-    const transmuxData = Uint8ArrayUtils.concat(this.initSegment, segmentData);
+    const transmuxData = Uint8ArrayUtils.concat(initSegment, segmentData);
     return Promise.resolve(transmuxData);
   }
 };