unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests 2 Packages Projects Releases Wiki Activity

Merge pull request #17227 from altqx/master

Browse Source 
Match VobSub MKS subtitle profiles by container
This commit is contained in:
Cody Robibero
2026-07-21 20:47:02 -04:00
committed by GitHub
parent 526f4051e9 8622c3bfb7
commit fc43f151a2
2 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MediaBrowser.Model/Dlna/StreamBuilder.cs
+20 -10
View File
@@ -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.