From 0b20d7a05bb174181ef56e9c2ee08a590a74528e Mon Sep 17 00:00:00 2001 From: Oskar Bali <51484222+Oggeb1@users.noreply.github.com> Date: Wed, 19 Aug 2026 11:29:52 +0200 Subject: Fix BDMV PGS subtitles with TrueHD Add myself CONTRIBUTORS.md --- .../MediaEncoding/EncodingHelper.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs') diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 9a68889352..9e6d4a2899 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -6311,7 +6311,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) @@ -7943,6 +7943,23 @@ namespace MediaBrowser.Controller.MediaEncoding return -1; } + public static int GetSubtitleStreamIndexForFfmpeg(MediaSourceInfo mediaSource, MediaStream subtitleStream) + { + var index = FindIndex(mediaSource.MediaStreams, subtitleStream); + if (index == -1 || mediaSource.VideoType != VideoType.BluRay) + { + return index; + } + + var hiddenStreamsBefore = mediaSource.MediaStreams.Count(s => + s.Type == MediaStreamType.Audio + && (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); -- cgit v1.2.3 From 163895b99f780df1ce8f50f3d0e17f4a2880e251 Mon Sep 17 00:00:00 2001 From: Oskar Bali <51484222+Oggeb1@users.noreply.github.com> Date: Sat, 29 Aug 2026 13:52:20 +0200 Subject: Fix BDMV with external subtitle GetSubtitleStreamIndexForFfmpeg treated external and internal subtitles the same. This made subtitles out of sync with the video. --- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs') diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 9e6d4a2899..cb01c1486b 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -7946,7 +7946,7 @@ namespace MediaBrowser.Controller.MediaEncoding public static int GetSubtitleStreamIndexForFfmpeg(MediaSourceInfo mediaSource, MediaStream subtitleStream) { var index = FindIndex(mediaSource.MediaStreams, subtitleStream); - if (index == -1 || mediaSource.VideoType != VideoType.BluRay) + if (index == -1 || subtitleStream.IsExternal || mediaSource.VideoType != VideoType.BluRay) { return index; } -- cgit v1.2.3 From 9528d0e601e87bbff79d46f0c5f30fecee62a526 Mon Sep 17 00:00:00 2001 From: Oggeb1 <51484222+Oggeb1@users.noreply.github.com> Date: Sat, 5 Sep 2026 17:15:00 +0200 Subject: Fix BDMV subtitles with external audio Co-authored-by: gnattu --- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs') diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 8cd191c055..f0c2580e08 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -7953,6 +7953,7 @@ namespace MediaBrowser.Controller.MediaEncoding 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); -- cgit v1.2.3