From 8622c3bfb78075ef78b2e89f0cf519e130b062c4 Mon Sep 17 00:00:00 2001
From: altqx <al@altqx.com>
Date: Fri, 3 Jul 2026 09:30:22 +0700
Subject: Match VobSub MKS subtitle profiles by container

---
 MediaBrowser.Model/Dlna/StreamBuilder.cs | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'MediaBrowser.Model')

diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 59f97d8c7c..a9ab7d6db0 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -576,11 +576,8 @@ namespace MediaBrowser.Model.Dlna
                     foreach (var profile in subtitleProfiles)
                     {
                         if (profile.Method == SubtitleDeliveryMethod.External
-                            && (string.Equals(profile.Format, stream.Codec, StringComparison.OrdinalIgnoreCase)
-                                // FFmpeg cannot mux VobSub back into an .idx/.sub pair, so extracted VobSub streams are exposed as .mks.
-                                || (string.Equals(profile.Format, "mks", StringComparison.OrdinalIgnoreCase)
-                                    && stream.IsVobSubSubtitleStream
-                                    && (!stream.IsExternal || stream.Path.EndsWith(".mks", StringComparison.OrdinalIgnoreCase)))))
+                            && (IsVobSubMksProfile(profile, stream)
+                                || (!IsVobSubMksDeliveryProfile(profile) && string.Equals(profile.Format, stream.Codec, StringComparison.OrdinalIgnoreCase))))
                         {
                             return stream.Index;
                         }
@@ -1590,13 +1587,11 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
-                // FFmpeg cannot mux VobSub back into an .idx/.sub pair, so extracted VobSub streams are matched against external .mks delivery profiles.
-                bool isVobSubMksProfile = string.Equals(profile.Format, "mks", StringComparison.OrdinalIgnoreCase)
-                    && subtitleStream.IsVobSubSubtitleStream
-                    && (!subtitleStream.IsExternal || subtitleStream.Path.EndsWith(".mks", StringComparison.OrdinalIgnoreCase));
+                bool isVobSubMksProfile = IsVobSubMksProfile(profile, subtitleStream);
 
                 if ((profile.Method == SubtitleDeliveryMethod.External
-                        && (isVobSubMksProfile || subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))) ||
+                        && (isVobSubMksProfile
+                            || (!IsVobSubMksDeliveryProfile(profile) && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format)))) ||
                     (profile.Method == SubtitleDeliveryMethod.Hls && subtitleStream.IsTextSubtitleStream))
                 {
                     bool requiresConversion = !isVobSubMksProfile
@@ -1628,6 +1623,21 @@ namespace MediaBrowser.Model.Dlna
             return null;
         }
 
+        private static bool IsVobSubMksDeliveryProfile(SubtitleProfile profile)
+        {
+            return MediaStream.IsVobSubFormat(profile.Format)
+                && !string.IsNullOrWhiteSpace(profile.Container)
+                && ContainerHelper.ContainsContainer(profile.Container, "mks");
+        }
+
+        private static bool IsVobSubMksProfile(SubtitleProfile profile, MediaStream subtitleStream)
+        {
+            // FFmpeg cannot mux VobSub back into an .idx/.sub pair, so extracted VobSub streams are exposed as .mks.
+            return IsVobSubMksDeliveryProfile(profile)
+                && subtitleStream.IsVobSubSubtitleStream
+                && (!subtitleStream.IsExternal || subtitleStream.Path?.EndsWith(".mks", StringComparison.OrdinalIgnoreCase) == true);
+        }
+
         private bool IsBitrateLimitExceeded(MediaSourceInfo item, long maxBitrate)
         {
             // Don't restrict bitrate if item is remote.
-- 
cgit v1.2.3