Only load earlier subtitle fragment if discontinuity matches

video-dev · Jun 28, 2023 · 11d9097 · 11d9097
1 parent a567ef5
commit 11d9097
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/controller/subtitle-stream-controller.ts b/src/controller/subtitle-stream-controller.ts
@@ -450,11 +450,12 @@ export class SubtitleStreamController
       }
       foundFrag = this.mapToInitFragWhenRequired(foundFrag) as Fragment;
       if (foundFrag.sn !== 'initSegment') {
-        // Load earlier fragment to make up for misaligned playlists and cues that extend beyond end of segment
+        // Load earlier fragment in same discontinuity to make up for misaligned playlists and cues that extend beyond end of segment
         const curSNIdx = foundFrag.sn - trackDetails.startSN;
         const prevFrag = fragments[curSNIdx - 1];
         if (
           prevFrag &&
+          prevFrag.cc === foundFrag.cc &&
           this.fragmentTracker.getState(prevFrag) === FragmentState.NOT_LOADED
         ) {
           foundFrag = prevFrag;

diff --git a/src/controller/timeline-controller.ts b/src/controller/timeline-controller.ts
@@ -576,6 +576,9 @@ export class TimelineController implements ComponentAPI {
         }
         // Something went wrong while parsing. Trigger event with success false.
         logger.log(`Failed to parse VTT cue: ${error}`);
+        if (missingInitPTS && maxAvCC > frag.cc) {
+          return;
+        }
         hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
           success: false,
           frag: frag,