refactor: Update subtitle streams to use TextTrack indexes (#2529)

* refactor: Update subtitle streams to use TextTrack indexes, instead of MediaStream indexes * Add comment referring to bug in jellyfin server regarding subtitles
jellyfin · Dec 10, 2024 · 297b4fe · 297b4fe
1 parent 88cec72
commit 297b4fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/frontend/src/store/playback-manager.ts b/frontend/src/store/playback-manager.ts
@@ -270,18 +270,20 @@ class PlaybackManagerStore extends CommonStore<PlaybackManagerState> {
 
   public get currentItemParsedSubtitleTracks(): PlaybackTrack[] | undefined {
     if (!isNil(this._state.currentMediaSource)) {
-      return this._state.currentMediaSource.MediaStreams?.map(
-        (stream, index) => ({
-          srcIndex: index,
-          ...stream
-        })
-      )
-        .filter(
+      // TODO: There is currently a bug in Jellyfin server when adding external subtitles may play the incorrect subtitle
+      // https://github.com/jellyfin/jellyfin/issues/13198
+      return this._state.currentMediaSource.MediaStreams?.filter(
           sub =>
             sub.Type === MediaStreamType.Subtitle
             && (sub.DeliveryMethod === SubtitleDeliveryMethod.Encode
               || sub.DeliveryMethod === SubtitleDeliveryMethod.External)
         )
+        .map(
+          (stream, index) => ({
+            srcIndex: index,
+            ...stream
+          })
+        )
         .map(sub => ({
           label: sub.DisplayTitle ?? 'Undefined',
           src:

diff --git a/frontend/src/utils/items.ts b/frontend/src/utils/items.ts
@@ -450,7 +450,13 @@ export function getMediaStreams(
   mediaStreams: MediaStream[],
   streamType: string
 ): MediaStream[] {
-  return mediaStreams.filter(mediaStream => mediaStream.Type === streamType);
+  return mediaStreams.filter(mediaStream => mediaStream.Type === streamType)
+    .map(
+      (stream, index) => ({
+        ...stream,
+        Index: index
+      })
+    )
 }
 
 /**