Fix audio track selection when baking subtitles

jellyfin · Nov 3, 2024 · f474e2a · f474e2a
1 parent ef236c8
commit f474e2a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
@@ -500,7 +500,13 @@ private VideoOptions buildExoPlayerOptions(@Nullable Integer forcedSubtitleIndex
         internalOptions.setMaxBitrate(maxBitrate);
         if (playbackRetries > 0 || (isLiveTv && !directStreamLiveTv)) internalOptions.setEnableDirectStream(false);
         if (playbackRetries > 1) internalOptions.setEnableDirectPlay(false);
-        internalOptions.setSubtitleStreamIndex(forcedSubtitleIndex);
+        if (mCurrentOptions != null) {
+            internalOptions.setSubtitleStreamIndex(mCurrentOptions.getSubtitleStreamIndex());
+            internalOptions.setAudioStreamIndex(mCurrentOptions.getAudioStreamIndex());
+        }
+        if (forcedSubtitleIndex != null) {
+            internalOptions.setSubtitleStreamIndex(forcedSubtitleIndex);
+        }
         MediaSourceInfo currentMediaSource = getCurrentMediaSource();
         if (!isLiveTv && currentMediaSource != null) {
             internalOptions.setMediaSourceId(currentMediaSource.getId());