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

Merge pull request #17674 from Oggeb1/BDMV-pgs

Browse Source 
Fix PGS subtitles for BDMV with TrueHD
This commit is contained in:
Cody Robibero
2026-09-05 12:16:25 -04:00
committed by GitHub
parent 84589380e5 9528d0e601
commit 7c463f5fba
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+19 -1
View File
@@ -6315,7 +6315,7 @@ namespace MediaBrowser.Controller.MediaEncoding
string.Join(',', overlayFilters));
var mapPrefix = Convert.ToInt32(state.SubtitleStream.IsExternal);
var subtitleStreamIndex = FindIndex(state.MediaSource.MediaStreams, state.SubtitleStream);
var subtitleStreamIndex = GetSubtitleStreamIndexForFfmpeg(state.MediaSource, state.SubtitleStream);
var videoStreamIndex = FindIndex(state.MediaSource.MediaStreams, state.VideoStream);
if (hasSubs)
@@ -7947,6 +7947,24 @@ namespace MediaBrowser.Controller.MediaEncoding
return -1;
}
public static int GetSubtitleStreamIndexForFfmpeg(MediaSourceInfo mediaSource, MediaStream subtitleStream)
{
var index = FindIndex(mediaSource.MediaStreams, subtitleStream);
if (index == -1 || subtitleStream.IsExternal || mediaSource.VideoType != VideoType.BluRay)
{
return index;
}
var hiddenStreamsBefore = mediaSource.MediaStreams.Count(s =>
s.Type == MediaStreamType.Audio
&& !s.IsExternal
&& (string.Equals(s.Codec, "truehd", StringComparison.OrdinalIgnoreCase)
|| string.Equals(s.Codec, "atmos", StringComparison.OrdinalIgnoreCase))
&& s.Index < subtitleStream.Index);
return index + hiddenStreamsBefore;
}
public static bool IsCopyCodec(string codec)
{
return string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase);