Merge pull request #17342 from LTe/fix-subtitle-conversion-race

Fix race condition in concurrent subtitle conversion
2026-07-20 19:51:44 -04:00
parent 191be0931e 6e3c187493
commit f2b9c68969
7 changed files with 141 additions and 63 deletions
@@ -73,7 +73,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
            _serverConfigurationManager = serverConfigurationManager;
        }

-        private MemoryStream ConvertSubtitles(
+        internal MemoryStream ConvertSubtitles(
            Stream stream,
            SubtitleInfo inputInfo,
            string outputFormat,
@@ -81,7 +81,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
            long endTimeTicks,
            bool preserveOriginalTimestamps)
        {
-            var subtitle = Subtitle.Parse(stream, Path.GetExtension(inputInfo.Path));
+            var subtitle = _subtitleParser.Parse(stream, inputInfo.Format);

            FilterEvents(subtitle, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);