Reset TS video parser with init segment

robwalch · robwalch · commit 81d30d55f0e7 · 2025-07-14T14:21:03.000-07:00
Fixes #7402
diff --git a/src/demux/tsdemuxer.ts b/src/demux/tsdemuxer.ts
@@ -191,6 +191,7 @@ class TSDemuxer implements Demuxer {
     this._audioTrack.segmentCodec = 'aac';
 
     // flush any partial content
+    this.videoParser = null;
     this.aacOverFlow = null;
     this.remainderData = null;
     this.audioCodec = audioCodec;
@@ -291,18 +292,7 @@ class TSDemuxer implements Demuxer {
           case videoPid:
             if (stt) {
               if (videoData && (pes = parsePES(videoData, this.logger))) {
-                if (this.videoParser === null) {
-                  switch (videoTrack.segmentCodec) {
-                    case 'avc':
-                      this.videoParser = new AvcVideoParser();
-                      break;
-                    case 'hevc':
-                      if (__USE_M2TS_ADVANCED_CODECS__) {
-                        this.videoParser = new HevcVideoParser();
-                      }
-                      break;
-                  }
-                }
+                this.readyVideoParser(videoTrack.segmentCodec);
                 if (this.videoParser !== null) {
                   this.videoParser.parsePES(videoTrack, textTrack, pes, false);
                 }
@@ -477,18 +467,7 @@ class TSDemuxer implements Demuxer {
     // try to parse last PES packets
     let pes: PES | null;
     if (videoData && (pes = parsePES(videoData, this.logger))) {
-      if (this.videoParser === null) {
-        switch (videoTrack.segmentCodec) {
-          case 'avc':
-            this.videoParser = new AvcVideoParser();
-            break;
-          case 'hevc':
-            if (__USE_M2TS_ADVANCED_CODECS__) {
-              this.videoParser = new HevcVideoParser();
-            }
-            break;
-        }
-      }
+      this.readyVideoParser(videoTrack.segmentCodec);
       if (this.videoParser !== null) {
         this.videoParser.parsePES(
           videoTrack as DemuxedVideoTrack,
@@ -557,6 +536,16 @@ class TSDemuxer implements Demuxer {
     return this.decrypt(demuxResult, sampleAes);
   }
 
+  private readyVideoParser(codec: string | undefined) {
+    if (this.videoParser === null) {
+      if (codec === 'avc') {
+        this.videoParser = new AvcVideoParser();
+      } else if (__USE_M2TS_ADVANCED_CODECS__ && codec === 'hevc') {
+        this.videoParser = new HevcVideoParser();
+      }
+    }
+  }
+
   private decrypt(
     demuxResult: DemuxerResult,
     sampleAes: SampleAesDecrypter,
