Index/Track Fixes

Documentation/players.md

@@ -8,9 +8,10 @@ Swiftfin offers two player options: **Swiftfin** (VLCKit) and **Native** (AVPlay
 
 | Feature                    | Swiftfin (VLCKit) | Native (AVPlayer) |
 |----------------------------|-------------------|----------------|
+| **External Audio Tracks**  | ❌                | ❌             |
 | **Framerate Matching**     | ❌                | ✅             |
 | **HDR to SDR Tonemapping** | ✅ [1]            | 🔶 [2]         |
-| **Player Controls**        | - Speed adjustment<br>- Aspect Fill<br>- Chapter Support<br>- Subtitle Support<br>- Audio Track Selection<br>- Customizable UI | - Speed adjustment<br>- Aspect Fill |
+| **Player Controls**        | - Speed Adjustment <br>- Aspect Fill <br>- Chapter Support <br>- Subtitle Support <br>- Trickplay Support <br>- Audio Track Selection <br>- Customizable UI | - Speed Adjustment <br>- Aspect Fill |
 | **Picture-in-Picture**     | ❌                | ✅             |
 | **TLS Support**            | 1.1, 1.2 [3]      | 1.1, 1.2, 1.3  |
 | **[Airplay Audio Output](https://support.apple.com/en-us/102357)** | 🔶 [4] | ✅ |
@@ -99,7 +100,7 @@ Swiftfin offers two player options: **Swiftfin** (VLCKit) and **Native** (AVPlay
 | [FLV1](https://en.wikipedia.org/wiki/Sorenson_Spark)                     | ✅                | ❌                |
 | [H.261](https://en.wikipedia.org/wiki/H.261)                             | ✅                | ❌                |
 | [H.263](https://en.wikipedia.org/wiki/H.263)                             | ✅                | ❌                |
-| [H.264](https://en.wikipedia.org/wiki/Advanced_Video_Coding)             | ✅                | ✅                |
+| [H.264/AVC](https://en.wikipedia.org/wiki/Advanced_Video_Coding)         | ✅                | ✅                |
 | [H.265/HEVC](https://en.wikipedia.org/wiki/High_Efficiency_Video_Coding) | ✅                | ✅ [2]            |
 | [H.266/VVC](https://en.wikipedia.org/wiki/Versatile_Video_Coding)        | ❌ [3]            | ❌                |
 | [MJPEG](https://en.wikipedia.org/wiki/Motion_JPEG)                       | ✅                | ✅                |
@@ -136,12 +137,12 @@ Swiftfin offers two player options: **Swiftfin** (VLCKit) and **Native** (AVPlay
 |---------------------------------------------------------------------------------|-------------------|-------------------|
 | [ASS](https://en.wikipedia.org/wiki/SubStation_Alpha#Advanced_SubStation_Alpha) | ✅                | ❌                |
 | [CC_DEC](https://en.wikipedia.org/wiki/Closed_captioning)                       | ✅                | ✅                |
-| [DVBSub](https://en.wikipedia.org/wiki/DVB_subtitles)                           | ✅                | 🔶 [1]            |
-| [DVDSub](https://en.wikipedia.org/wiki/VobSub)                                  | ✅                | 🔶 [1]            |
+| [DVBSub](https://en.wikipedia.org/wiki/DVB_subtitles)                           | ✅ [1]            | 🔶 [2]            |
+| [DVDSub](https://en.wikipedia.org/wiki/VobSub)                                  | ✅ [1]            | 🔶 [2]            |
 | [JacoSub](https://en.wikipedia.org/wiki/JACOsub)                                | ✅                | ❌                |
 | [MOV_Text](https://en.wikipedia.org/wiki/MPEG-4_Part_17)                        | ✅                | ❌                |
 | [MPL2](https://en.wikipedia.org/wiki/MPL2)                                      | ✅                | ❌                |
-| [PGSSub](https://en.wikipedia.org/wiki/Presentation_Graphic_Stream)             | ✅                | 🔶 [1]            |
+| [PGSSub](https://en.wikipedia.org/wiki/Presentation_Graphic_Stream)             | ✅ [1]            | 🔶 [2]            |
 | [PJS](https://en.wikipedia.org/wiki/Phoenix_Subtitle)                           | ✅                | ❌                |
 | [RealText](https://en.wikipedia.org/wiki/RealText)                              | ✅                | ❌                |
 | [SAMI](https://en.wikipedia.org/wiki/SAMI)                                      | ✅                | ❌                |
@@ -154,11 +155,12 @@ Swiftfin offers two player options: **Swiftfin** (VLCKit) and **Native** (AVPlay
 | [TTML](https://en.wikipedia.org/wiki/Timed_Text_Markup_Language)                | ✅                | ✅                |
 | [VPlayer](https://en.wikipedia.org/wiki/VPlayer)                                | ✅                | ❌                |
 | [VTT](https://en.wikipedia.org/wiki/WebVTT)                                     | ✅                | ✅                |
-| [XSub](https://en.wikipedia.org/wiki/XSUB)                                      | ✅                | 🔶 [1]            |
+| [XSub](https://en.wikipedia.org/wiki/XSUB)                                      | ✅ [1]            | 🔶 [2]            |
 
 **Notes:**
 
-- [1] Subtitle format requires server-side encoding for Native (AVPlayer) playback.
+- [1] Subtitle format can be played if embedded in the container (MKV) but requres server-side encoding for playback is the source is an external file.
+- [2] Subtitle format requires server-side encoding for playback.
 
 - Subtitle track selection is not currently supported in Native (AVPlayer) due to issues with HLS file incompatibilities.
 
@@ -192,51 +194,11 @@ Swiftfin offers two player options: **Swiftfin** (VLCKit) and **Native** (AVPlay
 
 --- 
 
-## Track Selection
-
-Swiftfin track selection is limited by compatibility with each player. In testing, as of Swiftfin 1.3, the following interactions have been tested.
-
-✅ Working correctly </br>
-🔶 Partially working with limitations </br>
-❌ Not working
-
-### Swiftfin Player
-
-| File Configuration                                       | DirectPlay | Transcode | Notes |
-|---------------------------------------------------------|------------|-----------|------------------------------------------------|
-| Internal Audio                                          | ✅         | ✅        |                                                |
-| Internal Audio + Internal Subtitles                     | ✅         | 🔶        | - Subtitles do not work if Non-External *(DVDSUB)* |
-| Internal Audio + External Subtitles                     | ✅         | ✅        |                                                |
-| Internal Audio + Internal Subtitles + External Subtitles| ✅         | 🔶        | - Subtitles do not work if Non-External *(DVDSUB)* |
-| Multiple Internal Audio + Multiple Internal Subtitles  | ✅         | 🔶        | - Subtitles do not work if Non-External *(DVDSUB)* |
-| Multiple Internal Audio + Multiple External Subtitles  | ✅         | ✅        |                                                |
-| Multiple Internal Audio + Internal Subtitles + External Subtitles | ✅ | 🔶 | - Subtitles do not work if Non-External *(DVDSUB)* |
-| External Audio + Internal Audio + External Subtitles   | ✅         | ✅        | - Cannot play external audio track if transcoding is required </br> - Subtitles do not work if Non-External *(DVDSUB)* |
-| External Audio + Internal Audio + Internal Subtitles   | ✅         | ✅        | - Cannot play external audio track if transcoding is required </br> - Subtitles do not work if Non-External *(DVDSUB)* |
-| External Audio + Internal Audio + Internal Subtitles + External Subtitles | ✅ | ✅ | - Cannot play external audio track if transcoding is required </br> - Subtitles do not work if Non-External *(DVDSUB)* |
-
-### Native Player
-
-| File Configuration                                      | DirectPlay | Transcode | Notes |
-|--------------------------------------------------------|------------|-----------|------------------------------------------------|
-| Internal Audio                                         | ✅         | ✅        |                                                |
-| Internal Audio + Internal Subtitles                   | 🔶         | ❌        | - The default audio track will played </br> - subtitles cannot be selected. |
-| Internal Audio + External Subtitles                   | 🔶         | ❌        | - The default audio track will played </br> - subtitles cannot be selected. |
-| Internal Audio + Internal Subtitles + External Subtitles | 🔶      | ❌        | - The default audio track will played </br> - subtitles cannot be selected. |
-| Multiple Internal Audio + Multiple Internal Subtitles | 🔶         | ❌        | - The default audio track will played </br> - subtitles cannot be selected. |
-| Multiple Internal Audio + Multiple External Subtitles | 🔶         | ❌        | - The default audio track will played </br> - subtitles cannot be selected. |
-| Multiple Internal Audio + Internal Subtitles + External Subtitles | 🔶 | ❌ | - The default audio track will played </br> - subtitles cannot be selected. |
-| External Audio + Internal Audio + External Subtitles  | 🔶         | ❌        | - The default audio track will played </br> - subtitles cannot be selected. |
-| External Audio + Internal Audio + Internal Subtitles  | 🔶         | ❌        | - The default audio track will played </br> - subtitles cannot be selected. |
-| External Audio + Internal Audio + Internal Subtitles + External Subtitles | 🔶 | ❌ | - The default audio track will played </br> - subtitles cannot be selected. |
-
---- 
-
 ### Miscellaneous
 
-| Feature | Swiftfin (VLCKit) | Native (AVPlayer) | Notes |
-|-------------|-------------------|----------------|----------------|
-| **External Display Support** | 🔶        | ✅        | Swiftfin Player can only be mirrored. As a result, the player will retain the source device dimensions. |
-| **Energy Consumption** | 🔶        | ✅        | Swiftfin Player will use a software decoder if the media cannot be handled by iOS natively. This results in higher power consumption. |
+| Feature                      | Swiftfin (VLCKit) | Native (AVPlayer) | Notes                                                                                                                                 |
+|------------------------------|-------------------|-------------------|---------------------------------------------------------------------------------------------------------------------------------------|
+| **External Display Support** | 🔶                | ✅                | Swiftfin Player can only be mirrored. As a result, the player will retain the source device dimensions.                               |
+| **Energy Consumption**       | 🔶                | ✅                | Swiftfin Player will use a software decoder if the media cannot be handled by iOS natively. This results in higher power consumption. |
 
 ---

Shared/Extensions/JellyfinAPI/DeviceProfile.swift

@@ -75,4 +75,43 @@ extension DeviceProfile {
 
         return deviceProfile
     }
+
+    // MARK: - Playback Capability Queries
+
+    /// Whether any `DirectPlayProfile` allows media with this audio codec in the given container to be played directly.
+    func canPlay(type: DlnaProfileType, audioCodec: String?, container: String?) -> Bool {
+        (directPlayProfiles ?? []).contains { profile in
+            profile.type == type
+                && profileContains(profile: profile.audioCodec, audioCodec)
+                && profileContains(profile: profile.container, container)
+        }
+    }
+
+    /// Whether any `DirectPlayProfile` allows media with this video codec in the given container to be played directly.
+    func canPlay(type: DlnaProfileType, videoCodec: String?, container: String?) -> Bool {
+        (directPlayProfiles ?? []).contains { profile in
+            profile.type == type
+                && profileContains(profile: profile.videoCodec, videoCodec)
+                && profileContains(profile: profile.container, container)
+        }
+    }
+
+    /// Whether any `SubtitleProfile` allows this format to be delivered via the given method.
+    func canPlay(subtitleFormat: String?, method: SubtitleDeliveryMethod) -> Bool {
+        guard let subtitleFormat = subtitleFormat?.lowercased() else { return false }
+        return (subtitleProfiles ?? []).contains { profile in
+            profile.method == method
+                && profile.format?.lowercased() == subtitleFormat
+        }
+    }
+
+    /// Parse & check membership like this is CSV as that's the format we send to the server.
+    private func profileContains(profile: String?, _ candidate: String?) -> Bool {
+        guard let profile else { return true }
+        guard let candidate = candidate?.lowercased() else { return false }
+        return profile
+            .lowercased()
+            .split(separator: ",")
+            .contains { $0.trimmingCharacters(in: .whitespaces) == candidate }
+    }
 }

Shared/Extensions/JellyfinAPI/MediaStream.swift

@@ -209,55 +209,114 @@ extension MediaStream {
 
 extension [MediaStream] {
 
-    /// Adjusts track indexes for a full set of media streams.
-    /// For non-transcode stream types:
-    ///   Internal tracks (non-external) are ordered as: Video, Audio, Subtitles, then any others.
-    ///   Their relative order within each group is preserved and indexes start at 0.
-    /// For transcode stream type:
-    ///   Only the first internal video track and the first internal audio track are included, in that order.
-    /// In both cases, external tracks are appended in their original order with indexes continuing after internal tracks.
-    func adjustedTrackIndexes(for playMethod: PlayMethod, selectedAudioStreamIndex: Int) -> [MediaStream] {
-        let internalTracks = self.filter { !($0.isExternal ?? false) }
-        let externalTracks = self.filter { $0.isExternal ?? false }
-
-        var orderedInternal: [MediaStream] = []
+    /// Text-based external subtitles loaded as sidecar files. Image-based subtitles are excluded because the player silently drops them.
+    var sidecarSubtitles: [MediaStream] {
+        filter { $0.deliveryMethod == .external && $0.deliveryURL != nil && $0.isTextSubtitleStream == true }
+    }
 
-        let subtitleInternal = internalTracks.filter { $0.type == .subtitle }
+    /// Builds a mapping from Jellyfin's global stream indexes to VLC's container-position indexes.
+    ///
+    /// Jellyfin assigns a single global index across all streams (video, audio, subtitle — internal and external).
+    /// VLC numbers tracks by their position within the actual media container, starting at 0.
+    /// This function produces `[JellyfinIndex: PlayerIndex]` so we can translate between the two.
+    ///
+    /// Called at init time — before VLC has loaded the media. Sidecar subtitle indexes are estimated here
+    /// but finalized later by `resolveIndexMap` once the player reports its actual track list.
+    ///
+    ///  - `Transcode`: The HLS container has exactly 1 video (index 0) and 1 audio (index 1).
+    ///  - `DirectPlay`: Jellyfin lists external tracks first, offsetting all internal container indexes by that count.
+    func buildIndexMap(
+        for playMethod: PlayMethod,
+        selectedAudioStreamIndex: Int
+    ) -> [Int: Int] {
+        var indexMap: [Int: Int] = [:]
 
         if playMethod == .transcode {
-            // Only include the first video and first audio track for transcode.
-            let videoInternal = internalTracks.filter { $0.type == .video }
-            let audioInternal = internalTracks.filter { $0.type == .audio }
+            var containerTracks: [MediaStream] = []
 
-            if let firstVideo = videoInternal.first {
-                orderedInternal.append(firstVideo)
+            let videoTracks = filter { $0.type == .video && !($0.isExternal == true) }
+            let audioTracks = filter { $0.type == .audio && !($0.isExternal == true) }
+
+            if let firstVideo = videoTracks.first {
+                containerTracks.append(firstVideo)
+            }
+            if let selectedAudio = audioTracks.first(where: { $0.index == selectedAudioStreamIndex }) {
+                containerTracks.append(selectedAudio)
             }
-            if let selectedAudio = audioInternal.first(where: { $0.index == selectedAudioStreamIndex }) {
-                orderedInternal.append(selectedAudio)
+
+            for (newIndex, track) in containerTracks.enumerated() {
+                guard let oldIndex = track.index else { continue }
+                indexMap[oldIndex] = newIndex
             }
 
-            orderedInternal += subtitleInternal
+            let playbackChildStartIndex = containerTracks.count
+            let sidecarSubtitles = self.sidecarSubtitles
+
+            for (offset, track) in sidecarSubtitles.enumerated() {
+                guard let oldIndex = track.index else { continue }
+                let playerIndex = playbackChildStartIndex + offset
+                indexMap[oldIndex] = playerIndex
+            }
         } else {
-            let videoInternal = internalTracks.filter { $0.type == .video }
-            let audioInternal = internalTracks.filter { $0.type == .audio }
+            let externalCount = self.count(where: { $0.isExternal == true })
+            let internalTracks = self.filter { !($0.isExternal ?? false) }
 
-            orderedInternal = videoInternal + audioInternal + subtitleInternal
+            for track in internalTracks {
+                guard let oldIndex = track.index else { continue }
+                let playerIndex = oldIndex - externalCount
+                indexMap[oldIndex] = playerIndex
+            }
         }
 
-        var newInternalTracks: [MediaStream] = []
-        for (index, var track) in orderedInternal.enumerated() {
-            track.index = index
-            newInternalTracks.append(track)
-        }
+        return indexMap
+    }
 
-        var newExternalTracks: [MediaStream] = []
-        let startingIndexForExternal = newInternalTracks.count
-        for (offset, var track) in externalTracks.enumerated() {
-            track.index = startingIndexForExternal + offset
-            newExternalTracks.append(track)
+    /// Updates the index map with real player indexes for sidecar subtitles.
+    ///
+    /// Called after VLC reports its actual track list. Sidecar subtitles are loaded as "playback children"
+    /// at runtime, so their player-assigned indexes aren't known until the player is running.
+    /// This takes the existing map from `buildIndexMap` and fills in the sidecar entries.
+    ///
+    ///  - `Transcode`: HLS has no embedded subtitles, so all reported subtitle tracks are sidecars — matched sequentially.
+    ///  - `DirectPlay`: Container subtitles are already mapped. The remaining unmapped tracks are sidecars.
+    static func resolveIndexMap(
+        into indexMap: [Int: Int],
+        playbackChildren: [MediaStream],
+        subtitleTracks: [(index: Int, title: String)],
+        isTranscoding: Bool
+    ) -> [Int: Int] {
+        guard !playbackChildren.isEmpty else { return indexMap }
+
+        var updatedMap = indexMap
+
+        let playerIndexes = subtitleTracks
+            .map(\.index)
+            .filter { $0 >= 0 }
+            .sorted()
+
+        if isTranscoding {
+            for (offset, playerIndex) in playerIndexes.enumerated() {
+                guard offset < playbackChildren.count,
+                      let jellyfinIndex = playbackChildren[offset].index
+                else { continue }
+                updatedMap[jellyfinIndex] = playerIndex
+            }
+        } else {
+            let mappedIndexes = Set(indexMap.values)
+            let unmappedIndexes = playerIndexes
+                .filter { !mappedIndexes.contains($0) }
+
+            let externalIndexes: [Int] = [Int](unmappedIndexes.suffix(playbackChildren.count))
+
+            for (offset, stream) in playbackChildren.enumerated() {
+                guard let jellyfinIndex = stream.index else { continue }
+                if offset < externalIndexes.count {
+                    updatedMap[jellyfinIndex] = externalIndexes[offset]
+                }
+            }
         }
 
-        return newInternalTracks + newExternalTracks
+        return updatedMap
     }
 
     var has4KVideo: Bool {