Completed subtitle feature

utils/jellyfin/getDefaultPlaySettings.ts

@@ -5,7 +5,11 @@ import {
   MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client";
 import { Settings, useSettings } from "../atoms/settings";
-import { StreamRanker, SubtitleStreamRanker } from "../streamRanker";
+import {
+  AudioStreamRanker,
+  StreamRanker,
+  SubtitleStreamRanker,
+} from "../streamRanker";
 
 interface PlaySettings {
   item: BaseItemDto;
@@ -15,12 +19,21 @@ interface PlaySettings {
   subtitleIndex?: number | undefined;
 }
 
+export interface previousIndexes {
+  audioIndex?: number;
+  subtitleIndex?: number;
+}
+
+interface TrackOptions {
+  DefaultAudioStreamIndex: number | undefined;
+  DefaultSubtitleStreamIndex: number | undefined;
+}
+
 // Used getting default values for the next player.
 export function getDefaultPlaySettings(
   item: BaseItemDto,
   settings: Settings,
-  previousIndex?: number,
-  previousItem?: BaseItemDto,
+  previousIndexes?: previousIndexes,
   previousSource?: MediaSourceInfo
 ): PlaySettings {
   if (item.Type === "Program") {
@@ -47,14 +60,18 @@ export function getDefaultPlaySettings(
   )?.Index;
 
   // We prefer the previous track over the default track.
-  let trackOptions = {};
+  let trackOptions: TrackOptions = {
+    DefaultAudioStreamIndex: defaultAudioIndex ?? -1,
+    DefaultSubtitleStreamIndex: mediaSource?.DefaultSubtitleStreamIndex ?? -1,
+  };
+
   const mediaStreams = mediaSource?.MediaStreams ?? [];
-  if (settings?.rememberSubtitleSelections) {
-    if (previousIndex !== undefined && previousSource) {
+  if (settings?.rememberSubtitleSelections && previousIndexes) {
+    if (previousIndexes.subtitleIndex !== undefined && previousSource) {
       const subtitleRanker = new SubtitleStreamRanker();
       const ranker = new StreamRanker(subtitleRanker);
       ranker.rankStream(
-        previousIndex,
+        previousIndexes.subtitleIndex,
         previousSource,
         mediaStreams,
         trackOptions
@@ -62,7 +79,18 @@ export function getDefaultPlaySettings(
     }
   }
 
-  const finalSubtitleIndex = mediaSource?.DefaultAudioStreamIndex;
+  if (settings?.rememberAudioSelections && previousIndexes) {
+    if (previousIndexes.audioIndex !== undefined && previousSource) {
+      const audioRanker = new AudioStreamRanker();
+      const ranker = new StreamRanker(audioRanker);
+      ranker.rankStream(
+        previousIndexes.audioIndex,
+        previousSource,
+        mediaStreams,
+        trackOptions
+      );
+    }
+  }
 
   // 4. Get default bitrate
   const bitrate = BITRATES.sort(
@@ -73,7 +101,7 @@ export function getDefaultPlaySettings(
     item,
     bitrate,
     mediaSource,
-    audioIndex: preferedAudioIndex ?? defaultAudioIndex ?? firstAudioIndex,
-    subtitleIndex: finalSubtitleIndex || -1,
+    audioIndex: trackOptions.DefaultAudioStreamIndex,
+    subtitleIndex: trackOptions.DefaultSubtitleStreamIndex,
   };
 }

utils/rankStreamType.ts

@@ -1,96 +0,0 @@
-export function rankStreamType(
-  prevIndex,
-  prevSource,
-  mediaStreams,
-  trackOptions,
-  streamType,
-  isSecondarySubtitle
-) {
-  if (prevIndex == -1) {
-    console.debug(`AutoSet ${streamType} - No Stream Set`);
-    if (streamType == "Subtitle") {
-      if (isSecondarySubtitle) {
-        trackOptions.DefaultSecondarySubtitleStreamIndex = -1;
-      } else {
-        trackOptions.DefaultSubtitleStreamIndex = -1;
-      }
-    }
-    return;
-  }
-
-  if (!prevSource.MediaStreams || !mediaStreams) {
-    console.debug(`AutoSet ${streamType} - No MediaStreams`);
-    return;
-  }
-
-  let bestStreamIndex = null;
-  let bestStreamScore = 0;
-  const prevStream = prevSource.MediaStreams[prevIndex];
-
-  if (!prevStream) {
-    console.debug(`AutoSet ${streamType} - No prevStream`);
-    return;
-  }
-
-  console.debug(
-    `AutoSet ${streamType} - Previous was ${prevStream.Index} - ${prevStream.DisplayTitle}`
-  );
-
-  let prevRelIndex = 0;
-  for (const stream of prevSource.MediaStreams) {
-    if (stream.Type != streamType) continue;
-
-    if (stream.Index == prevIndex) break;
-
-    prevRelIndex += 1;
-  }
-
-  let newRelIndex = 0;
-  for (const stream of mediaStreams) {
-    if (stream.Type != streamType) continue;
-
-    let score = 0;
-
-    if (prevStream.Codec == stream.Codec) score += 1;
-    if (prevRelIndex == newRelIndex) score += 1;
-    if (
-      prevStream.DisplayTitle &&
-      prevStream.DisplayTitle == stream.DisplayTitle
-    )
-      score += 2;
-    if (
-      prevStream.Language &&
-      prevStream.Language != "und" &&
-      prevStream.Language == stream.Language
-    )
-      score += 2;
-
-    console.debug(
-      `AutoSet ${streamType} - Score ${score} for ${stream.Index} - ${stream.DisplayTitle}`
-    );
-    if (score > bestStreamScore && score >= 3) {
-      bestStreamScore = score;
-      bestStreamIndex = stream.Index;
-    }
-
-    newRelIndex += 1;
-  }
-
-  if (bestStreamIndex != null) {
-    console.debug(
-      `AutoSet ${streamType} - Using ${bestStreamIndex} score ${bestStreamScore}.`
-    );
-    if (streamType == "Subtitle") {
-      if (isSecondarySubtitle) {
-        trackOptions.DefaultSecondarySubtitleStreamIndex = bestStreamIndex;
-      } else {
-        trackOptions.DefaultSubtitleStreamIndex = bestStreamIndex;
-      }
-    }
-    if (streamType == "Audio") {
-      trackOptions.DefaultAudioStreamIndex = bestStreamIndex;
-    }
-  } else {
-    console.debug(`AutoSet ${streamType} - Threshold not met. Using default.`);
-  }
-}

utils/streamRanker.ts

@@ -32,6 +32,7 @@ abstract class StreamRankerStrategy {
 
     let bestStreamIndex = null;
     let bestStreamScore = 0;
+
     const prevStream = prevSource.MediaStreams[prevIndex];
 
     if (!prevStream) {